diff --git a/.gitignore b/.gitignore
index 0badfe0cf61..9173b12c328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,12 +9,14 @@ test-args.txt
 \#*\#
 .\#*
 tests/baselines/local/*
+tests/baselines/local.old/*
 tests/services/baselines/local/*
 tests/baselines/prototyping/local/*
 tests/baselines/rwc/*
 tests/baselines/test262/*
 tests/baselines/reference/projectOutput/*
 tests/baselines/local/projectOutput/*
+tests/baselines/reference/testresults.tap
 tests/services/baselines/prototyping/local/*
 tests/services/browser/typescriptServices.js
 scripts/authors.js
diff --git a/Jakefile.js b/Jakefile.js
index 4c751945c87..40a0bb2ffa5 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -64,7 +64,20 @@ var compilerSources = [
     "utilities.ts",
     "binder.ts",
     "checker.ts",
+    "factory.ts",
+    "visitor.ts",
+    "transformers/destructuring.ts",
+    "transformers/ts.ts",
+    "transformers/module/es6.ts",
+    "transformers/module/system.ts",
+    "transformers/module/module.ts",
+    "transformers/jsx.ts",
+    "transformers/es7.ts",
+    "transformers/generators.ts",
+    "transformers/es6.ts",
+    "transformer.ts",
     "sourcemap.ts",
+    "comments.ts",
     "declarationEmitter.ts",
     "emitter.ts",
     "program.ts",
@@ -85,7 +98,20 @@ var servicesSources = [
     "utilities.ts",
     "binder.ts",
     "checker.ts",
+    "factory.ts",
+    "visitor.ts",
+    "transformers/destructuring.ts",
+    "transformers/ts.ts",
+    "transformers/module/es6.ts",
+    "transformers/module/system.ts",
+    "transformers/module/module.ts",
+    "transformers/jsx.ts",
+    "transformers/es7.ts",
+    "transformers/generators.ts",
+    "transformers/es6.ts",
+    "transformer.ts",
     "sourcemap.ts",
+    "comments.ts",
     "declarationEmitter.ts",
     "emitter.ts",
     "program.ts",
@@ -102,6 +128,7 @@ var servicesSources = [
     "services.ts",
     "shims.ts",
     "signatureHelp.ts",
+    "types.ts",
     "utilities.ts",
     "formatting/formatting.ts",
     "formatting/formattingContext.ts",
@@ -307,7 +334,10 @@ var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
     * @param callback: a function to execute after the compilation process ends
     */
 function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts, callback) {
-    file(outFile, prereqs, function () {
+    file(outFile, prereqs, function() {
+        if (process.env.USE_TRANSFORMS === "false") {
+            useBuiltCompiler = false;
+        }
         var startCompileTime = mark();
         opts = opts || {};
         var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
@@ -745,8 +775,14 @@ function cleanTestDirs() {
 }
 
 // used to pass data from jake command line directly to run.js
-function writeTestConfigFile(tests, light, taskConfigsFolder, workerCount) {
-    var testConfigContents = JSON.stringify({ test: tests ? [tests] : undefined, light: light, workerCount: workerCount, taskConfigsFolder: taskConfigsFolder });
+function writeTestConfigFile(tests, light, taskConfigsFolder, workerCount, stackTraceLimit) {
+    var testConfigContents = JSON.stringify({ 
+        test: tests ? [tests] : undefined,
+        light: light,
+        workerCount: workerCount,
+        taskConfigsFolder: taskConfigsFolder,
+        stackTraceLimit: stackTraceLimit
+    });
     fs.writeFileSync('test.config', testConfigContents);
 }
 
@@ -757,10 +793,15 @@ function deleteTemporaryProjectOutput() {
 }
 
 function runConsoleTests(defaultReporter, runInParallel) {
-    cleanTestDirs();
+    var dirty = process.env.dirty;
+    if (!dirty) {
+        cleanTestDirs();
+    }
+
     var debug = process.env.debug || process.env.d;
     tests = process.env.test || process.env.tests || process.env.t;
     var light = process.env.light || false;
+    var stackTraceLimit = process.env.stackTraceLimit;
     var testConfigFile = 'test.config';
     if (fs.existsSync(testConfigFile)) {
         fs.unlinkSync(testConfigFile);
@@ -780,7 +821,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
     }
 
     if (tests || light || taskConfigsFolder) {
-        writeTestConfigFile(tests, light, taskConfigsFolder, workerCount);
+        writeTestConfigFile(tests, light, taskConfigsFolder, workerCount, stackTraceLimit);
     }
 
     if (tests && tests.toLocaleLowerCase() === "rwc") {
@@ -849,7 +890,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
         }
     }
     function runLinter() {
-        if (!lintFlag) {
+        if (!lintFlag || dirty) {
             return;
         }
         var lint = jake.Task['lint'];
@@ -866,8 +907,8 @@ task("runtests-parallel", ["build-rules", "tests", builtLocalDirectory], functio
     runConsoleTests('min', /*runInParallel*/ true);
 }, { async: true });
 
-desc("Runs the tests using the built run.js file. Optional arguments are: t[ests]=regex r[eporter]=[list|spec|json|<more>] d[ebug]=true color[s]=false lint=true bail=false.");
-task("runtests", ["build-rules", "tests", builtLocalDirectory], function () {
+desc("Runs the tests using the built run.js file. Optional arguments are: t[ests]=regex r[eporter]=[list|spec|json|<more>] d[ebug]=true color[s]=false lint=true bail=false dirty=false.");
+task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
     runConsoleTests('mocha-fivemat-progress-reporter', /*runInParallel*/ false);
 }, { async: true });
 
@@ -884,8 +925,8 @@ var nodeServerInFile = "tests/webTestServer.ts";
 compileFile(nodeServerOutFile, [nodeServerInFile], [builtLocalDirectory, tscFile], [], /*useBuiltCompiler:*/ true, { noOutFile: true });
 
 desc("Runs browserify on run.js to produce a file suitable for running tests in the browser");
-task("browserify", ["tests", builtLocalDirectory, nodeServerOutFile], function () {
-    var cmd = 'browserify built/local/run.js -d -o built/local/bundle.js';
+task("browserify", ["tests", builtLocalDirectory, nodeServerOutFile], function() {
+    var cmd = 'browserify built/local/run.js -t ./scripts/browserify-optional -d -o built/local/bundle.js';
     exec(cmd);
 }, { async: true });
 
diff --git a/lib/tsc.js b/lib/tsc.js
index 05a903f9014..0e3d7285ac3 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -825,17 +825,10 @@ var ts;
         return true;
     }
     ts.containsPath = containsPath;
-    function startsWith(str, prefix) {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-    ts.startsWith = startsWith;
-    function endsWith(str, suffix) {
-        var expectedPos = str.length - suffix.length;
-        return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
-    }
-    ts.endsWith = endsWith;
     function fileExtensionIs(path, extension) {
-        return path.length > extension.length && endsWith(path, extension);
+        var pathLen = path.length;
+        var extLen = extension.length;
+        return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
     function fileExtensionIsAny(path, extensions) {
@@ -1100,8 +1093,6 @@ var ts;
     }
     ts.objectAllocator = {
         getNodeConstructor: function () { return Node; },
-        getTokenConstructor: function () { return Node; },
-        getIdentifierConstructor: function () { return Node; },
         getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
@@ -1233,7 +1224,7 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
             }
-            var wscriptSystem = {
+            return {
                 args: args,
                 newLine: "\r\n",
                 useCaseSensitiveFileNames: false,
@@ -1252,7 +1243,7 @@ var ts;
                     return fso.FolderExists(path);
                 },
                 createDirectory: function (directoryName) {
-                    if (!wscriptSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
                 },
@@ -1272,7 +1263,6 @@ var ts;
                     }
                 }
             };
-            return wscriptSystem;
         }
         function getNodeSystem() {
             var _fs = require("fs");
@@ -1445,7 +1435,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (p) { return fileSystemEntryExists(ts.combinePaths(path, p), 1); });
             }
-            var nodeSystem = {
+            return {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
@@ -1495,7 +1485,7 @@ var ts;
                 fileExists: fileExists,
                 directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
-                    if (!nodeSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
                 },
@@ -1543,7 +1533,6 @@ var ts;
                     return _fs.realpathSync(path);
                 }
             };
-            return nodeSystem;
         }
         function getChakraSystem() {
             var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
@@ -2293,8 +2282,8 @@ var ts;
         Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: { code: 6131, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", message: "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'." },
         File_name_0_has_a_1_extension_stripping_it: { code: 6132, category: ts.DiagnosticCategory.Message, key: "File_name_0_has_a_1_extension_stripping_it_6132", message: "File name '{0}' has a '{1}' extension - stripping it" },
         _0_is_declared_but_never_used: { code: 6133, category: ts.DiagnosticCategory.Error, key: "_0_is_declared_but_never_used_6133", message: "'{0}' is declared but never used." },
-        Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
-        Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
+        Report_Errors_on_Unused_Locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Locals_6134", message: "Report Errors on Unused Locals." },
+        Report_Errors_on_Unused_Parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Parameters_6135", message: "Report Errors on Unused Parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
         No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
@@ -4847,7 +4836,7 @@ var ts;
     }
     ts.isExpression = isExpression;
     function isExternalModuleNameRelative(moduleName) {
-        return /^\.\.?($|[\\/])/.test(moduleName);
+        return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
     }
     ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
     function isInstantiatedModule(node, preserveConstEnums) {
@@ -6355,24 +6344,25 @@ var ts;
         return node.flags & 92 && node.parent.kind === 148 && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function startsWith(str, prefix) {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+    ts.startsWith = startsWith;
+    function endsWith(str, suffix) {
+        var expectedPos = str.length - suffix.length;
+        return str.indexOf(suffix, expectedPos) === expectedPos;
+    }
+    ts.endsWith = endsWith;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     ts.parseTime = 0;
     var NodeConstructor;
-    var TokenConstructor;
-    var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
         if (kind === 256) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 69) {
-            return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
-        }
-        else if (kind < 139) {
-            return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
-        }
         else {
             return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
         }
@@ -6795,8 +6785,6 @@ var ts;
         var scanner = ts.createScanner(2, true);
         var disallowInAndDecoratorContext = 4194304 | 16777216;
         var NodeConstructor;
-        var TokenConstructor;
-        var IdentifierConstructor;
         var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
@@ -6822,8 +6810,6 @@ var ts;
         }
         function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
-            TokenConstructor = ts.objectAllocator.getTokenConstructor();
-            IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
@@ -7130,9 +7116,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 139 ? new NodeConstructor(kind, pos, pos) :
-                kind === 69 ? new IdentifierConstructor(kind, pos, pos) :
-                    new TokenConstructor(kind, pos, pos);
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -10908,9 +10892,6 @@ var ts;
                                 case 55:
                                     if (canParseTag) {
                                         parentTagTerminated = !tryParseChildTag(jsDocTypeLiteral);
-                                        if (!parentTagTerminated) {
-                                            resumePos = scanner.getStartPos();
-                                        }
                                     }
                                     seenAsterisk = false;
                                     break;
@@ -15437,18 +15418,17 @@ var ts;
                 if (declaration.kind === 235) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 134217728 && declaration.kind === 280 && declaration.typeExpression) {
-                    return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
-                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
                 var type = undefined;
-                if (declaration.kind === 187 ||
-                    declaration.kind === 172 && declaration.parent.kind === 187) {
-                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return decl.kind === 187 ?
-                        checkExpressionCached(decl.right) :
-                        checkExpressionCached(decl.parent.right); }));
+                if (declaration.kind === 187) {
+                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
+                }
+                else if (declaration.kind === 172) {
+                    if (declaration.parent.kind === 187) {
+                        type = checkExpressionCached(declaration.parent.right);
+                    }
                 }
                 if (type === undefined) {
                     type = getWidenedTypeForVariableLikeDeclaration(declaration, true);
@@ -21955,7 +21935,7 @@ var ts;
         function getInferredClassType(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.inferredClassType) {
-                links.inferredClassType = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined);
+                links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, undefined, undefined);
             }
             return links.inferredClassType;
         }
@@ -23175,7 +23155,7 @@ var ts;
                         checkAsyncFunctionReturnType(node);
                     }
                 }
-                if (noUnusedIdentifiers && !node.body) {
+                if (!node.body) {
                     checkUnusedTypeParameters(node);
                 }
             }
@@ -24071,7 +24051,6 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
-                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -24087,9 +24066,6 @@ var ts;
                 }
             }
         }
-        function parameterIsThisKeyword(parameter) {
-            return parameter.name && parameter.name.originalKeywordKind === 97;
-        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;
         }
@@ -24118,14 +24094,9 @@ var ts;
         function checkUnusedTypeParameters(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.typeParameters) {
-                    var symbol = getSymbolOfNode(node);
-                    var lastDeclaration = symbol && symbol.declarations && ts.lastOrUndefined(symbol.declarations);
-                    if (lastDeclaration !== node) {
-                        return;
-                    }
                     for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
                         var typeParameter = _a[_i];
-                        if (!getMergedSymbol(typeParameter.symbol).isReferenced) {
+                        if (!typeParameter.symbol.isReferenced) {
                             error(typeParameter.name, ts.Diagnostics._0_is_declared_but_never_used, typeParameter.symbol.name);
                         }
                     }
@@ -25202,7 +25173,7 @@ var ts;
             ts.forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 checkTypeForDuplicateIndexSignatures(node);
-                registerForUnusedIdentifiersCheck(node);
+                checkUnusedTypeParameters(node);
             }
         }
         function checkTypeAliasDeclaration(node) {
@@ -29925,7 +29896,7 @@ var ts;
                 writeLine();
                 var sourceMappingURL = sourceMap.getSourceMappingURL();
                 if (sourceMappingURL) {
-                    write("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
+                    write("//# sourceMappingURL=" + sourceMappingURL);
                 }
                 writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM, sourceFiles);
                 sourceMap.reset();
@@ -33575,13 +33546,13 @@ var ts;
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512) && decoratedClassAlias === undefined) {
                             write("export ");
                         }
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         if (decoratedClassAlias !== undefined) {
-                            write("let " + decoratedClassAlias);
+                            write("" + decoratedClassAlias);
                         }
                         else {
-                            if (!isHoistedDeclarationInSystemModule) {
-                                write("let ");
-                            }
                             emitDeclarationName(node);
                         }
                         write(" = ");
@@ -35825,7 +35796,7 @@ var ts;
     ts.emitTime = 0;
     ts.ioReadTime = 0;
     ts.ioWriteTime = 0;
-    ts.version = "2.1.0";
+    ts.version = "2.0.0";
     var emptyArray = [];
     var defaultTypeRoots = ["node_modules/@types"];
     function findConfigFile(searchPath, fileExists) {
@@ -35905,7 +35876,12 @@ var ts;
         return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
     }
     function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+        if (ts.isRootedDiskPath(moduleName)) {
+            return false;
+        }
+        var i = moduleName.lastIndexOf("./", 1);
+        var startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === 46);
+        return !startsWithDotSlashOrDotDotSlash;
     }
     function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
         var jsonContent;
@@ -36561,22 +36537,6 @@ var ts;
         return ts.sortAndDeduplicateDiagnostics(diagnostics);
     }
     ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
-    function formatDiagnostics(diagnostics, host) {
-        var output = "";
-        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
-            var diagnostic = diagnostics_1[_i];
-            if (diagnostic.file) {
-                var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
-                var fileName = diagnostic.file.fileName;
-                var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-                output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
-            }
-            var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
-        }
-        return output;
-    }
-    ts.formatDiagnostics = formatDiagnostics;
     function flattenDiagnosticMessageText(messageText, newLine) {
         if (typeof messageText === "string") {
             return messageText;
@@ -36652,7 +36612,7 @@ var ts;
         var resolvedTypeReferenceDirectives = {};
         var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
-        var currentNodeModulesDepth = 0;
+        var currentNodeModulesJsDepth = 0;
         var modulesWithElidedImports = {};
         var sourceFilesFoundSearchingNodeModules = {};
         var start = new Date().getTime();
@@ -36876,7 +36836,8 @@ var ts;
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, false));
         }
         function emit(sourceFile, writeFileCallback, cancellationToken) {
-            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken); });
+            var _this = this;
+            return runWithCancellationToken(function () { return emitWorker(_this, sourceFile, writeFileCallback, cancellationToken); });
         }
         function isEmitBlocked(emitFileName) {
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
@@ -37283,17 +37244,8 @@ var ts;
                 if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== ts.getNormalizedAbsolutePath(fileName, currentDirectory)) {
                     reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
                 }
-                if (file_1 && ts.lookUp(sourceFilesFoundSearchingNodeModules, file_1.path) && currentNodeModulesDepth == 0) {
-                    sourceFilesFoundSearchingNodeModules[file_1.path] = false;
-                    if (!options.noResolve) {
-                        processReferencedFiles(file_1, ts.getDirectoryPath(fileName), isDefaultLib);
-                        processTypeReferenceDirectives(file_1);
-                    }
-                    modulesWithElidedImports[file_1.path] = false;
-                    processImportedModules(file_1, ts.getDirectoryPath(fileName));
-                }
-                else if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1, ts.getDirectoryPath(fileName));
                     }
@@ -37310,7 +37262,6 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
-                sourceFilesFoundSearchingNodeModules[path] = (currentNodeModulesDepth > 0);
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     var existingFile = filesByNameIgnoreCase.get(path);
@@ -37411,9 +37362,12 @@ var ts;
                     var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
                     var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
                     if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
+                        sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth++;
+                    }
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
                     var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
@@ -37421,8 +37375,8 @@ var ts;
                     else if (shouldAddFile) {
                         findSourceFile(resolution.resolvedFileName, resolvedPath, false, false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                     }
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth--;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth--;
                     }
                 }
             }
@@ -37741,12 +37695,12 @@ var ts;
         {
             name: "noUnusedLocals",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals
+            description: ts.Diagnostics.Report_Errors_on_Unused_Locals
         },
         {
             name: "noUnusedParameters",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters
+            description: ts.Diagnostics.Report_Errors_on_Unused_Parameters
         },
         {
             name: "noLib",
@@ -38525,18 +38479,10 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var defaultFormatDiagnosticsHost = {
-        getCurrentDirectory: function () { return ts.sys.getCurrentDirectory(); },
-        getNewLine: function () { return ts.sys.newLine; },
-        getCanonicalFileName: ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)
-    };
-    var reportDiagnosticWorker = reportDiagnosticSimply;
-    function reportDiagnostic(diagnostic, host) {
-        reportDiagnosticWorker(diagnostic, host || defaultFormatDiagnosticsHost);
-    }
+    var reportDiagnostic = reportDiagnosticSimply;
     function reportDiagnostics(diagnostics, host) {
-        for (var _i = 0, diagnostics_2 = diagnostics; _i < diagnostics_2.length; _i++) {
-            var diagnostic = diagnostics_2[_i];
+        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
+            var diagnostic = diagnostics_1[_i];
             reportDiagnostic(diagnostic, host);
         }
     }
@@ -38607,8 +38553,19 @@ var ts;
         var diagnostic = ts.createCompilerDiagnostic.apply(undefined, arguments);
         return diagnostic.messageText;
     }
+    function getRelativeFileName(fileName, host) {
+        return host ? ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); }) : fileName;
+    }
     function reportDiagnosticSimply(diagnostic, host) {
-        ts.sys.write(ts.formatDiagnostics([diagnostic], host));
+        var output = "";
+        if (diagnostic.file) {
+            var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
+            var relativeFileName = getRelativeFileName(diagnostic.file.fileName, host);
+            output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
+        }
+        var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
+        output += category + " TS" + diagnostic.code + ": " + ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine) + ts.sys.newLine;
+        ts.sys.write(output);
     }
     var redForegroundEscapeSequence = "\u001b[91m";
     var yellowForegroundEscapeSequence = "\u001b[93m";
@@ -38633,7 +38590,7 @@ var ts;
             var _a = ts.getLineAndCharacterOfPosition(file, start), firstLine = _a.line, firstLineChar = _a.character;
             var _b = ts.getLineAndCharacterOfPosition(file, start + length_3), lastLine = _b.line, lastLineChar = _b.character;
             var lastLineInFile = ts.getLineAndCharacterOfPosition(file, file.text.length).line;
-            var relativeFileName = host ? ts.convertToRelativePath(file.fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); }) : file.fileName;
+            var relativeFileName = getRelativeFileName(file.fileName, host);
             var hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
             var gutterWidth = (lastLine + 1 + "").length;
             if (hasMoreThanFiveLines) {
@@ -38822,8 +38779,7 @@ var ts;
                 ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
-            var cwd = ts.sys.getCurrentDirectory();
-            var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), commandLine.options, ts.getNormalizedAbsolutePath(configFileName, cwd));
+            var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), ts.sys.getCurrentDirectory()), commandLine.options, configFileName);
             if (configParseResult.errors.length > 0) {
                 reportDiagnostics(configParseResult.errors, undefined);
                 ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
@@ -38860,7 +38816,7 @@ var ts;
                 compilerHost.fileExists = cachedFileExists;
             }
             if (compilerOptions.pretty) {
-                reportDiagnosticWorker = reportDiagnosticWithColorAndContext;
+                reportDiagnostic = reportDiagnosticWithColorAndContext;
             }
             cachedExistingFiles = {};
             var compileResult = compile(rootFileNames, compilerOptions, compilerHost);
@@ -39023,7 +38979,7 @@ var ts;
         output += ts.sys.newLine + ts.sys.newLine;
         var padding = makePadding(marginLength);
         output += getDiagnosticText(ts.Diagnostics.Examples_Colon_0, makePadding(marginLength - examplesLength) + "tsc hello.ts") + ts.sys.newLine;
-        output += padding + "tsc --outFile file.js file.ts" + ts.sys.newLine;
+        output += padding + "tsc --out file.js file.ts" + ts.sys.newLine;
         output += padding + "tsc @args.txt" + ts.sys.newLine;
         output += ts.sys.newLine;
         output += getDiagnosticText(ts.Diagnostics.Options_Colon) + ts.sys.newLine;
diff --git a/lib/tsserver.js b/lib/tsserver.js
index 7e0dda1736e..af6ee897902 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -830,17 +830,10 @@ var ts;
         return true;
     }
     ts.containsPath = containsPath;
-    function startsWith(str, prefix) {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-    ts.startsWith = startsWith;
-    function endsWith(str, suffix) {
-        var expectedPos = str.length - suffix.length;
-        return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
-    }
-    ts.endsWith = endsWith;
     function fileExtensionIs(path, extension) {
-        return path.length > extension.length && endsWith(path, extension);
+        var pathLen = path.length;
+        var extLen = extension.length;
+        return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
     function fileExtensionIsAny(path, extensions) {
@@ -1105,8 +1098,6 @@ var ts;
     }
     ts.objectAllocator = {
         getNodeConstructor: function () { return Node; },
-        getTokenConstructor: function () { return Node; },
-        getIdentifierConstructor: function () { return Node; },
         getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
@@ -1238,7 +1229,7 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
             }
-            var wscriptSystem = {
+            return {
                 args: args,
                 newLine: "\r\n",
                 useCaseSensitiveFileNames: false,
@@ -1257,7 +1248,7 @@ var ts;
                     return fso.FolderExists(path);
                 },
                 createDirectory: function (directoryName) {
-                    if (!wscriptSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
                 },
@@ -1277,7 +1268,6 @@ var ts;
                     }
                 }
             };
-            return wscriptSystem;
         }
         function getNodeSystem() {
             var _fs = require("fs");
@@ -1450,7 +1440,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (p) { return fileSystemEntryExists(ts.combinePaths(path, p), 1); });
             }
-            var nodeSystem = {
+            return {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
@@ -1500,7 +1490,7 @@ var ts;
                 fileExists: fileExists,
                 directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
-                    if (!nodeSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
                 },
@@ -1548,7 +1538,6 @@ var ts;
                     return _fs.realpathSync(path);
                 }
             };
-            return nodeSystem;
         }
         function getChakraSystem() {
             var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
@@ -2298,8 +2287,8 @@ var ts;
         Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: { code: 6131, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", message: "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'." },
         File_name_0_has_a_1_extension_stripping_it: { code: 6132, category: ts.DiagnosticCategory.Message, key: "File_name_0_has_a_1_extension_stripping_it_6132", message: "File name '{0}' has a '{1}' extension - stripping it" },
         _0_is_declared_but_never_used: { code: 6133, category: ts.DiagnosticCategory.Error, key: "_0_is_declared_but_never_used_6133", message: "'{0}' is declared but never used." },
-        Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
-        Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
+        Report_Errors_on_Unused_Locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Locals_6134", message: "Report Errors on Unused Locals." },
+        Report_Errors_on_Unused_Parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Parameters_6135", message: "Report Errors on Unused Parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
         No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
@@ -3977,12 +3966,12 @@ var ts;
         {
             name: "noUnusedLocals",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals
+            description: ts.Diagnostics.Report_Errors_on_Unused_Locals
         },
         {
             name: "noUnusedParameters",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters
+            description: ts.Diagnostics.Report_Errors_on_Unused_Parameters
         },
         {
             name: "noLib",
@@ -5765,7 +5754,7 @@ var ts;
     }
     ts.isExpression = isExpression;
     function isExternalModuleNameRelative(moduleName) {
-        return /^\.\.?($|[\\/])/.test(moduleName);
+        return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
     }
     ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
     function isInstantiatedModule(node, preserveConstEnums) {
@@ -7273,24 +7262,25 @@ var ts;
         return node.flags & 92 && node.parent.kind === 148 && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function startsWith(str, prefix) {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+    ts.startsWith = startsWith;
+    function endsWith(str, suffix) {
+        var expectedPos = str.length - suffix.length;
+        return str.indexOf(suffix, expectedPos) === expectedPos;
+    }
+    ts.endsWith = endsWith;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     ts.parseTime = 0;
     var NodeConstructor;
-    var TokenConstructor;
-    var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
         if (kind === 256) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 69) {
-            return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
-        }
-        else if (kind < 139) {
-            return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
-        }
         else {
             return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
         }
@@ -7713,8 +7703,6 @@ var ts;
         var scanner = ts.createScanner(2, true);
         var disallowInAndDecoratorContext = 4194304 | 16777216;
         var NodeConstructor;
-        var TokenConstructor;
-        var IdentifierConstructor;
         var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
@@ -7740,8 +7728,6 @@ var ts;
         }
         function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
-            TokenConstructor = ts.objectAllocator.getTokenConstructor();
-            IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
@@ -8048,9 +8034,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 139 ? new NodeConstructor(kind, pos, pos) :
-                kind === 69 ? new IdentifierConstructor(kind, pos, pos) :
-                    new TokenConstructor(kind, pos, pos);
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -11826,9 +11810,6 @@ var ts;
                                 case 55:
                                     if (canParseTag) {
                                         parentTagTerminated = !tryParseChildTag(jsDocTypeLiteral);
-                                        if (!parentTagTerminated) {
-                                            resumePos = scanner.getStartPos();
-                                        }
                                     }
                                     seenAsterisk = false;
                                     break;
@@ -16355,18 +16336,17 @@ var ts;
                 if (declaration.kind === 235) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 134217728 && declaration.kind === 280 && declaration.typeExpression) {
-                    return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
-                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
                 var type = undefined;
-                if (declaration.kind === 187 ||
-                    declaration.kind === 172 && declaration.parent.kind === 187) {
-                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return decl.kind === 187 ?
-                        checkExpressionCached(decl.right) :
-                        checkExpressionCached(decl.parent.right); }));
+                if (declaration.kind === 187) {
+                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
+                }
+                else if (declaration.kind === 172) {
+                    if (declaration.parent.kind === 187) {
+                        type = checkExpressionCached(declaration.parent.right);
+                    }
                 }
                 if (type === undefined) {
                     type = getWidenedTypeForVariableLikeDeclaration(declaration, true);
@@ -22873,7 +22853,7 @@ var ts;
         function getInferredClassType(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.inferredClassType) {
-                links.inferredClassType = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined);
+                links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, undefined, undefined);
             }
             return links.inferredClassType;
         }
@@ -24093,7 +24073,7 @@ var ts;
                         checkAsyncFunctionReturnType(node);
                     }
                 }
-                if (noUnusedIdentifiers && !node.body) {
+                if (!node.body) {
                     checkUnusedTypeParameters(node);
                 }
             }
@@ -24989,7 +24969,6 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
-                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -25005,9 +24984,6 @@ var ts;
                 }
             }
         }
-        function parameterIsThisKeyword(parameter) {
-            return parameter.name && parameter.name.originalKeywordKind === 97;
-        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;
         }
@@ -25036,14 +25012,9 @@ var ts;
         function checkUnusedTypeParameters(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.typeParameters) {
-                    var symbol = getSymbolOfNode(node);
-                    var lastDeclaration = symbol && symbol.declarations && ts.lastOrUndefined(symbol.declarations);
-                    if (lastDeclaration !== node) {
-                        return;
-                    }
                     for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
                         var typeParameter = _a[_i];
-                        if (!getMergedSymbol(typeParameter.symbol).isReferenced) {
+                        if (!typeParameter.symbol.isReferenced) {
                             error(typeParameter.name, ts.Diagnostics._0_is_declared_but_never_used, typeParameter.symbol.name);
                         }
                     }
@@ -26120,7 +26091,7 @@ var ts;
             ts.forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 checkTypeForDuplicateIndexSignatures(node);
-                registerForUnusedIdentifiersCheck(node);
+                checkUnusedTypeParameters(node);
             }
         }
         function checkTypeAliasDeclaration(node) {
@@ -30843,7 +30814,7 @@ var ts;
                 writeLine();
                 var sourceMappingURL = sourceMap.getSourceMappingURL();
                 if (sourceMappingURL) {
-                    write("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
+                    write("//# sourceMappingURL=" + sourceMappingURL);
                 }
                 writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM, sourceFiles);
                 sourceMap.reset();
@@ -34493,13 +34464,13 @@ var ts;
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512) && decoratedClassAlias === undefined) {
                             write("export ");
                         }
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         if (decoratedClassAlias !== undefined) {
-                            write("let " + decoratedClassAlias);
+                            write("" + decoratedClassAlias);
                         }
                         else {
-                            if (!isHoistedDeclarationInSystemModule) {
-                                write("let ");
-                            }
                             emitDeclarationName(node);
                         }
                         write(" = ");
@@ -36743,7 +36714,7 @@ var ts;
     ts.emitTime = 0;
     ts.ioReadTime = 0;
     ts.ioWriteTime = 0;
-    ts.version = "2.1.0";
+    ts.version = "2.0.0";
     var emptyArray = [];
     var defaultTypeRoots = ["node_modules/@types"];
     function findConfigFile(searchPath, fileExists) {
@@ -36823,7 +36794,12 @@ var ts;
         return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
     }
     function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+        if (ts.isRootedDiskPath(moduleName)) {
+            return false;
+        }
+        var i = moduleName.lastIndexOf("./", 1);
+        var startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === 46);
+        return !startsWithDotSlashOrDotDotSlash;
     }
     function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
         var jsonContent;
@@ -37479,22 +37455,6 @@ var ts;
         return ts.sortAndDeduplicateDiagnostics(diagnostics);
     }
     ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
-    function formatDiagnostics(diagnostics, host) {
-        var output = "";
-        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
-            var diagnostic = diagnostics_1[_i];
-            if (diagnostic.file) {
-                var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
-                var fileName = diagnostic.file.fileName;
-                var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-                output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
-            }
-            var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
-        }
-        return output;
-    }
-    ts.formatDiagnostics = formatDiagnostics;
     function flattenDiagnosticMessageText(messageText, newLine) {
         if (typeof messageText === "string") {
             return messageText;
@@ -37570,7 +37530,7 @@ var ts;
         var resolvedTypeReferenceDirectives = {};
         var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
-        var currentNodeModulesDepth = 0;
+        var currentNodeModulesJsDepth = 0;
         var modulesWithElidedImports = {};
         var sourceFilesFoundSearchingNodeModules = {};
         var start = new Date().getTime();
@@ -37794,7 +37754,8 @@ var ts;
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, false));
         }
         function emit(sourceFile, writeFileCallback, cancellationToken) {
-            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken); });
+            var _this = this;
+            return runWithCancellationToken(function () { return emitWorker(_this, sourceFile, writeFileCallback, cancellationToken); });
         }
         function isEmitBlocked(emitFileName) {
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
@@ -38201,17 +38162,8 @@ var ts;
                 if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== ts.getNormalizedAbsolutePath(fileName, currentDirectory)) {
                     reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
                 }
-                if (file_1 && ts.lookUp(sourceFilesFoundSearchingNodeModules, file_1.path) && currentNodeModulesDepth == 0) {
-                    sourceFilesFoundSearchingNodeModules[file_1.path] = false;
-                    if (!options.noResolve) {
-                        processReferencedFiles(file_1, ts.getDirectoryPath(fileName), isDefaultLib);
-                        processTypeReferenceDirectives(file_1);
-                    }
-                    modulesWithElidedImports[file_1.path] = false;
-                    processImportedModules(file_1, ts.getDirectoryPath(fileName));
-                }
-                else if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1, ts.getDirectoryPath(fileName));
                     }
@@ -38228,7 +38180,6 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
-                sourceFilesFoundSearchingNodeModules[path] = (currentNodeModulesDepth > 0);
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     var existingFile = filesByNameIgnoreCase.get(path);
@@ -38329,9 +38280,12 @@ var ts;
                     var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
                     var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
                     if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
+                        sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth++;
+                    }
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
                     var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
@@ -38339,8 +38293,8 @@ var ts;
                     else if (shouldAddFile) {
                         findSourceFile(resolution.resolvedFileName, resolvedPath, false, false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                     }
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth--;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth--;
                     }
                 }
             }
@@ -39933,7 +39887,7 @@ var ts;
                     return createPatternMatch(PatternMatchKind.exact, punctuationStripped, candidate === chunk.text);
                 }
                 else {
-                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, ts.startsWith(candidate, chunk.text));
+                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, startsWith(candidate, chunk.text));
                 }
             }
             var isLowercase = chunk.isLowerCase;
@@ -40105,6 +40059,14 @@ var ts;
         var str = String.fromCharCode(ch);
         return str === str.toLowerCase();
     }
+    function startsWith(string, search) {
+        for (var i = 0, n = search.length; i < n; i++) {
+            if (string.charCodeAt(i) !== search.charCodeAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
     function indexOfIgnoringCase(string, value) {
         for (var i = 0, n = string.length - value.length; i <= n; i++) {
             if (startsWithIgnoringCase(string, value, i)) {
@@ -41589,9 +41551,6 @@ var ts;
                 }
                 return false;
             }
-            function shouldRescanJsxText(node) {
-                return node && node.kind === 244;
-            }
             function shouldRescanSlashToken(container) {
                 return container.kind === 10;
             }
@@ -41619,9 +41578,7 @@ var ts;
                             ? 3
                             : shouldRescanJsxIdentifier(n)
                                 ? 4
-                                : shouldRescanJsxText(n)
-                                    ? 5
-                                    : 0;
+                                : 0;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     return fixTokenKind(lastTokenInfo, n);
                 }
@@ -41649,10 +41606,6 @@ var ts;
                     currentToken = scanner.scanJsxIdentifier();
                     lastScanAction = 4;
                 }
-                else if (expectedScanAction === 5) {
-                    currentToken = scanner.reScanJsxToken();
-                    lastScanAction = 5;
-                }
                 else {
                     lastScanAction = 0;
                 }
@@ -43901,20 +43854,19 @@ var ts;
         "version"
     ];
     var jsDocCompletionEntries;
-    function createNode(kind, pos, end, parent) {
-        var node = kind >= 139 ? new NodeObject(kind, pos, end) :
-            kind === 69 ? new IdentifierObject(kind, pos, end) :
-                new TokenObject(kind, pos, end);
+    function createNode(kind, pos, end, flags, parent) {
+        var node = new NodeObject(kind, pos, end);
+        node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
         function NodeObject(kind, pos, end) {
+            this.kind = kind;
             this.pos = pos;
             this.end = end;
             this.flags = 0;
             this.parent = undefined;
-            this.kind = kind;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -43949,14 +43901,14 @@ var ts;
                 var token = useJSDocScanner ? scanner.scanJSDocToken() : scanner.scan();
                 var textPos = scanner.getTextPos();
                 if (textPos <= end) {
-                    nodes.push(createNode(token, pos, textPos, this));
+                    nodes.push(createNode(token, pos, textPos, 0, this));
                 }
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(282, nodes.pos, nodes.end, this);
+            var list = createNode(282, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
             for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
@@ -44041,73 +43993,6 @@ var ts;
         };
         return NodeObject;
     }());
-    var TokenOrIdentifierObject = (function () {
-        function TokenOrIdentifierObject(pos, end) {
-            this.pos = pos;
-            this.end = end;
-            this.flags = 0;
-            this.parent = undefined;
-        }
-        TokenOrIdentifierObject.prototype.getSourceFile = function () {
-            return ts.getSourceFileOfNode(this);
-        };
-        TokenOrIdentifierObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
-            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
-        };
-        TokenOrIdentifierObject.prototype.getFullStart = function () {
-            return this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getEnd = function () {
-            return this.end;
-        };
-        TokenOrIdentifierObject.prototype.getWidth = function (sourceFile) {
-            return this.getEnd() - this.getStart(sourceFile);
-        };
-        TokenOrIdentifierObject.prototype.getFullWidth = function () {
-            return this.end - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
-            return this.getStart(sourceFile) - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getFullText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
-        };
-        TokenOrIdentifierObject.prototype.getText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.getStart(), this.getEnd());
-        };
-        TokenOrIdentifierObject.prototype.getChildCount = function (sourceFile) {
-            return 0;
-        };
-        TokenOrIdentifierObject.prototype.getChildAt = function (index, sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getChildren = function (sourceFile) {
-            return emptyArray;
-        };
-        TokenOrIdentifierObject.prototype.getFirstToken = function (sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getLastToken = function (sourceFile) {
-            return undefined;
-        };
-        return TokenOrIdentifierObject;
-    }());
-    var TokenObject = (function (_super) {
-        __extends(TokenObject, _super);
-        function TokenObject(kind, pos, end) {
-            _super.call(this, pos, end);
-            this.kind = kind;
-        }
-        return TokenObject;
-    }(TokenOrIdentifierObject));
-    var IdentifierObject = (function (_super) {
-        __extends(IdentifierObject, _super);
-        function IdentifierObject(kind, pos, end) {
-            _super.call(this, pos, end);
-        }
-        return IdentifierObject;
-    }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 69;
     var SymbolObject = (function () {
         function SymbolObject(flags, name) {
             this.flags = flags;
@@ -49788,8 +49673,6 @@ var ts;
     function initializeServices() {
         ts.objectAllocator = {
             getNodeConstructor: function () { return NodeObject; },
-            getTokenConstructor: function () { return TokenObject; },
-            getIdentifierConstructor: function () { return IdentifierObject; },
             getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
@@ -50910,6 +50793,7 @@ var ts;
                 if (isOpen === void 0) { isOpen = false; }
                 this.host = host;
                 this.fileName = fileName;
+                this.content = content;
                 this.isOpen = isOpen;
                 this.children = [];
                 this.formatCodeOptions = ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host));
@@ -52535,7 +52419,7 @@ var ts;
                     done: false,
                     leaf: function (relativeStart, relativeLength, ll) {
                         if (!f(ll, relativeStart, relativeLength)) {
-                            walkFns.done = true;
+                            this.done = true;
                         }
                     }
                 };
@@ -53185,7 +53069,7 @@ var ts;
         ioSession.listen();
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
-var debugObjectHost = new Function("return this")();
+var debugObjectHost = this;
 var ts;
 (function (ts) {
     function logInternalError(logger, err) {
@@ -53313,7 +53197,7 @@ var ts;
             return this.shimHost.getCurrentDirectory();
         };
         LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
+            return this.shimHost.getDirectories(path);
         };
         LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
             return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
index 1821c212574..2c9fffcfcfb 100644
--- a/lib/tsserverlibrary.d.ts
+++ b/lib/tsserverlibrary.d.ts
@@ -405,10 +405,7 @@ declare namespace ts {
     interface ModifiersArray extends NodeArray<Modifier> {
         flags: NodeFlags;
     }
-    interface Token extends Node {
-        __tokenTag: any;
-    }
-    interface Modifier extends Token {
+    interface Modifier extends Node {
     }
     interface Identifier extends PrimaryExpression {
         text: string;
@@ -2053,6 +2050,7 @@ declare namespace ts {
         getCancellationToken?(): CancellationToken;
         getDefaultLibFileName(options: CompilerOptions): string;
         getDefaultLibLocation?(): string;
+        getDefaultTypeDirectiveNames?(rootPath: string): string[];
         writeFile: WriteFileCallback;
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
@@ -2158,8 +2156,6 @@ declare namespace ts {
     function ensureTrailingDirectorySeparator(path: string): string;
     function comparePaths(a: string, b: string, currentDirectory: string, ignoreCase?: boolean): Comparison;
     function containsPath(parent: string, child: string, currentDirectory: string, ignoreCase?: boolean): boolean;
-    function startsWith(str: string, prefix: string): boolean;
-    function endsWith(str: string, suffix: string): boolean;
     function fileExtensionIs(path: string, extension: string): boolean;
     function fileExtensionIsAny(path: string, extensions: string[]): boolean;
     function getRegularExpressionForWildcard(specs: string[], basePath: string, usage: "files" | "directories" | "exclude"): string;
@@ -2197,8 +2193,6 @@ declare namespace ts {
     function changeExtension<T extends string | Path>(path: T, newExtension: string): T;
     interface ObjectAllocator {
         getNodeConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Node;
-        getTokenConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Token;
-        getIdentifierConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Token;
         getSourceFileConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => SourceFile;
         getSymbolConstructor(): new (flags: SymbolFlags, name: string) => Symbol;
         getTypeConstructor(): new (checker: TypeChecker, flags: TypeFlags) => Type;
@@ -6462,13 +6456,13 @@ declare namespace ts {
             key: string;
             message: string;
         };
-        Report_errors_on_unused_locals: {
+        Report_Errors_on_Unused_Locals: {
             code: number;
             category: DiagnosticCategory;
             key: string;
             message: string;
         };
-        Report_errors_on_unused_parameters: {
+        Report_Errors_on_Unused_Parameters: {
             code: number;
             category: DiagnosticCategory;
             key: string;
@@ -7149,6 +7143,8 @@ declare namespace ts {
     function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
     function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean;
+    function startsWith(str: string, prefix: string): boolean;
+    function endsWith(str: string, suffix: string): boolean;
 }
 declare namespace ts {
     let parseTime: number;
@@ -7229,12 +7225,6 @@ declare namespace ts {
     const defaultInitCompilerOptions: CompilerOptions;
     function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
     function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-    interface FormatDiagnosticsHost {
-        getCurrentDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        getNewLine(): string;
-    }
-    function formatDiagnostics(diagnostics: Diagnostic[], host: FormatDiagnosticsHost): string;
     function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
     function getAutomaticTypeDirectiveNames(options: CompilerOptions, rootFiles: string[], host: CompilerHost): string[];
     function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
@@ -8398,6 +8388,7 @@ declare namespace ts.server {
     class ScriptInfo {
         private host;
         fileName: string;
+        content: string;
         isOpen: boolean;
         svc: ScriptVersionCache;
         children: ScriptInfo[];
@@ -8738,7 +8729,7 @@ declare namespace ts {
         getLocalizedDiagnosticMessages(): string;
         getCancellationToken(): HostCancellationToken;
         getCurrentDirectory(): string;
-        getDirectories(path: string): string;
+        getDirectories(path: string): string[];
         getDefaultLibFileName(options: string): string;
         getNewLine?(): string;
         getProjectVersion?(): string;
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index 8823d9ce98b..5dafd5528a8 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -830,17 +830,10 @@ var ts;
         return true;
     }
     ts.containsPath = containsPath;
-    function startsWith(str, prefix) {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-    ts.startsWith = startsWith;
-    function endsWith(str, suffix) {
-        var expectedPos = str.length - suffix.length;
-        return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
-    }
-    ts.endsWith = endsWith;
     function fileExtensionIs(path, extension) {
-        return path.length > extension.length && endsWith(path, extension);
+        var pathLen = path.length;
+        var extLen = extension.length;
+        return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
     function fileExtensionIsAny(path, extensions) {
@@ -1105,8 +1098,6 @@ var ts;
     }
     ts.objectAllocator = {
         getNodeConstructor: function () { return Node; },
-        getTokenConstructor: function () { return Node; },
-        getIdentifierConstructor: function () { return Node; },
         getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
@@ -1238,7 +1229,7 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
             }
-            var wscriptSystem = {
+            return {
                 args: args,
                 newLine: "\r\n",
                 useCaseSensitiveFileNames: false,
@@ -1257,7 +1248,7 @@ var ts;
                     return fso.FolderExists(path);
                 },
                 createDirectory: function (directoryName) {
-                    if (!wscriptSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
                 },
@@ -1277,7 +1268,6 @@ var ts;
                     }
                 }
             };
-            return wscriptSystem;
         }
         function getNodeSystem() {
             var _fs = require("fs");
@@ -1450,7 +1440,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (p) { return fileSystemEntryExists(ts.combinePaths(path, p), 1); });
             }
-            var nodeSystem = {
+            return {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
@@ -1500,7 +1490,7 @@ var ts;
                 fileExists: fileExists,
                 directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
-                    if (!nodeSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
                 },
@@ -1548,7 +1538,6 @@ var ts;
                     return _fs.realpathSync(path);
                 }
             };
-            return nodeSystem;
         }
         function getChakraSystem() {
             var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
@@ -2298,8 +2287,8 @@ var ts;
         Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: { code: 6131, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", message: "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'." },
         File_name_0_has_a_1_extension_stripping_it: { code: 6132, category: ts.DiagnosticCategory.Message, key: "File_name_0_has_a_1_extension_stripping_it_6132", message: "File name '{0}' has a '{1}' extension - stripping it" },
         _0_is_declared_but_never_used: { code: 6133, category: ts.DiagnosticCategory.Error, key: "_0_is_declared_but_never_used_6133", message: "'{0}' is declared but never used." },
-        Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
-        Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
+        Report_Errors_on_Unused_Locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Locals_6134", message: "Report Errors on Unused Locals." },
+        Report_Errors_on_Unused_Parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Parameters_6135", message: "Report Errors on Unused Parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
         No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
@@ -3977,12 +3966,12 @@ var ts;
         {
             name: "noUnusedLocals",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals
+            description: ts.Diagnostics.Report_Errors_on_Unused_Locals
         },
         {
             name: "noUnusedParameters",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters
+            description: ts.Diagnostics.Report_Errors_on_Unused_Parameters
         },
         {
             name: "noLib",
@@ -5765,7 +5754,7 @@ var ts;
     }
     ts.isExpression = isExpression;
     function isExternalModuleNameRelative(moduleName) {
-        return /^\.\.?($|[\\/])/.test(moduleName);
+        return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
     }
     ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
     function isInstantiatedModule(node, preserveConstEnums) {
@@ -7273,24 +7262,25 @@ var ts;
         return node.flags & 92 && node.parent.kind === 148 && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function startsWith(str, prefix) {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+    ts.startsWith = startsWith;
+    function endsWith(str, suffix) {
+        var expectedPos = str.length - suffix.length;
+        return str.indexOf(suffix, expectedPos) === expectedPos;
+    }
+    ts.endsWith = endsWith;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     ts.parseTime = 0;
     var NodeConstructor;
-    var TokenConstructor;
-    var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
         if (kind === 256) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 69) {
-            return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
-        }
-        else if (kind < 139) {
-            return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
-        }
         else {
             return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
         }
@@ -7713,8 +7703,6 @@ var ts;
         var scanner = ts.createScanner(2, true);
         var disallowInAndDecoratorContext = 4194304 | 16777216;
         var NodeConstructor;
-        var TokenConstructor;
-        var IdentifierConstructor;
         var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
@@ -7740,8 +7728,6 @@ var ts;
         }
         function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
-            TokenConstructor = ts.objectAllocator.getTokenConstructor();
-            IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
@@ -8048,9 +8034,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 139 ? new NodeConstructor(kind, pos, pos) :
-                kind === 69 ? new IdentifierConstructor(kind, pos, pos) :
-                    new TokenConstructor(kind, pos, pos);
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -11826,9 +11810,6 @@ var ts;
                                 case 55:
                                     if (canParseTag) {
                                         parentTagTerminated = !tryParseChildTag(jsDocTypeLiteral);
-                                        if (!parentTagTerminated) {
-                                            resumePos = scanner.getStartPos();
-                                        }
                                     }
                                     seenAsterisk = false;
                                     break;
@@ -16355,18 +16336,17 @@ var ts;
                 if (declaration.kind === 235) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 134217728 && declaration.kind === 280 && declaration.typeExpression) {
-                    return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
-                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
                 var type = undefined;
-                if (declaration.kind === 187 ||
-                    declaration.kind === 172 && declaration.parent.kind === 187) {
-                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return decl.kind === 187 ?
-                        checkExpressionCached(decl.right) :
-                        checkExpressionCached(decl.parent.right); }));
+                if (declaration.kind === 187) {
+                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
+                }
+                else if (declaration.kind === 172) {
+                    if (declaration.parent.kind === 187) {
+                        type = checkExpressionCached(declaration.parent.right);
+                    }
                 }
                 if (type === undefined) {
                     type = getWidenedTypeForVariableLikeDeclaration(declaration, true);
@@ -22873,7 +22853,7 @@ var ts;
         function getInferredClassType(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.inferredClassType) {
-                links.inferredClassType = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined);
+                links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, undefined, undefined);
             }
             return links.inferredClassType;
         }
@@ -24093,7 +24073,7 @@ var ts;
                         checkAsyncFunctionReturnType(node);
                     }
                 }
-                if (noUnusedIdentifiers && !node.body) {
+                if (!node.body) {
                     checkUnusedTypeParameters(node);
                 }
             }
@@ -24989,7 +24969,6 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
-                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -25005,9 +24984,6 @@ var ts;
                 }
             }
         }
-        function parameterIsThisKeyword(parameter) {
-            return parameter.name && parameter.name.originalKeywordKind === 97;
-        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;
         }
@@ -25036,14 +25012,9 @@ var ts;
         function checkUnusedTypeParameters(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.typeParameters) {
-                    var symbol = getSymbolOfNode(node);
-                    var lastDeclaration = symbol && symbol.declarations && ts.lastOrUndefined(symbol.declarations);
-                    if (lastDeclaration !== node) {
-                        return;
-                    }
                     for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
                         var typeParameter = _a[_i];
-                        if (!getMergedSymbol(typeParameter.symbol).isReferenced) {
+                        if (!typeParameter.symbol.isReferenced) {
                             error(typeParameter.name, ts.Diagnostics._0_is_declared_but_never_used, typeParameter.symbol.name);
                         }
                     }
@@ -26120,7 +26091,7 @@ var ts;
             ts.forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 checkTypeForDuplicateIndexSignatures(node);
-                registerForUnusedIdentifiersCheck(node);
+                checkUnusedTypeParameters(node);
             }
         }
         function checkTypeAliasDeclaration(node) {
@@ -30843,7 +30814,7 @@ var ts;
                 writeLine();
                 var sourceMappingURL = sourceMap.getSourceMappingURL();
                 if (sourceMappingURL) {
-                    write("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
+                    write("//# sourceMappingURL=" + sourceMappingURL);
                 }
                 writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM, sourceFiles);
                 sourceMap.reset();
@@ -34493,13 +34464,13 @@ var ts;
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512) && decoratedClassAlias === undefined) {
                             write("export ");
                         }
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         if (decoratedClassAlias !== undefined) {
-                            write("let " + decoratedClassAlias);
+                            write("" + decoratedClassAlias);
                         }
                         else {
-                            if (!isHoistedDeclarationInSystemModule) {
-                                write("let ");
-                            }
                             emitDeclarationName(node);
                         }
                         write(" = ");
@@ -36743,7 +36714,7 @@ var ts;
     ts.emitTime = 0;
     ts.ioReadTime = 0;
     ts.ioWriteTime = 0;
-    ts.version = "2.1.0";
+    ts.version = "2.0.0";
     var emptyArray = [];
     var defaultTypeRoots = ["node_modules/@types"];
     function findConfigFile(searchPath, fileExists) {
@@ -36823,7 +36794,12 @@ var ts;
         return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
     }
     function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+        if (ts.isRootedDiskPath(moduleName)) {
+            return false;
+        }
+        var i = moduleName.lastIndexOf("./", 1);
+        var startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === 46);
+        return !startsWithDotSlashOrDotDotSlash;
     }
     function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
         var jsonContent;
@@ -37479,22 +37455,6 @@ var ts;
         return ts.sortAndDeduplicateDiagnostics(diagnostics);
     }
     ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
-    function formatDiagnostics(diagnostics, host) {
-        var output = "";
-        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
-            var diagnostic = diagnostics_1[_i];
-            if (diagnostic.file) {
-                var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
-                var fileName = diagnostic.file.fileName;
-                var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-                output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
-            }
-            var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
-        }
-        return output;
-    }
-    ts.formatDiagnostics = formatDiagnostics;
     function flattenDiagnosticMessageText(messageText, newLine) {
         if (typeof messageText === "string") {
             return messageText;
@@ -37570,7 +37530,7 @@ var ts;
         var resolvedTypeReferenceDirectives = {};
         var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
-        var currentNodeModulesDepth = 0;
+        var currentNodeModulesJsDepth = 0;
         var modulesWithElidedImports = {};
         var sourceFilesFoundSearchingNodeModules = {};
         var start = new Date().getTime();
@@ -37794,7 +37754,8 @@ var ts;
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, false));
         }
         function emit(sourceFile, writeFileCallback, cancellationToken) {
-            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken); });
+            var _this = this;
+            return runWithCancellationToken(function () { return emitWorker(_this, sourceFile, writeFileCallback, cancellationToken); });
         }
         function isEmitBlocked(emitFileName) {
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
@@ -38201,17 +38162,8 @@ var ts;
                 if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== ts.getNormalizedAbsolutePath(fileName, currentDirectory)) {
                     reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
                 }
-                if (file_1 && ts.lookUp(sourceFilesFoundSearchingNodeModules, file_1.path) && currentNodeModulesDepth == 0) {
-                    sourceFilesFoundSearchingNodeModules[file_1.path] = false;
-                    if (!options.noResolve) {
-                        processReferencedFiles(file_1, ts.getDirectoryPath(fileName), isDefaultLib);
-                        processTypeReferenceDirectives(file_1);
-                    }
-                    modulesWithElidedImports[file_1.path] = false;
-                    processImportedModules(file_1, ts.getDirectoryPath(fileName));
-                }
-                else if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1, ts.getDirectoryPath(fileName));
                     }
@@ -38228,7 +38180,6 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
-                sourceFilesFoundSearchingNodeModules[path] = (currentNodeModulesDepth > 0);
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     var existingFile = filesByNameIgnoreCase.get(path);
@@ -38329,9 +38280,12 @@ var ts;
                     var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
                     var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
                     if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
+                        sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth++;
+                    }
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
                     var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
@@ -38339,8 +38293,8 @@ var ts;
                     else if (shouldAddFile) {
                         findSourceFile(resolution.resolvedFileName, resolvedPath, false, false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                     }
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth--;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth--;
                     }
                 }
             }
@@ -39933,7 +39887,7 @@ var ts;
                     return createPatternMatch(PatternMatchKind.exact, punctuationStripped, candidate === chunk.text);
                 }
                 else {
-                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, ts.startsWith(candidate, chunk.text));
+                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, startsWith(candidate, chunk.text));
                 }
             }
             var isLowercase = chunk.isLowerCase;
@@ -40105,6 +40059,14 @@ var ts;
         var str = String.fromCharCode(ch);
         return str === str.toLowerCase();
     }
+    function startsWith(string, search) {
+        for (var i = 0, n = search.length; i < n; i++) {
+            if (string.charCodeAt(i) !== search.charCodeAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
     function indexOfIgnoringCase(string, value) {
         for (var i = 0, n = string.length - value.length; i <= n; i++) {
             if (startsWithIgnoringCase(string, value, i)) {
@@ -41589,9 +41551,6 @@ var ts;
                 }
                 return false;
             }
-            function shouldRescanJsxText(node) {
-                return node && node.kind === 244;
-            }
             function shouldRescanSlashToken(container) {
                 return container.kind === 10;
             }
@@ -41619,9 +41578,7 @@ var ts;
                             ? 3
                             : shouldRescanJsxIdentifier(n)
                                 ? 4
-                                : shouldRescanJsxText(n)
-                                    ? 5
-                                    : 0;
+                                : 0;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     return fixTokenKind(lastTokenInfo, n);
                 }
@@ -41649,10 +41606,6 @@ var ts;
                     currentToken = scanner.scanJsxIdentifier();
                     lastScanAction = 4;
                 }
-                else if (expectedScanAction === 5) {
-                    currentToken = scanner.reScanJsxToken();
-                    lastScanAction = 5;
-                }
                 else {
                     lastScanAction = 0;
                 }
@@ -43901,20 +43854,19 @@ var ts;
         "version"
     ];
     var jsDocCompletionEntries;
-    function createNode(kind, pos, end, parent) {
-        var node = kind >= 139 ? new NodeObject(kind, pos, end) :
-            kind === 69 ? new IdentifierObject(kind, pos, end) :
-                new TokenObject(kind, pos, end);
+    function createNode(kind, pos, end, flags, parent) {
+        var node = new NodeObject(kind, pos, end);
+        node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
         function NodeObject(kind, pos, end) {
+            this.kind = kind;
             this.pos = pos;
             this.end = end;
             this.flags = 0;
             this.parent = undefined;
-            this.kind = kind;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -43949,14 +43901,14 @@ var ts;
                 var token = useJSDocScanner ? scanner.scanJSDocToken() : scanner.scan();
                 var textPos = scanner.getTextPos();
                 if (textPos <= end) {
-                    nodes.push(createNode(token, pos, textPos, this));
+                    nodes.push(createNode(token, pos, textPos, 0, this));
                 }
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(282, nodes.pos, nodes.end, this);
+            var list = createNode(282, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
             for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
@@ -44041,73 +43993,6 @@ var ts;
         };
         return NodeObject;
     }());
-    var TokenOrIdentifierObject = (function () {
-        function TokenOrIdentifierObject(pos, end) {
-            this.pos = pos;
-            this.end = end;
-            this.flags = 0;
-            this.parent = undefined;
-        }
-        TokenOrIdentifierObject.prototype.getSourceFile = function () {
-            return ts.getSourceFileOfNode(this);
-        };
-        TokenOrIdentifierObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
-            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
-        };
-        TokenOrIdentifierObject.prototype.getFullStart = function () {
-            return this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getEnd = function () {
-            return this.end;
-        };
-        TokenOrIdentifierObject.prototype.getWidth = function (sourceFile) {
-            return this.getEnd() - this.getStart(sourceFile);
-        };
-        TokenOrIdentifierObject.prototype.getFullWidth = function () {
-            return this.end - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
-            return this.getStart(sourceFile) - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getFullText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
-        };
-        TokenOrIdentifierObject.prototype.getText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.getStart(), this.getEnd());
-        };
-        TokenOrIdentifierObject.prototype.getChildCount = function (sourceFile) {
-            return 0;
-        };
-        TokenOrIdentifierObject.prototype.getChildAt = function (index, sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getChildren = function (sourceFile) {
-            return emptyArray;
-        };
-        TokenOrIdentifierObject.prototype.getFirstToken = function (sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getLastToken = function (sourceFile) {
-            return undefined;
-        };
-        return TokenOrIdentifierObject;
-    }());
-    var TokenObject = (function (_super) {
-        __extends(TokenObject, _super);
-        function TokenObject(kind, pos, end) {
-            _super.call(this, pos, end);
-            this.kind = kind;
-        }
-        return TokenObject;
-    }(TokenOrIdentifierObject));
-    var IdentifierObject = (function (_super) {
-        __extends(IdentifierObject, _super);
-        function IdentifierObject(kind, pos, end) {
-            _super.call(this, pos, end);
-        }
-        return IdentifierObject;
-    }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 69;
     var SymbolObject = (function () {
         function SymbolObject(flags, name) {
             this.flags = flags;
@@ -49788,8 +49673,6 @@ var ts;
     function initializeServices() {
         ts.objectAllocator = {
             getNodeConstructor: function () { return NodeObject; },
-            getTokenConstructor: function () { return TokenObject; },
-            getIdentifierConstructor: function () { return IdentifierObject; },
             getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
@@ -50910,6 +50793,7 @@ var ts;
                 if (isOpen === void 0) { isOpen = false; }
                 this.host = host;
                 this.fileName = fileName;
+                this.content = content;
                 this.isOpen = isOpen;
                 this.children = [];
                 this.formatCodeOptions = ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host));
@@ -52535,7 +52419,7 @@ var ts;
                     done: false,
                     leaf: function (relativeStart, relativeLength, ll) {
                         if (!f(ll, relativeStart, relativeLength)) {
-                            walkFns.done = true;
+                            this.done = true;
                         }
                     }
                 };
@@ -52951,7 +52835,7 @@ var ts;
         server.LineLeaf = LineLeaf;
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
-var debugObjectHost = new Function("return this")();
+var debugObjectHost = this;
 var ts;
 (function (ts) {
     function logInternalError(logger, err) {
@@ -53079,7 +52963,7 @@ var ts;
             return this.shimHost.getCurrentDirectory();
         };
         LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
+            return this.shimHost.getDirectories(path);
         };
         LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
             return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 92937fecf99..c322ba1dd0c 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -409,10 +409,7 @@ declare namespace ts {
     interface ModifiersArray extends NodeArray<Modifier> {
         flags: NodeFlags;
     }
-    interface Token extends Node {
-        __tokenTag: any;
-    }
-    interface Modifier extends Token {
+    interface Modifier extends Node {
     }
     interface Identifier extends PrimaryExpression {
         text: string;
@@ -1699,6 +1696,7 @@ declare namespace ts {
         getCancellationToken?(): CancellationToken;
         getDefaultLibFileName(options: CompilerOptions): string;
         getDefaultLibLocation?(): string;
+        getDefaultTypeDirectiveNames?(rootPath: string): string[];
         writeFile: WriteFileCallback;
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
@@ -1844,6 +1842,8 @@ declare namespace ts {
     function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
     function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean;
+    function startsWith(str: string, prefix: string): boolean;
+    function endsWith(str: string, suffix: string): boolean;
 }
 declare namespace ts {
     function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
@@ -1868,12 +1868,6 @@ declare namespace ts {
     function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
     function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
     function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-    interface FormatDiagnosticsHost {
-        getCurrentDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        getNewLine(): string;
-    }
-    function formatDiagnostics(diagnostics: Diagnostic[], host: FormatDiagnosticsHost): string;
     function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
     /**
       * Given a set of options and a set of root files, returns the set of type directive names
diff --git a/lib/typescript.js b/lib/typescript.js
index 41d3676a415..22cbe79129c 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -1756,19 +1756,10 @@ var ts;
         return true;
     }
     ts.containsPath = containsPath;
-    /* @internal */
-    function startsWith(str, prefix) {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-    ts.startsWith = startsWith;
-    /* @internal */
-    function endsWith(str, suffix) {
-        var expectedPos = str.length - suffix.length;
-        return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
-    }
-    ts.endsWith = endsWith;
     function fileExtensionIs(path, extension) {
-        return path.length > extension.length && endsWith(path, extension);
+        var pathLen = path.length;
+        var extLen = extension.length;
+        return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
     function fileExtensionIsAny(path, extensions) {
@@ -2079,8 +2070,6 @@ var ts;
     }
     ts.objectAllocator = {
         getNodeConstructor: function () { return Node; },
-        getTokenConstructor: function () { return Node; },
-        getIdentifierConstructor: function () { return Node; },
         getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
@@ -2227,7 +2216,7 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
             }
-            var wscriptSystem = {
+            return {
                 args: args,
                 newLine: "\r\n",
                 useCaseSensitiveFileNames: false,
@@ -2246,7 +2235,7 @@ var ts;
                     return fso.FolderExists(path);
                 },
                 createDirectory: function (directoryName) {
-                    if (!wscriptSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
                 },
@@ -2266,7 +2255,6 @@ var ts;
                     }
                 }
             };
-            return wscriptSystem;
         }
         function getNodeSystem() {
             var _fs = require("fs");
@@ -2456,7 +2444,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (p) { return fileSystemEntryExists(ts.combinePaths(path, p), 1 /* Directory */); });
             }
-            var nodeSystem = {
+            return {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
@@ -2512,7 +2500,7 @@ var ts;
                 fileExists: fileExists,
                 directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
-                    if (!nodeSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
                 },
@@ -2560,7 +2548,6 @@ var ts;
                     return _fs.realpathSync(path);
                 }
             };
-            return nodeSystem;
         }
         function getChakraSystem() {
             var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
@@ -3317,8 +3304,8 @@ var ts;
         Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: { code: 6131, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", message: "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'." },
         File_name_0_has_a_1_extension_stripping_it: { code: 6132, category: ts.DiagnosticCategory.Message, key: "File_name_0_has_a_1_extension_stripping_it_6132", message: "File name '{0}' has a '{1}' extension - stripping it" },
         _0_is_declared_but_never_used: { code: 6133, category: ts.DiagnosticCategory.Error, key: "_0_is_declared_but_never_used_6133", message: "'{0}' is declared but never used." },
-        Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
-        Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
+        Report_Errors_on_Unused_Locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Locals_6134", message: "Report Errors on Unused Locals." },
+        Report_Errors_on_Unused_Parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Parameters_6135", message: "Report Errors on Unused Parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
         No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
@@ -6166,7 +6153,7 @@ var ts;
     function isExternalModuleNameRelative(moduleName) {
         // TypeScript 1.0 spec (April 2014): 11.2.1
         // An external module name is "relative" if the first term is "." or "..".
-        return /^\.\.?($|[\\/])/.test(moduleName);
+        return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
     }
     ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
     function isInstantiatedModule(node, preserveConstEnums) {
@@ -7929,6 +7916,15 @@ var ts;
         return node.flags & 92 /* ParameterPropertyModifier */ && node.parent.kind === 148 /* Constructor */ && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function startsWith(str, prefix) {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+    ts.startsWith = startsWith;
+    function endsWith(str, suffix) {
+        var expectedPos = str.length - suffix.length;
+        return str.indexOf(suffix, expectedPos) === expectedPos;
+    }
+    ts.endsWith = endsWith;
 })(ts || (ts = {}));
 /// <reference path="utilities.ts"/>
 /// <reference path="scanner.ts"/>
@@ -7936,19 +7932,11 @@ var ts;
 (function (ts) {
     /* @internal */ ts.parseTime = 0;
     var NodeConstructor;
-    var TokenConstructor;
-    var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
         if (kind === 256 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 69 /* Identifier */) {
-            return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
-        }
-        else if (kind < 139 /* FirstNode */) {
-            return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
-        }
         else {
             return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
         }
@@ -8398,8 +8386,6 @@ var ts;
         var disallowInAndDecoratorContext = 4194304 /* DisallowInContext */ | 16777216 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         var NodeConstructor;
-        var TokenConstructor;
-        var IdentifierConstructor;
         var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
@@ -8499,8 +8485,6 @@ var ts;
         }
         function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
-            TokenConstructor = ts.objectAllocator.getTokenConstructor();
-            IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
@@ -8871,9 +8855,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 139 /* FirstNode */ ? new NodeConstructor(kind, pos, pos) :
-                kind === 69 /* Identifier */ ? new IdentifierConstructor(kind, pos, pos) :
-                    new TokenConstructor(kind, pos, pos);
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -13542,9 +13524,6 @@ var ts;
                                 case 55 /* AtToken */:
                                     if (canParseTag) {
                                         parentTagTerminated = !tryParseChildTag(jsDocTypeLiteral);
-                                        if (!parentTagTerminated) {
-                                            resumePos = scanner.getStartPos();
-                                        }
                                     }
                                     seenAsterisk = false;
                                     break;
@@ -19012,24 +18991,22 @@ var ts;
                 if (declaration.kind === 235 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 134217728 /* JavaScriptFile */ && declaration.kind === 280 /* JSDocPropertyTag */ && declaration.typeExpression) {
-                    return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
-                }
                 // Handle variable, parameter or property
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
                     return unknownType;
                 }
                 var type = undefined;
-                // Handle certain special assignment kinds, which happen to union across multiple declarations:
-                // * module.exports = expr
-                // * exports.p = expr
-                // * this.p = expr
-                // * className.prototype.method = expr
-                if (declaration.kind === 187 /* BinaryExpression */ ||
-                    declaration.kind === 172 /* PropertyAccessExpression */ && declaration.parent.kind === 187 /* BinaryExpression */) {
-                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return decl.kind === 187 /* BinaryExpression */ ?
-                        checkExpressionCached(decl.right) :
-                        checkExpressionCached(decl.parent.right); }));
+                // Handle module.exports = expr or this.p = expr
+                if (declaration.kind === 187 /* BinaryExpression */) {
+                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
+                }
+                else if (declaration.kind === 172 /* PropertyAccessExpression */) {
+                    // Declarations only exist for property access expressions for certain
+                    // special assignment kinds
+                    if (declaration.parent.kind === 187 /* BinaryExpression */) {
+                        // Handle exports.p = expr  or className.prototype.method = expr
+                        type = checkExpressionCached(declaration.parent.right);
+                    }
                 }
                 if (type === undefined) {
                     type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true);
@@ -26784,7 +26761,7 @@ var ts;
         function getInferredClassType(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.inferredClassType) {
-                links.inferredClassType = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined);
+                links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined);
             }
             return links.inferredClassType;
         }
@@ -28225,7 +28202,7 @@ var ts;
                         checkAsyncFunctionReturnType(node);
                     }
                 }
-                if (noUnusedIdentifiers && !node.body) {
+                if (!node.body) {
                     checkUnusedTypeParameters(node);
                 }
             }
@@ -29364,7 +29341,6 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
-                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -29380,9 +29356,6 @@ var ts;
                 }
             }
         }
-        function parameterIsThisKeyword(parameter) {
-            return parameter.name && parameter.name.originalKeywordKind === 97 /* ThisKeyword */;
-        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
         }
@@ -29411,16 +29384,9 @@ var ts;
         function checkUnusedTypeParameters(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.typeParameters) {
-                    // Only report errors on the last declaration for the type parameter container;
-                    // this ensures that all uses have been accounted for.
-                    var symbol = getSymbolOfNode(node);
-                    var lastDeclaration = symbol && symbol.declarations && ts.lastOrUndefined(symbol.declarations);
-                    if (lastDeclaration !== node) {
-                        return;
-                    }
                     for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
                         var typeParameter = _a[_i];
-                        if (!getMergedSymbol(typeParameter.symbol).isReferenced) {
+                        if (!typeParameter.symbol.isReferenced) {
                             error(typeParameter.name, ts.Diagnostics._0_is_declared_but_never_used, typeParameter.symbol.name);
                         }
                     }
@@ -30753,7 +30719,7 @@ var ts;
             ts.forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 checkTypeForDuplicateIndexSignatures(node);
-                registerForUnusedIdentifiersCheck(node);
+                checkUnusedTypeParameters(node);
             }
         }
         function checkTypeAliasDeclaration(node) {
@@ -36017,7 +35983,7 @@ var ts;
                 writeLine();
                 var sourceMappingURL = sourceMap.getSourceMappingURL();
                 if (sourceMappingURL) {
-                    write("//# " + "sourceMappingURL" + "=" + sourceMappingURL); // Sometimes tools can sometimes see this line as a source mapping url comment
+                    write("//# sourceMappingURL=" + sourceMappingURL);
                 }
                 writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
                 // reset the state
@@ -37914,7 +37880,7 @@ var ts;
              *   if we should also export the value after its it changed
              * - check if node is a source level declaration to emit it differently,
              *   i.e non-exported variable statement 'var x = 1' is hoisted so
-             *   when we emit variable statement 'var' should be dropped.
+             *   we we emit variable statement 'var' should be dropped.
              */
             function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
                 if (!node || !isCurrentFileSystemExternalModule()) {
@@ -40381,13 +40347,13 @@ var ts;
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */) && decoratedClassAlias === undefined) {
                             write("export ");
                         }
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         if (decoratedClassAlias !== undefined) {
-                            write("let " + decoratedClassAlias);
+                            write("" + decoratedClassAlias);
                         }
                         else {
-                            if (!isHoistedDeclarationInSystemModule) {
-                                write("let ");
-                            }
                             emitDeclarationName(node);
                         }
                         write(" = ");
@@ -40406,9 +40372,7 @@ var ts;
                 //
                 // We'll emit:
                 //
-                //      let C_1 = class C{};
-                //      C_1.a = 1;
-                //      C_1.b = 2; // so forth and so on
+                //      (_temp = class C { ... }, _temp.a = 1, _temp.b = 2, _temp)
                 //
                 // This keeps the expression as an expression, while ensuring that the static parts
                 // of it have been initialized by the time it is used.
@@ -42972,7 +42936,7 @@ var ts;
     /* @internal */ ts.ioReadTime = 0;
     /* @internal */ ts.ioWriteTime = 0;
     /** The version of the TypeScript compiler release */
-    ts.version = "2.1.0";
+    ts.version = "2.0.0";
     var emptyArray = [];
     var defaultTypeRoots = ["node_modules/@types"];
     function findConfigFile(searchPath, fileExists) {
@@ -43061,7 +43025,12 @@ var ts;
         return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
     }
     function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+        if (ts.isRootedDiskPath(moduleName)) {
+            return false;
+        }
+        var i = moduleName.lastIndexOf("./", 1);
+        var startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === 46 /* dot */);
+        return !startsWithDotSlashOrDotDotSlash;
     }
     function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
         var jsonContent;
@@ -43828,22 +43797,6 @@ var ts;
         return ts.sortAndDeduplicateDiagnostics(diagnostics);
     }
     ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
-    function formatDiagnostics(diagnostics, host) {
-        var output = "";
-        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
-            var diagnostic = diagnostics_1[_i];
-            if (diagnostic.file) {
-                var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
-                var fileName = diagnostic.file.fileName;
-                var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-                output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
-            }
-            var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
-        }
-        return output;
-    }
-    ts.formatDiagnostics = formatDiagnostics;
     function flattenDiagnosticMessageText(messageText, newLine) {
         if (typeof messageText === "string") {
             return messageText;
@@ -43936,11 +43889,11 @@ var ts;
         // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
         // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
         var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
-        var currentNodeModulesDepth = 0;
+        var currentNodeModulesJsDepth = 0;
         // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
         // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
         var modulesWithElidedImports = {};
-        // Track source files that are source files found by searching under node_modules, as these shouldn't be compiled.
+        // Track source files that are JavaScript files found by searching under node_modules, as these shouldn't be compiled.
         var sourceFilesFoundSearchingNodeModules = {};
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
@@ -44197,7 +44150,8 @@ var ts;
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ false));
         }
         function emit(sourceFile, writeFileCallback, cancellationToken) {
-            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken); });
+            var _this = this;
+            return runWithCancellationToken(function () { return emitWorker(_this, sourceFile, writeFileCallback, cancellationToken); });
         }
         function isEmitBlocked(emitFileName) {
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
@@ -44649,19 +44603,9 @@ var ts;
                 if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== ts.getNormalizedAbsolutePath(fileName, currentDirectory)) {
                     reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
                 }
-                // If the file was previously found via a node_modules search, but is now being processed as a root file,
-                // then everything it sucks in may also be marked incorrectly, and needs to be checked again.
-                if (file_1 && ts.lookUp(sourceFilesFoundSearchingNodeModules, file_1.path) && currentNodeModulesDepth == 0) {
-                    sourceFilesFoundSearchingNodeModules[file_1.path] = false;
-                    if (!options.noResolve) {
-                        processReferencedFiles(file_1, ts.getDirectoryPath(fileName), isDefaultLib);
-                        processTypeReferenceDirectives(file_1);
-                    }
-                    modulesWithElidedImports[file_1.path] = false;
-                    processImportedModules(file_1, ts.getDirectoryPath(fileName));
-                }
-                else if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                // See if we need to reprocess the imports due to prior skipped imports
+                if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1, ts.getDirectoryPath(fileName));
                     }
@@ -44679,7 +44623,6 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
-                sourceFilesFoundSearchingNodeModules[path] = (currentNodeModulesDepth > 0);
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
@@ -44794,9 +44737,12 @@ var ts;
                     var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
                     var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
                     if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
+                        sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth++;
+                    }
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
                     var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
@@ -44805,8 +44751,8 @@ var ts;
                         findSourceFile(resolution.resolvedFileName, resolvedPath, 
                         /*isDefaultLib*/ false, /*isReference*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                     }
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth--;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth--;
                     }
                 }
             }
@@ -45144,12 +45090,12 @@ var ts;
         {
             name: "noUnusedLocals",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals
+            description: ts.Diagnostics.Report_Errors_on_Unused_Locals
         },
         {
             name: "noUnusedParameters",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters
+            description: ts.Diagnostics.Report_Errors_on_Unused_Parameters
         },
         {
             name: "noLib",
@@ -47141,7 +47087,7 @@ var ts;
                 else {
                     // b) Check if the part is a prefix of the candidate, in a case insensitive or sensitive
                     //    manner.  If it does, return that there was a prefix match.
-                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, /*isCaseSensitive:*/ ts.startsWith(candidate, chunk.text));
+                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, /*isCaseSensitive:*/ startsWith(candidate, chunk.text));
                 }
             }
             var isLowercase = chunk.isLowerCase;
@@ -47407,6 +47353,14 @@ var ts;
         var str = String.fromCharCode(ch);
         return str === str.toLowerCase();
     }
+    function startsWith(string, search) {
+        for (var i = 0, n = search.length; i < n; i++) {
+            if (string.charCodeAt(i) !== search.charCodeAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(string, value) {
         for (var i = 0, n = string.length - value.length; i <= n; i++) {
@@ -49251,7 +49205,6 @@ var ts;
             ScanAction[ScanAction["RescanSlashToken"] = 2] = "RescanSlashToken";
             ScanAction[ScanAction["RescanTemplateToken"] = 3] = "RescanTemplateToken";
             ScanAction[ScanAction["RescanJsxIdentifier"] = 4] = "RescanJsxIdentifier";
-            ScanAction[ScanAction["RescanJsxText"] = 5] = "RescanJsxText";
         })(ScanAction || (ScanAction = {}));
         function getFormattingScanner(sourceFile, startPos, endPos) {
             ts.Debug.assert(scanner === undefined);
@@ -49343,9 +49296,6 @@ var ts;
                 }
                 return false;
             }
-            function shouldRescanJsxText(node) {
-                return node && node.kind === 244 /* JsxText */;
-            }
             function shouldRescanSlashToken(container) {
                 return container.kind === 10 /* RegularExpressionLiteral */;
             }
@@ -49376,9 +49326,7 @@ var ts;
                             ? 3 /* RescanTemplateToken */
                             : shouldRescanJsxIdentifier(n)
                                 ? 4 /* RescanJsxIdentifier */
-                                : shouldRescanJsxText(n)
-                                    ? 5 /* RescanJsxText */
-                                    : 0 /* Scan */;
+                                : 0 /* Scan */;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     // readTokenInfo was called before with the same expected scan action.
                     // No need to re-scan text, return existing 'lastTokenInfo'
@@ -49413,10 +49361,6 @@ var ts;
                     currentToken = scanner.scanJsxIdentifier();
                     lastScanAction = 4 /* RescanJsxIdentifier */;
                 }
-                else if (expectedScanAction === 5 /* RescanJsxText */) {
-                    currentToken = scanner.reScanJsxToken();
-                    lastScanAction = 5 /* RescanJsxText */;
-                }
                 else {
                     lastScanAction = 0 /* Scan */;
                 }
@@ -52089,20 +52033,19 @@ var ts;
         "version"
     ];
     var jsDocCompletionEntries;
-    function createNode(kind, pos, end, parent) {
-        var node = kind >= 139 /* FirstNode */ ? new NodeObject(kind, pos, end) :
-            kind === 69 /* Identifier */ ? new IdentifierObject(kind, pos, end) :
-                new TokenObject(kind, pos, end);
+    function createNode(kind, pos, end, flags, parent) {
+        var node = new NodeObject(kind, pos, end);
+        node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
         function NodeObject(kind, pos, end) {
+            this.kind = kind;
             this.pos = pos;
             this.end = end;
             this.flags = 0 /* None */;
             this.parent = undefined;
-            this.kind = kind;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -52137,14 +52080,14 @@ var ts;
                 var token = useJSDocScanner ? scanner.scanJSDocToken() : scanner.scan();
                 var textPos = scanner.getTextPos();
                 if (textPos <= end) {
-                    nodes.push(createNode(token, pos, textPos, this));
+                    nodes.push(createNode(token, pos, textPos, 0, this));
                 }
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(282 /* SyntaxList */, nodes.pos, nodes.end, this);
+            var list = createNode(282 /* SyntaxList */, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
             for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
@@ -52230,74 +52173,6 @@ var ts;
         };
         return NodeObject;
     }());
-    var TokenOrIdentifierObject = (function () {
-        function TokenOrIdentifierObject(pos, end) {
-            // Set properties in same order as NodeObject
-            this.pos = pos;
-            this.end = end;
-            this.flags = 0 /* None */;
-            this.parent = undefined;
-        }
-        TokenOrIdentifierObject.prototype.getSourceFile = function () {
-            return ts.getSourceFileOfNode(this);
-        };
-        TokenOrIdentifierObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
-            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
-        };
-        TokenOrIdentifierObject.prototype.getFullStart = function () {
-            return this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getEnd = function () {
-            return this.end;
-        };
-        TokenOrIdentifierObject.prototype.getWidth = function (sourceFile) {
-            return this.getEnd() - this.getStart(sourceFile);
-        };
-        TokenOrIdentifierObject.prototype.getFullWidth = function () {
-            return this.end - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
-            return this.getStart(sourceFile) - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getFullText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
-        };
-        TokenOrIdentifierObject.prototype.getText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.getStart(), this.getEnd());
-        };
-        TokenOrIdentifierObject.prototype.getChildCount = function (sourceFile) {
-            return 0;
-        };
-        TokenOrIdentifierObject.prototype.getChildAt = function (index, sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getChildren = function (sourceFile) {
-            return emptyArray;
-        };
-        TokenOrIdentifierObject.prototype.getFirstToken = function (sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getLastToken = function (sourceFile) {
-            return undefined;
-        };
-        return TokenOrIdentifierObject;
-    }());
-    var TokenObject = (function (_super) {
-        __extends(TokenObject, _super);
-        function TokenObject(kind, pos, end) {
-            _super.call(this, pos, end);
-            this.kind = kind;
-        }
-        return TokenObject;
-    }(TokenOrIdentifierObject));
-    var IdentifierObject = (function (_super) {
-        __extends(IdentifierObject, _super);
-        function IdentifierObject(kind, pos, end) {
-            _super.call(this, pos, end);
-        }
-        return IdentifierObject;
-    }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 69 /* Identifier */;
     var SymbolObject = (function () {
         function SymbolObject(flags, name) {
             this.flags = flags;
@@ -59062,8 +58937,6 @@ var ts;
     function initializeServices() {
         ts.objectAllocator = {
             getNodeConstructor: function () { return NodeObject; },
-            getTokenConstructor: function () { return TokenObject; },
-            getIdentifierConstructor: function () { return IdentifierObject; },
             getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
@@ -59689,7 +59562,7 @@ var ts;
 //
 /// <reference path='services.ts' />
 /* @internal */
-var debugObjectHost = new Function("return this")();
+var debugObjectHost = this;
 // We need to use 'null' to interface with the managed side.
 /* tslint:disable:no-null-keyword */
 /* tslint:disable:no-in-operator */
@@ -59828,7 +59701,7 @@ var ts;
             return this.shimHost.getCurrentDirectory();
         };
         LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
+            return this.shimHost.getDirectories(path);
         };
         LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
             return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index a14277d920b..4ffdd868f16 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -409,10 +409,7 @@ declare namespace ts {
     interface ModifiersArray extends NodeArray<Modifier> {
         flags: NodeFlags;
     }
-    interface Token extends Node {
-        __tokenTag: any;
-    }
-    interface Modifier extends Token {
+    interface Modifier extends Node {
     }
     interface Identifier extends PrimaryExpression {
         text: string;
@@ -1699,6 +1696,7 @@ declare namespace ts {
         getCancellationToken?(): CancellationToken;
         getDefaultLibFileName(options: CompilerOptions): string;
         getDefaultLibLocation?(): string;
+        getDefaultTypeDirectiveNames?(rootPath: string): string[];
         writeFile: WriteFileCallback;
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
@@ -1844,6 +1842,8 @@ declare namespace ts {
     function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
     function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean;
+    function startsWith(str: string, prefix: string): boolean;
+    function endsWith(str: string, suffix: string): boolean;
 }
 declare namespace ts {
     function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
@@ -1868,12 +1868,6 @@ declare namespace ts {
     function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
     function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
     function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-    interface FormatDiagnosticsHost {
-        getCurrentDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        getNewLine(): string;
-    }
-    function formatDiagnostics(diagnostics: Diagnostic[], host: FormatDiagnosticsHost): string;
     function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
     /**
       * Given a set of options and a set of root files, returns the set of type directive names
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index 41d3676a415..22cbe79129c 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -1756,19 +1756,10 @@ var ts;
         return true;
     }
     ts.containsPath = containsPath;
-    /* @internal */
-    function startsWith(str, prefix) {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-    ts.startsWith = startsWith;
-    /* @internal */
-    function endsWith(str, suffix) {
-        var expectedPos = str.length - suffix.length;
-        return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
-    }
-    ts.endsWith = endsWith;
     function fileExtensionIs(path, extension) {
-        return path.length > extension.length && endsWith(path, extension);
+        var pathLen = path.length;
+        var extLen = extension.length;
+        return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
     function fileExtensionIsAny(path, extensions) {
@@ -2079,8 +2070,6 @@ var ts;
     }
     ts.objectAllocator = {
         getNodeConstructor: function () { return Node; },
-        getTokenConstructor: function () { return Node; },
-        getIdentifierConstructor: function () { return Node; },
         getSourceFileConstructor: function () { return Node; },
         getSymbolConstructor: function () { return Symbol; },
         getTypeConstructor: function () { return Type; },
@@ -2227,7 +2216,7 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
             }
-            var wscriptSystem = {
+            return {
                 args: args,
                 newLine: "\r\n",
                 useCaseSensitiveFileNames: false,
@@ -2246,7 +2235,7 @@ var ts;
                     return fso.FolderExists(path);
                 },
                 createDirectory: function (directoryName) {
-                    if (!wscriptSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
                 },
@@ -2266,7 +2255,6 @@ var ts;
                     }
                 }
             };
-            return wscriptSystem;
         }
         function getNodeSystem() {
             var _fs = require("fs");
@@ -2456,7 +2444,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (p) { return fileSystemEntryExists(ts.combinePaths(path, p), 1 /* Directory */); });
             }
-            var nodeSystem = {
+            return {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
@@ -2512,7 +2500,7 @@ var ts;
                 fileExists: fileExists,
                 directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
-                    if (!nodeSystem.directoryExists(directoryName)) {
+                    if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
                 },
@@ -2560,7 +2548,6 @@ var ts;
                     return _fs.realpathSync(path);
                 }
             };
-            return nodeSystem;
         }
         function getChakraSystem() {
             var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
@@ -3317,8 +3304,8 @@ var ts;
         Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: { code: 6131, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", message: "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'." },
         File_name_0_has_a_1_extension_stripping_it: { code: 6132, category: ts.DiagnosticCategory.Message, key: "File_name_0_has_a_1_extension_stripping_it_6132", message: "File name '{0}' has a '{1}' extension - stripping it" },
         _0_is_declared_but_never_used: { code: 6133, category: ts.DiagnosticCategory.Error, key: "_0_is_declared_but_never_used_6133", message: "'{0}' is declared but never used." },
-        Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
-        Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
+        Report_Errors_on_Unused_Locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Locals_6134", message: "Report Errors on Unused Locals." },
+        Report_Errors_on_Unused_Parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Parameters_6135", message: "Report Errors on Unused Parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
         No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
@@ -6166,7 +6153,7 @@ var ts;
     function isExternalModuleNameRelative(moduleName) {
         // TypeScript 1.0 spec (April 2014): 11.2.1
         // An external module name is "relative" if the first term is "." or "..".
-        return /^\.\.?($|[\\/])/.test(moduleName);
+        return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
     }
     ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
     function isInstantiatedModule(node, preserveConstEnums) {
@@ -7929,6 +7916,15 @@ var ts;
         return node.flags & 92 /* ParameterPropertyModifier */ && node.parent.kind === 148 /* Constructor */ && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function startsWith(str, prefix) {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+    ts.startsWith = startsWith;
+    function endsWith(str, suffix) {
+        var expectedPos = str.length - suffix.length;
+        return str.indexOf(suffix, expectedPos) === expectedPos;
+    }
+    ts.endsWith = endsWith;
 })(ts || (ts = {}));
 /// <reference path="utilities.ts"/>
 /// <reference path="scanner.ts"/>
@@ -7936,19 +7932,11 @@ var ts;
 (function (ts) {
     /* @internal */ ts.parseTime = 0;
     var NodeConstructor;
-    var TokenConstructor;
-    var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
         if (kind === 256 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 69 /* Identifier */) {
-            return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
-        }
-        else if (kind < 139 /* FirstNode */) {
-            return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
-        }
         else {
             return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
         }
@@ -8398,8 +8386,6 @@ var ts;
         var disallowInAndDecoratorContext = 4194304 /* DisallowInContext */ | 16777216 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         var NodeConstructor;
-        var TokenConstructor;
-        var IdentifierConstructor;
         var SourceFileConstructor;
         var sourceFile;
         var parseDiagnostics;
@@ -8499,8 +8485,6 @@ var ts;
         }
         function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
-            TokenConstructor = ts.objectAllocator.getTokenConstructor();
-            IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
             syntaxCursor = _syntaxCursor;
@@ -8871,9 +8855,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 139 /* FirstNode */ ? new NodeConstructor(kind, pos, pos) :
-                kind === 69 /* Identifier */ ? new IdentifierConstructor(kind, pos, pos) :
-                    new TokenConstructor(kind, pos, pos);
+            return new NodeConstructor(kind, pos, pos);
         }
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
@@ -13542,9 +13524,6 @@ var ts;
                                 case 55 /* AtToken */:
                                     if (canParseTag) {
                                         parentTagTerminated = !tryParseChildTag(jsDocTypeLiteral);
-                                        if (!parentTagTerminated) {
-                                            resumePos = scanner.getStartPos();
-                                        }
                                     }
                                     seenAsterisk = false;
                                     break;
@@ -19012,24 +18991,22 @@ var ts;
                 if (declaration.kind === 235 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 134217728 /* JavaScriptFile */ && declaration.kind === 280 /* JSDocPropertyTag */ && declaration.typeExpression) {
-                    return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
-                }
                 // Handle variable, parameter or property
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
                     return unknownType;
                 }
                 var type = undefined;
-                // Handle certain special assignment kinds, which happen to union across multiple declarations:
-                // * module.exports = expr
-                // * exports.p = expr
-                // * this.p = expr
-                // * className.prototype.method = expr
-                if (declaration.kind === 187 /* BinaryExpression */ ||
-                    declaration.kind === 172 /* PropertyAccessExpression */ && declaration.parent.kind === 187 /* BinaryExpression */) {
-                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return decl.kind === 187 /* BinaryExpression */ ?
-                        checkExpressionCached(decl.right) :
-                        checkExpressionCached(decl.parent.right); }));
+                // Handle module.exports = expr or this.p = expr
+                if (declaration.kind === 187 /* BinaryExpression */) {
+                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
+                }
+                else if (declaration.kind === 172 /* PropertyAccessExpression */) {
+                    // Declarations only exist for property access expressions for certain
+                    // special assignment kinds
+                    if (declaration.parent.kind === 187 /* BinaryExpression */) {
+                        // Handle exports.p = expr  or className.prototype.method = expr
+                        type = checkExpressionCached(declaration.parent.right);
+                    }
                 }
                 if (type === undefined) {
                     type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true);
@@ -26784,7 +26761,7 @@ var ts;
         function getInferredClassType(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.inferredClassType) {
-                links.inferredClassType = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined);
+                links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined);
             }
             return links.inferredClassType;
         }
@@ -28225,7 +28202,7 @@ var ts;
                         checkAsyncFunctionReturnType(node);
                     }
                 }
-                if (noUnusedIdentifiers && !node.body) {
+                if (!node.body) {
                     checkUnusedTypeParameters(node);
                 }
             }
@@ -29364,7 +29341,6 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
-                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -29380,9 +29356,6 @@ var ts;
                 }
             }
         }
-        function parameterIsThisKeyword(parameter) {
-            return parameter.name && parameter.name.originalKeywordKind === 97 /* ThisKeyword */;
-        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
         }
@@ -29411,16 +29384,9 @@ var ts;
         function checkUnusedTypeParameters(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.typeParameters) {
-                    // Only report errors on the last declaration for the type parameter container;
-                    // this ensures that all uses have been accounted for.
-                    var symbol = getSymbolOfNode(node);
-                    var lastDeclaration = symbol && symbol.declarations && ts.lastOrUndefined(symbol.declarations);
-                    if (lastDeclaration !== node) {
-                        return;
-                    }
                     for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
                         var typeParameter = _a[_i];
-                        if (!getMergedSymbol(typeParameter.symbol).isReferenced) {
+                        if (!typeParameter.symbol.isReferenced) {
                             error(typeParameter.name, ts.Diagnostics._0_is_declared_but_never_used, typeParameter.symbol.name);
                         }
                     }
@@ -30753,7 +30719,7 @@ var ts;
             ts.forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 checkTypeForDuplicateIndexSignatures(node);
-                registerForUnusedIdentifiersCheck(node);
+                checkUnusedTypeParameters(node);
             }
         }
         function checkTypeAliasDeclaration(node) {
@@ -36017,7 +35983,7 @@ var ts;
                 writeLine();
                 var sourceMappingURL = sourceMap.getSourceMappingURL();
                 if (sourceMappingURL) {
-                    write("//# " + "sourceMappingURL" + "=" + sourceMappingURL); // Sometimes tools can sometimes see this line as a source mapping url comment
+                    write("//# sourceMappingURL=" + sourceMappingURL);
                 }
                 writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
                 // reset the state
@@ -37914,7 +37880,7 @@ var ts;
              *   if we should also export the value after its it changed
              * - check if node is a source level declaration to emit it differently,
              *   i.e non-exported variable statement 'var x = 1' is hoisted so
-             *   when we emit variable statement 'var' should be dropped.
+             *   we we emit variable statement 'var' should be dropped.
              */
             function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
                 if (!node || !isCurrentFileSystemExternalModule()) {
@@ -40381,13 +40347,13 @@ var ts;
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */) && decoratedClassAlias === undefined) {
                             write("export ");
                         }
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         if (decoratedClassAlias !== undefined) {
-                            write("let " + decoratedClassAlias);
+                            write("" + decoratedClassAlias);
                         }
                         else {
-                            if (!isHoistedDeclarationInSystemModule) {
-                                write("let ");
-                            }
                             emitDeclarationName(node);
                         }
                         write(" = ");
@@ -40406,9 +40372,7 @@ var ts;
                 //
                 // We'll emit:
                 //
-                //      let C_1 = class C{};
-                //      C_1.a = 1;
-                //      C_1.b = 2; // so forth and so on
+                //      (_temp = class C { ... }, _temp.a = 1, _temp.b = 2, _temp)
                 //
                 // This keeps the expression as an expression, while ensuring that the static parts
                 // of it have been initialized by the time it is used.
@@ -42972,7 +42936,7 @@ var ts;
     /* @internal */ ts.ioReadTime = 0;
     /* @internal */ ts.ioWriteTime = 0;
     /** The version of the TypeScript compiler release */
-    ts.version = "2.1.0";
+    ts.version = "2.0.0";
     var emptyArray = [];
     var defaultTypeRoots = ["node_modules/@types"];
     function findConfigFile(searchPath, fileExists) {
@@ -43061,7 +43025,12 @@ var ts;
         return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
     }
     function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+        if (ts.isRootedDiskPath(moduleName)) {
+            return false;
+        }
+        var i = moduleName.lastIndexOf("./", 1);
+        var startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === 46 /* dot */);
+        return !startsWithDotSlashOrDotDotSlash;
     }
     function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
         var jsonContent;
@@ -43828,22 +43797,6 @@ var ts;
         return ts.sortAndDeduplicateDiagnostics(diagnostics);
     }
     ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
-    function formatDiagnostics(diagnostics, host) {
-        var output = "";
-        for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) {
-            var diagnostic = diagnostics_1[_i];
-            if (diagnostic.file) {
-                var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
-                var fileName = diagnostic.file.fileName;
-                var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-                output += relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): ";
-            }
-            var category = ts.DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
-        }
-        return output;
-    }
-    ts.formatDiagnostics = formatDiagnostics;
     function flattenDiagnosticMessageText(messageText, newLine) {
         if (typeof messageText === "string") {
             return messageText;
@@ -43936,11 +43889,11 @@ var ts;
         // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
         // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
         var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
-        var currentNodeModulesDepth = 0;
+        var currentNodeModulesJsDepth = 0;
         // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
         // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
         var modulesWithElidedImports = {};
-        // Track source files that are source files found by searching under node_modules, as these shouldn't be compiled.
+        // Track source files that are JavaScript files found by searching under node_modules, as these shouldn't be compiled.
         var sourceFilesFoundSearchingNodeModules = {};
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
@@ -44197,7 +44150,8 @@ var ts;
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ false));
         }
         function emit(sourceFile, writeFileCallback, cancellationToken) {
-            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken); });
+            var _this = this;
+            return runWithCancellationToken(function () { return emitWorker(_this, sourceFile, writeFileCallback, cancellationToken); });
         }
         function isEmitBlocked(emitFileName) {
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
@@ -44649,19 +44603,9 @@ var ts;
                 if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== ts.getNormalizedAbsolutePath(fileName, currentDirectory)) {
                     reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
                 }
-                // If the file was previously found via a node_modules search, but is now being processed as a root file,
-                // then everything it sucks in may also be marked incorrectly, and needs to be checked again.
-                if (file_1 && ts.lookUp(sourceFilesFoundSearchingNodeModules, file_1.path) && currentNodeModulesDepth == 0) {
-                    sourceFilesFoundSearchingNodeModules[file_1.path] = false;
-                    if (!options.noResolve) {
-                        processReferencedFiles(file_1, ts.getDirectoryPath(fileName), isDefaultLib);
-                        processTypeReferenceDirectives(file_1);
-                    }
-                    modulesWithElidedImports[file_1.path] = false;
-                    processImportedModules(file_1, ts.getDirectoryPath(fileName));
-                }
-                else if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                // See if we need to reprocess the imports due to prior skipped imports
+                if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1, ts.getDirectoryPath(fileName));
                     }
@@ -44679,7 +44623,6 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
-                sourceFilesFoundSearchingNodeModules[path] = (currentNodeModulesDepth > 0);
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
@@ -44794,9 +44737,12 @@ var ts;
                     var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
                     var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
                     if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
+                        sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth++;
+                    }
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
                     var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
@@ -44805,8 +44751,8 @@ var ts;
                         findSourceFile(resolution.resolvedFileName, resolvedPath, 
                         /*isDefaultLib*/ false, /*isReference*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                     }
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth--;
+                    if (isJsFileFromNodeModules) {
+                        currentNodeModulesJsDepth--;
                     }
                 }
             }
@@ -45144,12 +45090,12 @@ var ts;
         {
             name: "noUnusedLocals",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals
+            description: ts.Diagnostics.Report_Errors_on_Unused_Locals
         },
         {
             name: "noUnusedParameters",
             type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters
+            description: ts.Diagnostics.Report_Errors_on_Unused_Parameters
         },
         {
             name: "noLib",
@@ -47141,7 +47087,7 @@ var ts;
                 else {
                     // b) Check if the part is a prefix of the candidate, in a case insensitive or sensitive
                     //    manner.  If it does, return that there was a prefix match.
-                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, /*isCaseSensitive:*/ ts.startsWith(candidate, chunk.text));
+                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, /*isCaseSensitive:*/ startsWith(candidate, chunk.text));
                 }
             }
             var isLowercase = chunk.isLowerCase;
@@ -47407,6 +47353,14 @@ var ts;
         var str = String.fromCharCode(ch);
         return str === str.toLowerCase();
     }
+    function startsWith(string, search) {
+        for (var i = 0, n = search.length; i < n; i++) {
+            if (string.charCodeAt(i) !== search.charCodeAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(string, value) {
         for (var i = 0, n = string.length - value.length; i <= n; i++) {
@@ -49251,7 +49205,6 @@ var ts;
             ScanAction[ScanAction["RescanSlashToken"] = 2] = "RescanSlashToken";
             ScanAction[ScanAction["RescanTemplateToken"] = 3] = "RescanTemplateToken";
             ScanAction[ScanAction["RescanJsxIdentifier"] = 4] = "RescanJsxIdentifier";
-            ScanAction[ScanAction["RescanJsxText"] = 5] = "RescanJsxText";
         })(ScanAction || (ScanAction = {}));
         function getFormattingScanner(sourceFile, startPos, endPos) {
             ts.Debug.assert(scanner === undefined);
@@ -49343,9 +49296,6 @@ var ts;
                 }
                 return false;
             }
-            function shouldRescanJsxText(node) {
-                return node && node.kind === 244 /* JsxText */;
-            }
             function shouldRescanSlashToken(container) {
                 return container.kind === 10 /* RegularExpressionLiteral */;
             }
@@ -49376,9 +49326,7 @@ var ts;
                             ? 3 /* RescanTemplateToken */
                             : shouldRescanJsxIdentifier(n)
                                 ? 4 /* RescanJsxIdentifier */
-                                : shouldRescanJsxText(n)
-                                    ? 5 /* RescanJsxText */
-                                    : 0 /* Scan */;
+                                : 0 /* Scan */;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     // readTokenInfo was called before with the same expected scan action.
                     // No need to re-scan text, return existing 'lastTokenInfo'
@@ -49413,10 +49361,6 @@ var ts;
                     currentToken = scanner.scanJsxIdentifier();
                     lastScanAction = 4 /* RescanJsxIdentifier */;
                 }
-                else if (expectedScanAction === 5 /* RescanJsxText */) {
-                    currentToken = scanner.reScanJsxToken();
-                    lastScanAction = 5 /* RescanJsxText */;
-                }
                 else {
                     lastScanAction = 0 /* Scan */;
                 }
@@ -52089,20 +52033,19 @@ var ts;
         "version"
     ];
     var jsDocCompletionEntries;
-    function createNode(kind, pos, end, parent) {
-        var node = kind >= 139 /* FirstNode */ ? new NodeObject(kind, pos, end) :
-            kind === 69 /* Identifier */ ? new IdentifierObject(kind, pos, end) :
-                new TokenObject(kind, pos, end);
+    function createNode(kind, pos, end, flags, parent) {
+        var node = new NodeObject(kind, pos, end);
+        node.flags = flags;
         node.parent = parent;
         return node;
     }
     var NodeObject = (function () {
         function NodeObject(kind, pos, end) {
+            this.kind = kind;
             this.pos = pos;
             this.end = end;
             this.flags = 0 /* None */;
             this.parent = undefined;
-            this.kind = kind;
         }
         NodeObject.prototype.getSourceFile = function () {
             return ts.getSourceFileOfNode(this);
@@ -52137,14 +52080,14 @@ var ts;
                 var token = useJSDocScanner ? scanner.scanJSDocToken() : scanner.scan();
                 var textPos = scanner.getTextPos();
                 if (textPos <= end) {
-                    nodes.push(createNode(token, pos, textPos, this));
+                    nodes.push(createNode(token, pos, textPos, 0, this));
                 }
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(282 /* SyntaxList */, nodes.pos, nodes.end, this);
+            var list = createNode(282 /* SyntaxList */, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
             for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
@@ -52230,74 +52173,6 @@ var ts;
         };
         return NodeObject;
     }());
-    var TokenOrIdentifierObject = (function () {
-        function TokenOrIdentifierObject(pos, end) {
-            // Set properties in same order as NodeObject
-            this.pos = pos;
-            this.end = end;
-            this.flags = 0 /* None */;
-            this.parent = undefined;
-        }
-        TokenOrIdentifierObject.prototype.getSourceFile = function () {
-            return ts.getSourceFileOfNode(this);
-        };
-        TokenOrIdentifierObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
-            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
-        };
-        TokenOrIdentifierObject.prototype.getFullStart = function () {
-            return this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getEnd = function () {
-            return this.end;
-        };
-        TokenOrIdentifierObject.prototype.getWidth = function (sourceFile) {
-            return this.getEnd() - this.getStart(sourceFile);
-        };
-        TokenOrIdentifierObject.prototype.getFullWidth = function () {
-            return this.end - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
-            return this.getStart(sourceFile) - this.pos;
-        };
-        TokenOrIdentifierObject.prototype.getFullText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
-        };
-        TokenOrIdentifierObject.prototype.getText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.getStart(), this.getEnd());
-        };
-        TokenOrIdentifierObject.prototype.getChildCount = function (sourceFile) {
-            return 0;
-        };
-        TokenOrIdentifierObject.prototype.getChildAt = function (index, sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getChildren = function (sourceFile) {
-            return emptyArray;
-        };
-        TokenOrIdentifierObject.prototype.getFirstToken = function (sourceFile) {
-            return undefined;
-        };
-        TokenOrIdentifierObject.prototype.getLastToken = function (sourceFile) {
-            return undefined;
-        };
-        return TokenOrIdentifierObject;
-    }());
-    var TokenObject = (function (_super) {
-        __extends(TokenObject, _super);
-        function TokenObject(kind, pos, end) {
-            _super.call(this, pos, end);
-            this.kind = kind;
-        }
-        return TokenObject;
-    }(TokenOrIdentifierObject));
-    var IdentifierObject = (function (_super) {
-        __extends(IdentifierObject, _super);
-        function IdentifierObject(kind, pos, end) {
-            _super.call(this, pos, end);
-        }
-        return IdentifierObject;
-    }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 69 /* Identifier */;
     var SymbolObject = (function () {
         function SymbolObject(flags, name) {
             this.flags = flags;
@@ -59062,8 +58937,6 @@ var ts;
     function initializeServices() {
         ts.objectAllocator = {
             getNodeConstructor: function () { return NodeObject; },
-            getTokenConstructor: function () { return TokenObject; },
-            getIdentifierConstructor: function () { return IdentifierObject; },
             getSourceFileConstructor: function () { return SourceFileObject; },
             getSymbolConstructor: function () { return SymbolObject; },
             getTypeConstructor: function () { return TypeObject; },
@@ -59689,7 +59562,7 @@ var ts;
 //
 /// <reference path='services.ts' />
 /* @internal */
-var debugObjectHost = new Function("return this")();
+var debugObjectHost = this;
 // We need to use 'null' to interface with the managed side.
 /* tslint:disable:no-null-keyword */
 /* tslint:disable:no-in-operator */
@@ -59828,7 +59701,7 @@ var ts;
             return this.shimHost.getCurrentDirectory();
         };
         LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
+            return this.shimHost.getDirectories(path);
         };
         LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
             return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
diff --git a/package.json b/package.json
index eb34b6bffbb..1f943f89788 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
         "through2": "latest",
         "travis-fold": "latest",
         "ts-node": "latest",
+        "tsd": "latest",
         "tslint": "next",
         "typescript": "next"
     },
diff --git a/scripts/browserify-optional.js b/scripts/browserify-optional.js
new file mode 100644
index 00000000000..43997c7803c
--- /dev/null
+++ b/scripts/browserify-optional.js
@@ -0,0 +1,24 @@
+// simple script to optionally elide source-map-support (or other optional modules) when running browserify.
+
+var stream = require("stream"),
+    Transform = stream.Transform,
+    resolve = require("browser-resolve");
+
+var requirePattern = /require\s*\(\s*['"](source-map-support)['"]\s*\)/;
+module.exports = function (file) {
+    return new Transform({
+        transform: function (data, encoding, cb) {
+            var text = encoding === "buffer" ? data.toString("utf8") : data;
+            this.push(new Buffer(text.replace(requirePattern, function (originalText, moduleName) {
+                try {
+                    resolve.sync(moduleName, { filename: file });
+                    return originalText;
+                }
+                catch (e) {
+                    return "(function () { throw new Error(\"module '" + moduleName + "' not found.\"); })()";
+                }
+            }), "utf8"));
+            cb();
+        }
+    });
+};
\ No newline at end of file
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index d8017d601ad..50c3adf1310 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -27,7 +27,7 @@ namespace ts {
             return ModuleInstanceState.ConstEnumOnly;
         }
         // 3. non-exported import declarations
-        else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && !(node.flags & NodeFlags.Export)) {
+        else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && !(hasModifier(node, ModifierFlags.Export))) {
             return ModuleInstanceState.NonInstantiated;
         }
         // 4. other uninstantiated module declarations.
@@ -131,6 +131,10 @@ namespace ts {
         const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
         const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 
+        // state used to aggregate transform flags during bind.
+        let subtreeTransformFlags: TransformFlags = TransformFlags.None;
+        let skipTransformFlagAggregation: boolean;
+
         function bindSourceFile(f: SourceFile, opts: CompilerOptions) {
             file = f;
             options = opts;
@@ -138,6 +142,7 @@ namespace ts {
             inStrictMode = !!file.externalModuleIndicator;
             classifiableNames = createMap<string>();
             symbolCount = 0;
+            skipTransformFlagAggregation = isDeclarationFile(file);
 
             Symbol = objectAllocator.getSymbolConstructor();
 
@@ -164,6 +169,7 @@ namespace ts {
             activeLabels = undefined;
             hasExplicitReturn = false;
             emitFlags = NodeFlags.None;
+            subtreeTransformFlags = TransformFlags.None;
         }
 
         return bindSourceFile;
@@ -253,7 +259,7 @@ namespace ts {
 
                 case SyntaxKind.FunctionDeclaration:
                 case SyntaxKind.ClassDeclaration:
-                    return node.flags & NodeFlags.Default ? "default" : undefined;
+                    return hasModifier(node, ModifierFlags.Default) ? "default" : undefined;
                 case SyntaxKind.JSDocFunctionType:
                     return isJSDocConstructSignature(node) ? "__new" : "__call";
                 case SyntaxKind.Parameter:
@@ -293,7 +299,7 @@ namespace ts {
         function declareSymbol(symbolTable: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol {
             Debug.assert(!hasDynamicName(node));
 
-            const isDefaultExport = node.flags & NodeFlags.Default;
+            const isDefaultExport = hasModifier(node, ModifierFlags.Default);
 
             // The exported symbol for an export default function/class node is always named "default"
             const name = isDefaultExport && parent ? "default" : getDeclarationName(node);
@@ -350,7 +356,7 @@ namespace ts {
                             : Diagnostics.Duplicate_identifier_0;
 
                         forEach(symbol.declarations, declaration => {
-                            if (declaration.flags & NodeFlags.Default) {
+                            if (hasModifier(declaration, ModifierFlags.Default)) {
                                 message = Diagnostics.A_module_cannot_have_multiple_default_exports;
                             }
                         });
@@ -372,7 +378,7 @@ namespace ts {
         }
 
         function declareModuleMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags): Symbol {
-            const hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;
+            const hasExportModifier = getCombinedModifierFlags(node) & ModifierFlags.Export;
             if (symbolFlags & SymbolFlags.Alias) {
                 if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
@@ -513,6 +519,23 @@ namespace ts {
         }
 
         function bindChildren(node: Node): void {
+            if (skipTransformFlagAggregation) {
+                bindChildrenWorker(node);
+            }
+            else if (node.transformFlags & TransformFlags.HasComputedFlags) {
+                skipTransformFlagAggregation = true;
+                bindChildrenWorker(node);
+                skipTransformFlagAggregation = false;
+            }
+            else {
+                const savedSubtreeTransformFlags = subtreeTransformFlags;
+                subtreeTransformFlags = 0;
+                bindChildrenWorker(node);
+                subtreeTransformFlags = savedSubtreeTransformFlags | computeTransformFlagsForNode(node, subtreeTransformFlags);
+            }
+        }
+
+        function bindChildrenWorker(node: Node): void {
             // Binding of JsDocComment should be done before the current block scope container changes.
             // because the scope of JsDocComment should not be affected by whether the current node is a
             // container or not.
@@ -1308,7 +1331,7 @@ namespace ts {
         }
 
         function declareClassMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) {
-            return node.flags & NodeFlags.Static
+            return hasModifier(node, ModifierFlags.Static)
                 ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
                 : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
@@ -1345,7 +1368,7 @@ namespace ts {
         function bindModuleDeclaration(node: ModuleDeclaration) {
             setExportContextFlag(node);
             if (isAmbientModule(node)) {
-                if (node.flags & NodeFlags.Export) {
+                if (hasModifier(node, ModifierFlags.Export)) {
                     errorOnFirstToken(node, Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
                 }
                 if (isExternalModuleAugmentation(node)) {
@@ -1612,7 +1635,7 @@ namespace ts {
             }
         }
 
-        function checkStrictModeNumericLiteral(node: LiteralExpression) {
+        function checkStrictModeNumericLiteral(node: NumericLiteral) {
             if (inStrictMode && node.isOctalLiteral) {
                 file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
             }
@@ -1687,6 +1710,9 @@ namespace ts {
                 }
                 parent = saveParent;
             }
+            else if (!skipTransformFlagAggregation && (node.transformFlags & TransformFlags.HasComputedFlags) === 0) {
+                subtreeTransformFlags |= computeTransformFlagsForNode(node, 0);
+            }
             inStrictMode = saveInStrictMode;
         }
 
@@ -1757,7 +1783,7 @@ namespace ts {
                 case SyntaxKind.DeleteExpression:
                     return checkStrictModeDeleteExpression(<DeleteExpression>node);
                 case SyntaxKind.NumericLiteral:
-                    return checkStrictModeNumericLiteral(<LiteralExpression>node);
+                    return checkStrictModeNumericLiteral(<NumericLiteral>node);
                 case SyntaxKind.PostfixUnaryExpression:
                     return checkStrictModePostfixUnaryExpression(<PostfixUnaryExpression>node);
                 case SyntaxKind.PrefixUnaryExpression:
@@ -1789,7 +1815,7 @@ namespace ts {
                     return bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes);
 
                 case SyntaxKind.JsxSpreadAttribute:
-                    emitFlags |= NodeFlags.HasJsxSpreadAttribute;
+                    emitFlags |= NodeFlags.HasJsxSpreadAttributes;
                     return;
 
                 case SyntaxKind.CallSignature:
@@ -2204,7 +2230,7 @@ namespace ts {
             if (currentFlow === unreachableFlow) {
                 const reportError =
                     // report error on all statements except empty ones
-                    (isStatement(node) && node.kind !== SyntaxKind.EmptyStatement) ||
+                    (isStatementButNotDeclaration(node) && node.kind !== SyntaxKind.EmptyStatement) ||
                     // report error on class declarations
                     node.kind === SyntaxKind.ClassDeclaration ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
@@ -2241,4 +2267,763 @@ namespace ts {
             return true;
         }
     }
+
+    /**
+     * Computes the transform flags for a node, given the transform flags of its subtree
+     *
+     * @param node The node to analyze
+     * @param subtreeFlags Transform flags computed for this node's subtree
+     */
+    export function computeTransformFlagsForNode(node: Node, subtreeFlags: TransformFlags): TransformFlags {
+        const kind = node.kind;
+        switch (kind) {
+            case SyntaxKind.CallExpression:
+                return computeCallExpression(<CallExpression>node, subtreeFlags);
+
+            case SyntaxKind.ModuleDeclaration:
+                return computeModuleDeclaration(<ModuleDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.ParenthesizedExpression:
+                return computeParenthesizedExpression(<ParenthesizedExpression>node, subtreeFlags);
+
+            case SyntaxKind.BinaryExpression:
+                return computeBinaryExpression(<BinaryExpression>node, subtreeFlags);
+
+            case SyntaxKind.ExpressionStatement:
+                return computeExpressionStatement(<ExpressionStatement>node, subtreeFlags);
+
+            case SyntaxKind.Parameter:
+                return computeParameter(<ParameterDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.ArrowFunction:
+                return computeArrowFunction(<ArrowFunction>node, subtreeFlags);
+
+            case SyntaxKind.FunctionExpression:
+                return computeFunctionExpression(<FunctionExpression>node, subtreeFlags);
+
+            case SyntaxKind.FunctionDeclaration:
+                return computeFunctionDeclaration(<FunctionDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.VariableDeclaration:
+                return computeVariableDeclaration(<VariableDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.VariableDeclarationList:
+                return computeVariableDeclarationList(<VariableDeclarationList>node, subtreeFlags);
+
+            case SyntaxKind.VariableStatement:
+                return computeVariableStatement(<VariableStatement>node, subtreeFlags);
+
+            case SyntaxKind.LabeledStatement:
+                return computeLabeledStatement(<LabeledStatement>node, subtreeFlags);
+
+            case SyntaxKind.ClassDeclaration:
+                return computeClassDeclaration(<ClassDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.ClassExpression:
+                return computeClassExpression(<ClassExpression>node, subtreeFlags);
+
+            case SyntaxKind.HeritageClause:
+                return computeHeritageClause(<HeritageClause>node, subtreeFlags);
+
+            case SyntaxKind.ExpressionWithTypeArguments:
+                return computeExpressionWithTypeArguments(<ExpressionWithTypeArguments>node, subtreeFlags);
+
+            case SyntaxKind.Constructor:
+                return computeConstructor(<ConstructorDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.PropertyDeclaration:
+                return computePropertyDeclaration(<PropertyDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.MethodDeclaration:
+                return computeMethod(<MethodDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+                return computeAccessor(<AccessorDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.ImportEqualsDeclaration:
+                return computeImportEquals(<ImportEqualsDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.PropertyAccessExpression:
+                return computePropertyAccess(<PropertyAccessExpression>node, subtreeFlags);
+
+            default:
+                return computeOther(node, kind, subtreeFlags);
+        }
+    }
+
+    function computeCallExpression(node: CallExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const expression = node.expression;
+        const expressionKind = expression.kind;
+
+        if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression
+            || isSuperOrSuperProperty(expression, expressionKind)) {
+            // If the this node contains a SpreadElementExpression, or is a super call, then it is an ES6
+            // node.
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ArrayLiteralOrCallOrNewExcludes;
+    }
+
+    function isSuperOrSuperProperty(node: Node, kind: SyntaxKind) {
+        switch (kind) {
+            case SyntaxKind.SuperKeyword:
+                return true;
+
+            case SyntaxKind.PropertyAccessExpression:
+            case SyntaxKind.ElementAccessExpression:
+                const expression = (<PropertyAccessExpression | ElementAccessExpression>node).expression;
+                const expressionKind = expression.kind;
+                return expressionKind === SyntaxKind.SuperKeyword;
+        }
+
+        return false;
+    }
+
+    function computeBinaryExpression(node: BinaryExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const operatorTokenKind = node.operatorToken.kind;
+        const leftKind = node.left.kind;
+
+        if (operatorTokenKind === SyntaxKind.EqualsToken
+            && (leftKind === SyntaxKind.ObjectLiteralExpression
+                || leftKind === SyntaxKind.ArrayLiteralExpression)) {
+            // Destructuring assignments are ES6 syntax.
+            transformFlags |= TransformFlags.AssertES6 | TransformFlags.DestructuringAssignment;
+        }
+        else if (operatorTokenKind === SyntaxKind.AsteriskAsteriskToken
+            || operatorTokenKind === SyntaxKind.AsteriskAsteriskEqualsToken) {
+            // Exponentiation is ES7 syntax.
+            transformFlags |= TransformFlags.AssertES7;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeParameter(node: ParameterDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const modifierFlags = getModifierFlags(node);
+        const name = node.name;
+        const initializer = node.initializer;
+        const dotDotDotToken = node.dotDotDotToken;
+
+        // If the parameter has a question token, then it is TypeScript syntax.
+        if (node.questionToken) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If the parameter's name is 'this', then it is TypeScript syntax.
+        if (subtreeFlags & TransformFlags.ContainsDecorators
+            || (name && isIdentifier(name) && name.originalKeywordKind === SyntaxKind.ThisKeyword)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If a parameter has an accessibility modifier, then it is TypeScript syntax.
+        if (modifierFlags & ModifierFlags.ParameterPropertyModifier) {
+            transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.ContainsParameterPropertyAssignments;
+        }
+
+        // If a parameter has an initializer, a binding pattern or a dotDotDot token, then
+        // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel.
+        if (subtreeFlags & TransformFlags.ContainsBindingPattern || initializer || dotDotDotToken) {
+            transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsDefaultValueAssignments;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ParameterExcludes;
+    }
+
+    function computeParenthesizedExpression(node: ParenthesizedExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const expression = node.expression;
+        const expressionKind = expression.kind;
+        const expressionTransformFlags = expression.transformFlags;
+
+        // If the node is synthesized, it means the emitter put the parentheses there,
+        // not the user. If we didn't want them, the emitter would not have put them
+        // there.
+        if (expressionKind === SyntaxKind.AsExpression
+            || expressionKind === SyntaxKind.TypeAssertionExpression) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If the expression of a ParenthesizedExpression is a destructuring assignment,
+        // then the ParenthesizedExpression is a destructuring assignment.
+        if (expressionTransformFlags & TransformFlags.DestructuringAssignment) {
+            transformFlags |= TransformFlags.DestructuringAssignment;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeClassDeclaration(node: ClassDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags: TransformFlags;
+        const modifierFlags = getModifierFlags(node);
+
+        if (modifierFlags & ModifierFlags.Ambient) {
+            // An ambient declaration is TypeScript syntax.
+            transformFlags = TransformFlags.AssertTypeScript;
+        }
+        else {
+            // A ClassDeclaration is ES6 syntax.
+            transformFlags = subtreeFlags | TransformFlags.AssertES6;
+
+            // A class with a parameter property assignment, property initializer, or decorator is
+            // TypeScript syntax.
+            // An exported declaration may be TypeScript syntax.
+            if ((subtreeFlags & TransformFlags.TypeScriptClassSyntaxMask)
+                || (modifierFlags & ModifierFlags.Export)) {
+                transformFlags |= TransformFlags.AssertTypeScript;
+            }
+
+            if (subtreeFlags & TransformFlags.ContainsLexicalThisInComputedPropertyName) {
+                // A computed property name containing `this` might need to be rewritten,
+                // so propagate the ContainsLexicalThis flag upward.
+                transformFlags |= TransformFlags.ContainsLexicalThis;
+            }
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ClassExcludes;
+    }
+
+    function computeClassExpression(node: ClassExpression, subtreeFlags: TransformFlags) {
+        // A ClassExpression is ES6 syntax.
+        let transformFlags = subtreeFlags | TransformFlags.AssertES6;
+
+        // A class with a parameter property assignment, property initializer, or decorator is
+        // TypeScript syntax.
+        if (subtreeFlags & TransformFlags.TypeScriptClassSyntaxMask) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        if (subtreeFlags & TransformFlags.ContainsLexicalThisInComputedPropertyName) {
+            // A computed property name containing `this` might need to be rewritten,
+            // so propagate the ContainsLexicalThis flag upward.
+            transformFlags |= TransformFlags.ContainsLexicalThis;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ClassExcludes;
+    }
+
+    function computeHeritageClause(node: HeritageClause, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+
+        switch (node.token) {
+            case SyntaxKind.ExtendsKeyword:
+                // An `extends` HeritageClause is ES6 syntax.
+                transformFlags |= TransformFlags.AssertES6;
+                break;
+
+            case SyntaxKind.ImplementsKeyword:
+                // An `implements` HeritageClause is TypeScript syntax.
+                transformFlags |= TransformFlags.AssertTypeScript;
+                break;
+
+            default:
+                Debug.fail("Unexpected token for heritage clause");
+                break;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeExpressionWithTypeArguments(node: ExpressionWithTypeArguments, subtreeFlags: TransformFlags) {
+        // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the
+        // extends clause of a class.
+        let transformFlags = subtreeFlags | TransformFlags.AssertES6;
+
+        // If an ExpressionWithTypeArguments contains type arguments, then it
+        // is TypeScript syntax.
+        if (node.typeArguments) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeConstructor(node: ConstructorDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const body = node.body;
+
+        if (body === undefined) {
+            // An overload constructor is TypeScript syntax.
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ConstructorExcludes;
+    }
+
+    function computeMethod(node: MethodDeclaration, subtreeFlags: TransformFlags) {
+        // A MethodDeclaration is ES6 syntax.
+        let transformFlags = subtreeFlags | TransformFlags.AssertES6;
+        const modifierFlags = getModifierFlags(node);
+        const body = node.body;
+        const typeParameters = node.typeParameters;
+        const asteriskToken = node.asteriskToken;
+
+        // A MethodDeclaration is TypeScript syntax if it is either async, abstract, overloaded,
+        // generic, or has a decorator.
+        if (!body
+            || typeParameters
+            || (modifierFlags & (ModifierFlags.Async | ModifierFlags.Abstract))
+            || (subtreeFlags & TransformFlags.ContainsDecorators)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // Currently, we only support generators that were originally async function bodies.
+        if (asteriskToken && node.emitFlags & NodeEmitFlags.AsyncFunctionBody) {
+            transformFlags |= TransformFlags.AssertGenerator;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.MethodOrAccessorExcludes;
+    }
+
+    function computeAccessor(node: AccessorDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const modifierFlags = getModifierFlags(node);
+        const body = node.body;
+
+        // A MethodDeclaration is TypeScript syntax if it is either async, abstract, overloaded,
+        // generic, or has a decorator.
+        if (!body
+            || (modifierFlags & (ModifierFlags.Async | ModifierFlags.Abstract))
+            || (subtreeFlags & TransformFlags.ContainsDecorators)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.MethodOrAccessorExcludes;
+    }
+
+    function computePropertyDeclaration(node: PropertyDeclaration, subtreeFlags: TransformFlags) {
+        // A PropertyDeclaration is TypeScript syntax.
+        let transformFlags = subtreeFlags | TransformFlags.AssertTypeScript;
+
+        // If the PropertyDeclaration has an initializer, we need to inform its ancestor
+        // so that it handle the transformation.
+        if (node.initializer) {
+            transformFlags |= TransformFlags.ContainsPropertyInitializer;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeFunctionDeclaration(node: FunctionDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags: TransformFlags;
+        const modifierFlags = getModifierFlags(node);
+        const body = node.body;
+        const asteriskToken = node.asteriskToken;
+
+        if (!body || (modifierFlags & ModifierFlags.Ambient)) {
+            // An ambient declaration is TypeScript syntax.
+            // A FunctionDeclaration without a body is an overload and is TypeScript syntax.
+            transformFlags = TransformFlags.AssertTypeScript;
+        }
+        else {
+            transformFlags = subtreeFlags | TransformFlags.ContainsHoistedDeclarationOrCompletion;
+
+            // If a FunctionDeclaration is exported, then it is either ES6 or TypeScript syntax.
+            if (modifierFlags & ModifierFlags.Export) {
+                transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.AssertES6;
+            }
+
+            // If a FunctionDeclaration is async, then it is TypeScript syntax.
+            if (modifierFlags & ModifierFlags.Async) {
+                transformFlags |= TransformFlags.AssertTypeScript;
+            }
+
+            // If a FunctionDeclaration's subtree has marked the container as needing to capture the
+            // lexical this, or the function contains parameters with initializers, then this node is
+            // ES6 syntax.
+            if (subtreeFlags & TransformFlags.ES6FunctionSyntaxMask) {
+                transformFlags |= TransformFlags.AssertES6;
+            }
+
+            // If a FunctionDeclaration is generator function and is the body of a
+            // transformed async function, then this node can be transformed to a
+            // down-level generator.
+            // Currently we do not support transforming any other generator fucntions
+            // down level.
+            if (asteriskToken && node.emitFlags & NodeEmitFlags.AsyncFunctionBody) {
+                transformFlags |= TransformFlags.AssertGenerator;
+            }
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.FunctionExcludes;
+    }
+
+    function computeFunctionExpression(node: FunctionExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const modifierFlags = getModifierFlags(node);
+        const asteriskToken = node.asteriskToken;
+
+        // An async function expression is TypeScript syntax.
+        if (modifierFlags & ModifierFlags.Async) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If a FunctionExpression's subtree has marked the container as needing to capture the
+        // lexical this, or the function contains parameters with initializers, then this node is
+        // ES6 syntax.
+        if (subtreeFlags & TransformFlags.ES6FunctionSyntaxMask) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        // If a FunctionExpression is generator function and is the body of a
+        // transformed async function, then this node can be transformed to a
+        // down-level generator.
+        // Currently we do not support transforming any other generator fucntions
+        // down level.
+        if (asteriskToken && node.emitFlags & NodeEmitFlags.AsyncFunctionBody) {
+            transformFlags |= TransformFlags.AssertGenerator;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.FunctionExcludes;
+    }
+
+    function computeArrowFunction(node: ArrowFunction, subtreeFlags: TransformFlags) {
+        // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction.
+        let transformFlags = subtreeFlags | TransformFlags.AssertES6;
+        const modifierFlags = getModifierFlags(node);
+
+        // An async arrow function is TypeScript syntax.
+        if (modifierFlags & ModifierFlags.Async) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
+        if (subtreeFlags & TransformFlags.ContainsLexicalThis) {
+            transformFlags |= TransformFlags.ContainsCapturedLexicalThis;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ArrowFunctionExcludes;
+    }
+
+    function computePropertyAccess(node: PropertyAccessExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const expression = node.expression;
+        const expressionKind = expression.kind;
+
+        // If a PropertyAccessExpression starts with a super keyword, then it is
+        // ES6 syntax, and requires a lexical `this` binding.
+        if (expressionKind === SyntaxKind.SuperKeyword) {
+            transformFlags |= TransformFlags.ContainsLexicalThis;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeVariableDeclaration(node: VariableDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+        const nameKind = node.name.kind;
+
+        // A VariableDeclaration with a binding pattern is ES6 syntax.
+        if (nameKind === SyntaxKind.ObjectBindingPattern || nameKind === SyntaxKind.ArrayBindingPattern) {
+            transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsBindingPattern;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeVariableStatement(node: VariableStatement, subtreeFlags: TransformFlags) {
+        let transformFlags: TransformFlags;
+        const modifierFlags = getModifierFlags(node);
+        const declarationListTransformFlags = node.declarationList.transformFlags;
+
+        // An ambient declaration is TypeScript syntax.
+        if (modifierFlags & ModifierFlags.Ambient) {
+            transformFlags = TransformFlags.AssertTypeScript;
+        }
+        else {
+            transformFlags = subtreeFlags;
+
+            // If a VariableStatement is exported, then it is either ES6 or TypeScript syntax.
+            if (modifierFlags & ModifierFlags.Export) {
+                transformFlags |= TransformFlags.AssertES6 | TransformFlags.AssertTypeScript;
+            }
+
+            if (declarationListTransformFlags & TransformFlags.ContainsBindingPattern) {
+                transformFlags |= TransformFlags.AssertES6;
+            }
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeLabeledStatement(node: LabeledStatement, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+
+        // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
+        if (subtreeFlags & TransformFlags.ContainsBlockScopedBinding
+            && isIterationStatement(node, /*lookInLabeledStatements*/ true)) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeImportEquals(node: ImportEqualsDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+
+        // An ImportEqualsDeclaration with a namespace reference is TypeScript.
+        if (!isExternalModuleImportEqualsDeclaration(node)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeExpressionStatement(node: ExpressionStatement, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags;
+
+        // If the expression of an expression statement is a destructuring assignment,
+        // then we treat the statement as ES6 so that we can indicate that we do not
+        // need to hold on to the right-hand side.
+        if (node.expression.transformFlags & TransformFlags.DestructuringAssignment) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.NodeExcludes;
+    }
+
+    function computeModuleDeclaration(node: ModuleDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.AssertTypeScript;
+        const modifierFlags = getModifierFlags(node);
+
+        if ((modifierFlags & ModifierFlags.Ambient) === 0) {
+            transformFlags |= subtreeFlags;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.ModuleExcludes;
+    }
+
+    function computeVariableDeclarationList(node: VariableDeclarationList, subtreeFlags: TransformFlags) {
+        let transformFlags = subtreeFlags | TransformFlags.ContainsHoistedDeclarationOrCompletion;
+
+        if (subtreeFlags & TransformFlags.ContainsBindingPattern) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax.
+        if (node.flags & NodeFlags.BlockScoped) {
+            transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsBlockScopedBinding;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~TransformFlags.VariableDeclarationListExcludes;
+    }
+
+    function computeOther(node: Node, kind: SyntaxKind, subtreeFlags: TransformFlags) {
+        // Mark transformations needed for each node
+        let transformFlags = subtreeFlags;
+        let excludeFlags = TransformFlags.NodeExcludes;
+
+        switch (kind) {
+            case SyntaxKind.PublicKeyword:
+            case SyntaxKind.PrivateKeyword:
+            case SyntaxKind.ProtectedKeyword:
+            case SyntaxKind.AbstractKeyword:
+            case SyntaxKind.DeclareKeyword:
+            case SyntaxKind.AsyncKeyword:
+            case SyntaxKind.ConstKeyword:
+            case SyntaxKind.AwaitExpression:
+            case SyntaxKind.EnumDeclaration:
+            case SyntaxKind.EnumMember:
+            case SyntaxKind.TypeAssertionExpression:
+            case SyntaxKind.AsExpression:
+            case SyntaxKind.NonNullExpression:
+            case SyntaxKind.ReadonlyKeyword:
+                // These nodes are TypeScript syntax.
+                transformFlags |= TransformFlags.AssertTypeScript;
+                break;
+
+            case SyntaxKind.JsxElement:
+            case SyntaxKind.JsxSelfClosingElement:
+            case SyntaxKind.JsxOpeningElement:
+            case SyntaxKind.JsxText:
+            case SyntaxKind.JsxClosingElement:
+            case SyntaxKind.JsxAttribute:
+            case SyntaxKind.JsxSpreadAttribute:
+            case SyntaxKind.JsxExpression:
+                // These nodes are Jsx syntax.
+                transformFlags |= TransformFlags.AssertJsx;
+                break;
+
+            case SyntaxKind.ExportKeyword:
+                // This node is both ES6 and TypeScript syntax.
+                transformFlags |= TransformFlags.AssertES6 | TransformFlags.AssertTypeScript;
+                break;
+
+            case SyntaxKind.DefaultKeyword:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
+            case SyntaxKind.TemplateHead:
+            case SyntaxKind.TemplateMiddle:
+            case SyntaxKind.TemplateTail:
+            case SyntaxKind.TemplateExpression:
+            case SyntaxKind.TaggedTemplateExpression:
+            case SyntaxKind.ShorthandPropertyAssignment:
+            case SyntaxKind.ForOfStatement:
+                // These nodes are ES6 syntax.
+                transformFlags |= TransformFlags.AssertES6;
+                break;
+
+            case SyntaxKind.YieldExpression:
+                // This node is ES6 syntax.
+                transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsYield;
+                break;
+
+            case SyntaxKind.AnyKeyword:
+            case SyntaxKind.NumberKeyword:
+            case SyntaxKind.NeverKeyword:
+            case SyntaxKind.StringKeyword:
+            case SyntaxKind.BooleanKeyword:
+            case SyntaxKind.SymbolKeyword:
+            case SyntaxKind.VoidKeyword:
+            case SyntaxKind.TypeParameter:
+            case SyntaxKind.PropertySignature:
+            case SyntaxKind.MethodSignature:
+            case SyntaxKind.CallSignature:
+            case SyntaxKind.ConstructSignature:
+            case SyntaxKind.IndexSignature:
+            case SyntaxKind.TypePredicate:
+            case SyntaxKind.TypeReference:
+            case SyntaxKind.FunctionType:
+            case SyntaxKind.ConstructorType:
+            case SyntaxKind.TypeQuery:
+            case SyntaxKind.TypeLiteral:
+            case SyntaxKind.ArrayType:
+            case SyntaxKind.TupleType:
+            case SyntaxKind.UnionType:
+            case SyntaxKind.IntersectionType:
+            case SyntaxKind.ParenthesizedType:
+            case SyntaxKind.InterfaceDeclaration:
+            case SyntaxKind.TypeAliasDeclaration:
+            case SyntaxKind.ThisType:
+            case SyntaxKind.LiteralType:
+                // Types and signatures are TypeScript syntax, and exclude all other facts.
+                transformFlags = TransformFlags.AssertTypeScript;
+                excludeFlags = TransformFlags.TypeExcludes;
+                break;
+
+            case SyntaxKind.ComputedPropertyName:
+                // Even though computed property names are ES6, we don't treat them as such.
+                // This is so that they can flow through PropertyName transforms unaffected.
+                // Instead, we mark the container as ES6, so that it can properly handle the transform.
+                transformFlags |= TransformFlags.ContainsComputedPropertyName;
+                if (subtreeFlags & TransformFlags.ContainsLexicalThis) {
+                    // A computed method name like `[this.getName()](x: string) { ... }` needs to
+                    // distinguish itself from the normal case of a method body containing `this`:
+                    // `this` inside a method doesn't need to be rewritten (the method provides `this`),
+                    // whereas `this` inside a computed name *might* need to be rewritten if the class/object
+                    // is inside an arrow function:
+                    // `_this = this; () => class K { [_this.getName()]() { ... } }`
+                    // To make this distinction, use ContainsLexicalThisInComputedPropertyName
+                    // instead of ContainsLexicalThis for computed property names
+                    transformFlags |= TransformFlags.ContainsLexicalThisInComputedPropertyName;
+                }
+                break;
+
+            case SyntaxKind.SpreadElementExpression:
+                // This node is ES6 syntax, but is handled by a containing node.
+                transformFlags |= TransformFlags.ContainsSpreadElementExpression;
+                break;
+
+            case SyntaxKind.SuperKeyword:
+                // This node is ES6 syntax.
+                transformFlags |= TransformFlags.AssertES6;
+                break;
+
+            case SyntaxKind.ThisKeyword:
+                // Mark this node and its ancestors as containing a lexical `this` keyword.
+                transformFlags |= TransformFlags.ContainsLexicalThis;
+                break;
+
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ArrayBindingPattern:
+                // These nodes are ES6 syntax.
+                transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsBindingPattern;
+                break;
+
+            case SyntaxKind.Decorator:
+                // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
+                transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.ContainsDecorators;
+                break;
+
+            case SyntaxKind.ObjectLiteralExpression:
+                excludeFlags = TransformFlags.ObjectLiteralExcludes;
+                if (subtreeFlags & TransformFlags.ContainsComputedPropertyName) {
+                    // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
+                    // is an ES6 node.
+                    transformFlags |= TransformFlags.AssertES6;
+                }
+
+                if (subtreeFlags & TransformFlags.ContainsLexicalThisInComputedPropertyName) {
+                    // A computed property name containing `this` might need to be rewritten,
+                    // so propagate the ContainsLexicalThis flag upward.
+                    transformFlags |= TransformFlags.ContainsLexicalThis;
+                }
+
+                break;
+
+            case SyntaxKind.ArrayLiteralExpression:
+            case SyntaxKind.NewExpression:
+                excludeFlags = TransformFlags.ArrayLiteralOrCallOrNewExcludes;
+                if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression) {
+                    // If the this node contains a SpreadElementExpression, then it is an ES6
+                    // node.
+                    transformFlags |= TransformFlags.AssertES6;
+                }
+
+                break;
+
+            case SyntaxKind.DoStatement:
+            case SyntaxKind.WhileStatement:
+            case SyntaxKind.ForStatement:
+            case SyntaxKind.ForInStatement:
+                // A loop containing a block scoped binding *may* need to be transformed from ES6.
+                if (subtreeFlags & TransformFlags.ContainsBlockScopedBinding) {
+                    transformFlags |= TransformFlags.AssertES6;
+                }
+
+                break;
+
+            case SyntaxKind.SourceFile:
+                if (subtreeFlags & TransformFlags.ContainsCapturedLexicalThis) {
+                    transformFlags |= TransformFlags.AssertES6;
+                }
+
+                break;
+
+            case SyntaxKind.ReturnStatement:
+            case SyntaxKind.ContinueStatement:
+            case SyntaxKind.BreakStatement:
+                transformFlags |= TransformFlags.ContainsHoistedDeclarationOrCompletion;
+                break;
+        }
+
+        node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
+        return transformFlags & ~excludeFlags;
+    }
 }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 863c9e7c37a..da0b09cc781 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2,6 +2,8 @@
 
 /* @internal */
 namespace ts {
+    const ambientModuleSymbolRegex = /^".+"$/;
+
     let nextSymbolId = 1;
     let nextNodeId = 1;
     let nextMergeId = 1;
@@ -100,6 +102,7 @@ namespace ts {
             getAliasedSymbol: resolveAlias,
             getEmitResolver,
             getExportsOfModule: getExportsOfModuleAsArray,
+            getAmbientModules,
 
             getJsxElementAttributesType,
             getJsxIntrinsicTagNames,
@@ -143,6 +146,7 @@ namespace ts {
 
         const anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         const unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+        const resolvingSignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
 
         const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
 
@@ -157,6 +161,7 @@ namespace ts {
         let getGlobalESSymbolConstructorSymbol: () => Symbol;
 
         let getGlobalPromiseConstructorSymbol: () => Symbol;
+        let tryGetGlobalPromiseConstructorSymbol: () => Symbol;
 
         let globalObjectType: ObjectType;
         let globalFunctionType: ObjectType;
@@ -636,7 +641,7 @@ namespace ts {
 
                     const initializerOfNonStaticProperty = current.parent &&
                         current.parent.kind === SyntaxKind.PropertyDeclaration &&
-                        (current.parent.flags & NodeFlags.Static) === 0 &&
+                        (getModifierFlags(current.parent) & ModifierFlags.Static) === 0 &&
                         (<PropertyDeclaration>current.parent).initializer === current;
 
                     if (initializerOfNonStaticProperty) {
@@ -756,7 +761,7 @@ namespace ts {
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (isClassLike(location.parent) && !(location.flags & NodeFlags.Static)) {
+                        if (isClassLike(location.parent) && !(getModifierFlags(location) & ModifierFlags.Static)) {
                             const ctor = findConstructorDeclaration(<ClassLikeDeclaration>location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & SymbolFlags.Value)) {
@@ -770,7 +775,7 @@ namespace ts {
                     case SyntaxKind.ClassExpression:
                     case SyntaxKind.InterfaceDeclaration:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & SymbolFlags.Type)) {
-                            if (lastLocation && lastLocation.flags & NodeFlags.Static) {
+                            if (lastLocation && getModifierFlags(lastLocation) & ModifierFlags.Static) {
                                 // TypeScript 1.0 spec (April 2014): 3.4.1
                                 // The scope of a type parameter extends over the entire declaration with which the type
                                 // parameter list is associated, with the exception of static member declarations in classes.
@@ -941,7 +946,7 @@ namespace ts {
 
                     // No static member is present.
                     // Check if we're in an instance method and look for a relevant instance member.
-                    if (location === container && !(location.flags & NodeFlags.Static)) {
+                    if (location === container && !(getModifierFlags(location) & ModifierFlags.Static)) {
                         const instanceType = (<InterfaceType>getDeclaredTypeOfSymbol(classSymbol)).thisType;
                         if (getPropertyOfType(instanceType, name)) {
                             error(errorLocation, Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
@@ -1271,7 +1276,7 @@ namespace ts {
         }
 
         // Resolves a qualified name and any involved aliases
-        function resolveEntityName(name: EntityNameOrEntityNameExpression, meaning: SymbolFlags, ignoreErrors?: boolean, dontResolveAlias?: boolean): Symbol | undefined {
+        function resolveEntityName(name: EntityNameOrEntityNameExpression, meaning: SymbolFlags, ignoreErrors?: boolean, dontResolveAlias?: boolean, location?: Node): Symbol | undefined {
             if (nodeIsMissing(name)) {
                 return undefined;
             }
@@ -1280,7 +1285,7 @@ namespace ts {
             if (name.kind === SyntaxKind.Identifier) {
                 const message = meaning === SymbolFlags.Namespace ? Diagnostics.Cannot_find_namespace_0 : Diagnostics.Cannot_find_name_0;
 
-                symbol = resolveName(name, (<Identifier>name).text, meaning, ignoreErrors ? undefined : message, <Identifier>name);
+                symbol = resolveName(location || name, (<Identifier>name).text, meaning, ignoreErrors ? undefined : message, <Identifier>name);
                 if (!symbol) {
                     return undefined;
                 }
@@ -1289,7 +1294,7 @@ namespace ts {
                 const left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessEntityNameExpression>name).expression;
                 const right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;
 
-                const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors);
+                const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || nodeIsMissing(right)) {
                     return undefined;
                 }
@@ -1322,10 +1327,13 @@ namespace ts {
             }
 
             const moduleReferenceLiteral = <LiteralExpression>moduleReferenceExpression;
+            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral);
+        }
 
+        function resolveExternalModule(location: Node, moduleReference: string, moduleNotFoundError: DiagnosticMessage, errorNode: Node): Symbol {
             // Module names are escaped in our symbol table.  However, string literal values aren't.
             // Escape the name in the "require(...)" clause to ensure we find the right symbol.
-            const moduleName = escapeIdentifier(moduleReferenceLiteral.text);
+            const moduleName = escapeIdentifier(moduleReference);
 
             if (moduleName === undefined) {
                 return;
@@ -1340,7 +1348,7 @@ namespace ts {
                 }
             }
 
-            const resolvedModule = getResolvedModule(getSourceFileOfNode(location), moduleReferenceLiteral.text);
+            const resolvedModule = getResolvedModule(getSourceFileOfNode(location), moduleReference);
             const sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
@@ -1349,7 +1357,7 @@ namespace ts {
                 }
                 if (moduleNotFoundError) {
                     // report errors only if it was requested
-                    error(moduleReferenceLiteral, Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
+                    error(errorNode, Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
                 }
                 return undefined;
             }
@@ -1366,10 +1374,10 @@ namespace ts {
                 const tsExtension = tryExtractTypeScriptExtension(moduleName);
                 if (tsExtension) {
                     const diag = Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
-                    error(moduleReferenceLiteral, diag, tsExtension, removeExtension(moduleName, tsExtension));
+                    error(errorNode, diag, tsExtension, removeExtension(moduleName, tsExtension));
                 }
                 else {
-                    error(moduleReferenceLiteral, moduleNotFoundError, moduleName);
+                    error(errorNode, moduleNotFoundError, moduleName);
                 }
             }
             return undefined;
@@ -1825,7 +1833,7 @@ namespace ts {
 
                     const anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & NodeFlags.Export) && // import clause without export
+                        !(getModifierFlags(anyImportSyntax) & ModifierFlags.Export) && // import clause without export
                         isDeclarationVisible(<Declaration>anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -1952,11 +1960,11 @@ namespace ts {
             return result || types;
         }
 
-        function visibilityToString(flags: NodeFlags) {
-            if (flags === NodeFlags.Private) {
+        function visibilityToString(flags: ModifierFlags) {
+            if (flags === ModifierFlags.Private) {
                 return "private";
             }
-            if (flags === NodeFlags.Protected) {
+            if (flags === ModifierFlags.Protected) {
                 return "protected";
             }
             return "public";
@@ -2301,7 +2309,7 @@ namespace ts {
 
                     function shouldWriteTypeOfFunctionSymbol() {
                         const isStaticMethodSymbol = !!(symbol.flags & SymbolFlags.Method &&  // typeof static method
-                            forEach(symbol.declarations, declaration => declaration.flags & NodeFlags.Static));
+                            forEach(symbol.declarations, declaration => getModifierFlags(declaration) & ModifierFlags.Static));
                         const isNonLocalFunctionSymbol = !!(symbol.flags & SymbolFlags.Function) &&
                             (symbol.parent || // is exported function symbol
                                 forEach(symbol.declarations, declaration =>
@@ -2668,7 +2676,7 @@ namespace ts {
                         }
                         const parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
-                        if (!(getCombinedNodeFlags(node) & NodeFlags.Export) &&
+                        if (!(getCombinedModifierFlags(node) & ModifierFlags.Export) &&
                             !(node.kind !== SyntaxKind.ImportEqualsDeclaration && parent.kind !== SyntaxKind.SourceFile && isInAmbientContext(parent))) {
                             return isGlobalSourceFile(parent);
                         }
@@ -2681,7 +2689,7 @@ namespace ts {
                     case SyntaxKind.SetAccessor:
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
-                        if (node.flags & (NodeFlags.Private | NodeFlags.Protected)) {
+                        if (getModifierFlags(node) & (ModifierFlags.Private | ModifierFlags.Protected)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
@@ -3533,7 +3541,7 @@ namespace ts {
         function getInstantiatedConstructorsForTypeArguments(type: ObjectType, typeArgumentNodes: TypeNode[]): Signature[] {
             let signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                const typeArguments = map(typeArgumentNodes, getTypeFromTypeNode);
+                const typeArguments = map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
                 signatures = map(signatures, sig => getSignatureInstantiation(sig, typeArguments));
             }
             return signatures;
@@ -4096,7 +4104,7 @@ namespace ts {
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false)];
             }
             const baseTypeNode = getBaseTypeNodeOfClass(classType);
-            const typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNode);
+            const typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
             const typeArgCount = typeArguments ? typeArguments.length : 0;
             const result: Signature[] = [];
             for (const baseSig of baseSignatures) {
@@ -4387,7 +4395,7 @@ namespace ts {
                 const type = getApparentType(current);
                 if (type !== unknownType) {
                     const prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (NodeFlags.Private | NodeFlags.Protected))) {
+                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected))) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -4893,7 +4901,7 @@ namespace ts {
             const declaration = getIndexDeclarationOfSymbol(symbol, kind);
             if (declaration) {
                 return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType,
-                    (declaration.flags & NodeFlags.Readonly) !== 0, declaration);
+                    (getModifierFlags(declaration) & ModifierFlags.Readonly) !== 0, declaration);
             }
             return undefined;
         }
@@ -5012,7 +5020,7 @@ namespace ts {
                 // In a type reference, the outer type parameters of the referenced class or interface are automatically
                 // supplied as type arguments and the type reference only specifies arguments for the local type parameters
                 // of the class or interface.
-                return createTypeReference(<GenericType>type, concatenate(type.outerTypeParameters, map(node.typeArguments, getTypeFromTypeNode)));
+                return createTypeReference(<GenericType>type, concatenate(type.outerTypeParameters, map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
             }
             if (node.typeArguments) {
                 error(node, Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -5033,7 +5041,7 @@ namespace ts {
                     error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                const typeArguments = map(node.typeArguments, getTypeFromTypeNode);
+                const typeArguments = map(node.typeArguments, getTypeFromTypeNodeNoAlias);
                 const id = getTypeListId(typeArguments);
                 return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
             }
@@ -5288,7 +5296,7 @@ namespace ts {
         function getTypeFromTupleTypeNode(node: TupleTypeNode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNode));
+                links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNodeNoAlias));
             }
             return links.resolvedType;
         }
@@ -5378,7 +5386,7 @@ namespace ts {
             while (i > 0) {
                 i--;
                 if (isSubtypeOfAny(types[i], types)) {
-                    types.splice(i, 1);
+                    orderedRemoveItemAt(types, i);
                 }
             }
         }
@@ -5436,7 +5444,7 @@ namespace ts {
         function getTypeFromUnionTypeNode(node: UnionTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNode), /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNodeNoAlias), /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
             return links.resolvedType;
         }
@@ -5493,7 +5501,7 @@ namespace ts {
         function getTypeFromIntersectionTypeNode(node: IntersectionTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(map(node.types, getTypeFromTypeNode), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
             }
             return links.resolvedType;
         }
@@ -5541,7 +5549,7 @@ namespace ts {
         function getTypeFromJSDocTupleType(node: JSDocTupleType): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const types = map(node.types, getTypeFromTypeNode);
+                const types = map(node.types, getTypeFromTypeNodeNoAlias);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -5551,8 +5559,8 @@ namespace ts {
             const container = getThisContainer(node, /*includeArrowFunctions*/ false);
             const parent = container && container.parent;
             if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) {
-                if (!(container.flags & NodeFlags.Static) &&
-                    (container.kind !== SyntaxKind.Constructor || isNodeDescendentOf(node, (<ConstructorDeclaration>container).body))) {
+                if (!(getModifierFlags(container) & ModifierFlags.Static) &&
+                    (container.kind !== SyntaxKind.Constructor || isNodeDescendantOf(node, (<ConstructorDeclaration>container).body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -5568,6 +5576,10 @@ namespace ts {
             return links.resolvedType;
         }
 
+        function getTypeFromTypeNodeNoAlias(type: TypeNode) {
+            return getTypeFromTypeNode(type, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined);
+        }
+
         function getTypeFromTypeNode(node: TypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             switch (node.kind) {
                 case SyntaxKind.AnyKeyword:
@@ -6714,24 +6726,24 @@ namespace ts {
                             }
                         }
                         else if (!(targetProp.flags & SymbolFlags.Prototype)) {
-                            const sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
-                            const targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & NodeFlags.Private || targetPropFlags & NodeFlags.Private) {
+                            const sourcePropFlags = getDeclarationModifierFlagsFromSymbol(sourceProp);
+                            const targetPropFlags = getDeclarationModifierFlagsFromSymbol(targetProp);
+                            if (sourcePropFlags & ModifierFlags.Private || targetPropFlags & ModifierFlags.Private) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & NodeFlags.Private && targetPropFlags & NodeFlags.Private) {
+                                        if (sourcePropFlags & ModifierFlags.Private && targetPropFlags & ModifierFlags.Private) {
                                             reportError(Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
                                             reportError(Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp),
-                                                typeToString(sourcePropFlags & NodeFlags.Private ? source : target),
-                                                typeToString(sourcePropFlags & NodeFlags.Private ? target : source));
+                                                typeToString(sourcePropFlags & ModifierFlags.Private ? source : target),
+                                                typeToString(sourcePropFlags & ModifierFlags.Private ? target : source));
                                         }
                                     }
                                     return Ternary.False;
                                 }
                             }
-                            else if (targetPropFlags & NodeFlags.Protected) {
+                            else if (targetPropFlags & ModifierFlags.Protected) {
                                 const sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
                                 const sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
                                 const targetClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
@@ -6743,7 +6755,7 @@ namespace ts {
                                     return Ternary.False;
                                 }
                             }
-                            else if (sourcePropFlags & NodeFlags.Protected) {
+                            else if (sourcePropFlags & ModifierFlags.Protected) {
                                 if (reportErrors) {
                                     reportError(Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2,
                                         symbolToString(targetProp), typeToString(source), typeToString(target));
@@ -6953,21 +6965,21 @@ namespace ts {
                     return true;
                 }
 
-                const sourceAccessibility = sourceSignature.declaration.flags & (NodeFlags.Private | NodeFlags.Protected);
-                const targetAccessibility = targetSignature.declaration.flags & (NodeFlags.Private | NodeFlags.Protected);
+                const sourceAccessibility = getModifierFlags(sourceSignature.declaration) & ModifierFlags.NonPublicAccessibilityModifier;
+                const targetAccessibility = getModifierFlags(targetSignature.declaration) & ModifierFlags.NonPublicAccessibilityModifier;
 
                 // A public, protected and private signature is assignable to a private signature.
-                if (targetAccessibility === NodeFlags.Private) {
+                if (targetAccessibility === ModifierFlags.Private) {
                     return true;
                 }
 
                 // A public and protected signature is assignable to a protected signature.
-                if (targetAccessibility === NodeFlags.Protected && sourceAccessibility !== NodeFlags.Private) {
+                if (targetAccessibility === ModifierFlags.Protected && sourceAccessibility !== ModifierFlags.Private) {
                     return true;
                 }
 
                 // Only a public signature is assignable to public signature.
-                if (targetAccessibility !== NodeFlags.Protected && !sourceAccessibility) {
+                if (targetAccessibility !== ModifierFlags.Protected && !sourceAccessibility) {
                     return true;
                 }
 
@@ -6985,7 +6997,7 @@ namespace ts {
                 const symbol = type.symbol;
                 if (symbol && symbol.flags & SymbolFlags.Class) {
                     const declaration = getClassLikeDeclarationOfSymbol(symbol);
-                    if (declaration && declaration.flags & NodeFlags.Abstract) {
+                    if (declaration && getModifierFlags(declaration) & ModifierFlags.Abstract) {
                         return true;
                     }
                 }
@@ -7025,8 +7037,8 @@ namespace ts {
             if (sourceProp === targetProp) {
                 return Ternary.True;
             }
-            const sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (NodeFlags.Private | NodeFlags.Protected);
-            const targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (NodeFlags.Private | NodeFlags.Protected);
+            const sourcePropAccessibility = getDeclarationModifierFlagsFromSymbol(sourceProp) & ModifierFlags.NonPublicAccessibilityModifier;
+            const targetPropAccessibility = getDeclarationModifierFlagsFromSymbol(targetProp) & ModifierFlags.NonPublicAccessibilityModifier;
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return Ternary.False;
             }
@@ -8758,7 +8770,7 @@ namespace ts {
             // The location isn't a reference to the given symbol, meaning we're being asked
             // a hypothetical question of what type the symbol would have if there was a reference
             // to it at the given location. Since we have no control flow information for the
-            // hypotherical reference (control flow information is created and attached by the
+            // hypothetical reference (control flow information is created and attached by the
             // binder), we simply return the declared type of the symbol.
             return getTypeOfSymbol(symbol);
         }
@@ -8832,10 +8844,13 @@ namespace ts {
             // can explicitly bound arguments objects
             if (symbol === argumentsSymbol) {
                 const container = getContainingFunction(node);
-                if (container.kind === SyntaxKind.ArrowFunction) {
-                    if (languageVersion < ScriptTarget.ES6) {
+                if (languageVersion < ScriptTarget.ES6) {
+                    if (container.kind === SyntaxKind.ArrowFunction) {
                         error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
+                    else if (hasModifier(container, ModifierFlags.Async)) {
+                        error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
+                    }
                 }
 
                 if (node.flags & NodeFlags.AwaitContext) {
@@ -8849,22 +8864,41 @@ namespace ts {
 
             const localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
 
-            // Due to the emit for class decorators, any reference to the class from inside of the class body
-            // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
-            // behavior of class names in ES6.
-            if (languageVersion === ScriptTarget.ES6
-                && localOrExportSymbol.flags & SymbolFlags.Class
-                && localOrExportSymbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration
-                && nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
-                let container = getContainingClass(node);
-                while (container !== undefined) {
-                    if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
-                        getNodeLinks(container).flags |= NodeCheckFlags.ClassWithBodyScopedClassBinding;
-                        getNodeLinks(node).flags |= NodeCheckFlags.BodyScopedClassBinding;
-                        break;
-                    }
+            if (localOrExportSymbol.flags & SymbolFlags.Class) {
+                const declaration = localOrExportSymbol.valueDeclaration;
+                // Due to the emit for class decorators, any reference to the class from inside of the class body
+                // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                // behavior of class names in ES6.
+                if (languageVersion === ScriptTarget.ES6
+                    && declaration.kind === SyntaxKind.ClassDeclaration
+                    && nodeIsDecorated(declaration)) {
+                    let container = getContainingClass(node);
+                    while (container !== undefined) {
+                        if (container === declaration && container.name !== node) {
+                            getNodeLinks(declaration).flags |= NodeCheckFlags.ClassWithConstructorReference;
+                            getNodeLinks(node).flags |= NodeCheckFlags.ConstructorReferenceInClass;
+                            break;
+                        }
 
-                    container = getContainingClass(container);
+                        container = getContainingClass(container);
+                    }
+                }
+                else if (declaration.kind === SyntaxKind.ClassExpression) {
+                    // When we emit a class expression with static members that contain a reference
+                    // to the constructor in the initializer, we will need to substitute that
+                    // binding with an alias as the class name is not in scope.
+                    let container = getThisContainer(node, /*includeArrowFunctions*/ false);
+                    while (container !== undefined) {
+                        if (container.parent === declaration) {
+                            if (container.kind === SyntaxKind.PropertyDeclaration && hasModifier(container, ModifierFlags.Static)) {
+                                getNodeLinks(declaration).flags |= NodeCheckFlags.ClassWithConstructorReference;
+                                getNodeLinks(node).flags |= NodeCheckFlags.ConstructorReferenceInClass;
+                            }
+                            break;
+                        }
+
+                        container = getThisContainer(container, /*includeArrowFunctions*/ false);
+                    }
                 }
             }
 
@@ -9109,7 +9143,7 @@ namespace ts {
                     break;
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
-                    if (container.flags & NodeFlags.Static) {
+                    if (getModifierFlags(container) & ModifierFlags.Static) {
                         error(node, Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
@@ -9147,9 +9181,10 @@ namespace ts {
                     return thisType;
                 }
             }
+
             if (isClassLike(container.parent)) {
                 const symbol = getSymbolOfNode(container.parent);
-                const type = container.flags & NodeFlags.Static ? getTypeOfSymbol(symbol) : (<InterfaceType>getDeclaredTypeOfSymbol(symbol)).thisType;
+                const type = hasModifier(container, ModifierFlags.Static) ? getTypeOfSymbol(symbol) : (<InterfaceType>getDeclaredTypeOfSymbol(symbol)).thisType;
                 return getFlowTypeOfReference(node, type, /*assumeInitialized*/ true, /*flowContainer*/ undefined);
             }
 
@@ -9228,7 +9263,7 @@ namespace ts {
                 return unknownType;
             }
 
-            if ((container.flags & NodeFlags.Static) || isCallExpression) {
+            if ((getModifierFlags(container) & ModifierFlags.Static) || isCallExpression) {
                 nodeCheckFlag = NodeCheckFlags.SuperStatic;
             }
             else {
@@ -9293,8 +9328,8 @@ namespace ts {
             // This helper creates an object with a "value" property that wraps the `super` property or indexed access for both get and set.
             // This is required for destructuring assignments, as a call expression cannot be used as the target of a destructuring assignment
             // while a property access can.
-            if (container.kind === SyntaxKind.MethodDeclaration && container.flags & NodeFlags.Async) {
-                if (isSuperPropertyOrElementAccess(node.parent) && isAssignmentTarget(node.parent)) {
+            if (container.kind === SyntaxKind.MethodDeclaration && getModifierFlags(container) & ModifierFlags.Async) {
+                if (isSuperProperty(node.parent) && isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuperBinding;
                 }
                 else {
@@ -9359,7 +9394,7 @@ namespace ts {
 
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
                     if (isClassLike(container.parent) || container.parent.kind === SyntaxKind.ObjectLiteralExpression) {
-                        if (container.flags & NodeFlags.Static) {
+                        if (getModifierFlags(container) & ModifierFlags.Static) {
                             return container.kind === SyntaxKind.MethodDeclaration ||
                                 container.kind === SyntaxKind.MethodSignature ||
                                 container.kind === SyntaxKind.GetAccessor ||
@@ -10644,8 +10679,12 @@ namespace ts {
             return s.valueDeclaration ? s.valueDeclaration.kind : SyntaxKind.PropertyDeclaration;
         }
 
-        function getDeclarationFlagsFromSymbol(s: Symbol): NodeFlags {
-            return s.valueDeclaration ? getCombinedNodeFlags(s.valueDeclaration) : s.flags & SymbolFlags.Prototype ? NodeFlags.Public | NodeFlags.Static : 0;
+        function getDeclarationModifierFlagsFromSymbol(s: Symbol): ModifierFlags {
+            return s.valueDeclaration ? getCombinedModifierFlags(s.valueDeclaration) : s.flags & SymbolFlags.Prototype ? ModifierFlags.Public | ModifierFlags.Static : 0;
+        }
+
+        function getDeclarationNodeFlagsFromSymbol(s: Symbol): NodeFlags {
+            return s.valueDeclaration ? getCombinedNodeFlags(s.valueDeclaration) : 0;
         }
 
         /**
@@ -10657,7 +10696,7 @@ namespace ts {
          * @param prop The symbol for the right hand side of the property access.
          */
         function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
-            const flags = getDeclarationFlagsFromSymbol(prop);
+            const flags = getDeclarationModifierFlagsFromSymbol(prop);
             const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
             const errorNode = node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.VariableDeclaration ?
                 (<PropertyAccessExpression | VariableDeclaration>node).name :
@@ -10678,7 +10717,7 @@ namespace ts {
                     return false;
                 }
 
-                if (flags & NodeFlags.Abstract) {
+                if (flags & ModifierFlags.Abstract) {
                     // A method cannot be accessed in a super property access if the method is abstract.
                     // This error could mask a private property access error. But, a member
                     // cannot simultaneously be private and abstract, so this will trigger an
@@ -10690,14 +10729,14 @@ namespace ts {
             }
 
             // Public properties are otherwise accessible.
-            if (!(flags & (NodeFlags.Private | NodeFlags.Protected))) {
+            if (!(flags & ModifierFlags.NonPublicAccessibilityModifier)) {
                 return true;
             }
 
             // Property is known to be private or protected at this point
 
             // Private property is accessible if the property is within the declaring class
-            if (flags & NodeFlags.Private) {
+            if (flags & ModifierFlags.Private) {
                 const declaringClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
                 if (!isNodeWithinClass(node, declaringClassDeclaration)) {
                     error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
@@ -10725,7 +10764,7 @@ namespace ts {
                 return false;
             }
             // No further restrictions for static properties
-            if (flags & NodeFlags.Static) {
+            if (flags & ModifierFlags.Static) {
                 return true;
             }
             // An instance property must be accessed through an instance of the enclosing class
@@ -10786,7 +10825,7 @@ namespace ts {
 
             if (noUnusedIdentifiers &&
                 (prop.flags & SymbolFlags.ClassMember) &&
-                prop.valueDeclaration && (prop.valueDeclaration.flags & NodeFlags.Private)) {
+                prop.valueDeclaration && (getModifierFlags(prop.valueDeclaration) & ModifierFlags.Private)) {
                 if (prop.flags & SymbolFlags.Instantiated) {
                     getSymbolLinks(prop).target.isReferenced = true;
 
@@ -11820,7 +11859,7 @@ namespace ts {
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     const typeArguments = (<CallExpression>node).typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments, map(typeArguments, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments, map(typeArguments, getTypeFromTypeNodeNoAlias), /*reportErrors*/ true, headMessage);
                 }
                 else {
                     Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -11851,7 +11890,7 @@ namespace ts {
                 for (let candidate of candidates) {
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, map(typeArguments, getTypeFromTypeNode));
+                            candidate = getSignatureInstantiation(candidate, map(typeArguments, getTypeFromTypeNodeNoAlias));
                         }
                         return candidate;
                     }
@@ -11887,7 +11926,7 @@ namespace ts {
                         if (candidate.typeParameters) {
                             let typeArgumentTypes: Type[];
                             if (typeArguments) {
-                                typeArgumentTypes = map(typeArguments, getTypeFromTypeNode);
+                                typeArgumentTypes = map(typeArguments, getTypeFromTypeNodeNoAlias);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, /*reportErrors*/ false);
                             }
                             else {
@@ -12043,7 +12082,7 @@ namespace ts {
             // In the case of a merged class-module or class-interface declaration,
             // only the class declaration node will have the Abstract flag set.
             const valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
-            if (valueDecl && valueDecl.flags & NodeFlags.Abstract) {
+            if (valueDecl && getModifierFlags(valueDecl) & ModifierFlags.Abstract) {
                 error(node, Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, declarationNameToString(valueDecl.name));
                 return resolveErrorCall(node);
             }
@@ -12096,10 +12135,10 @@ namespace ts {
             }
 
             const declaration = signature.declaration;
-            const flags = declaration.flags;
+            const modifiers = getModifierFlags(declaration);
 
             // Public constructor is accessible.
-            if (!(flags & (NodeFlags.Private | NodeFlags.Protected))) {
+            if (!(modifiers & ModifierFlags.NonPublicAccessibilityModifier)) {
                 return true;
             }
 
@@ -12114,16 +12153,16 @@ namespace ts {
                     const baseTypes = getBaseTypes(<InterfaceType>containingType);
                     if (baseTypes.length) {
                         const baseType = baseTypes[0];
-                        if (flags & NodeFlags.Protected &&
+                        if (modifiers & ModifierFlags.Protected &&
                             baseType.symbol === declaration.parent.symbol) {
                             return true;
                         }
                     }
                 }
-                if (flags & NodeFlags.Private) {
+                if (modifiers & ModifierFlags.Private) {
                     error(node, Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
                 }
-                if (flags & NodeFlags.Protected) {
+                if (modifiers & ModifierFlags.Protected) {
                     error(node, Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
                 }
                 return false;
@@ -12229,10 +12268,10 @@ namespace ts {
             // or that a different candidatesOutArray was passed in. Therefore, we need to redo the work
             // to correctly fill the candidatesOutArray.
             const cached = links.resolvedSignature;
-            if (cached && cached !== anySignature && !candidatesOutArray) {
+            if (cached && cached !== resolvingSignature && !candidatesOutArray) {
                 return cached;
             }
-            links.resolvedSignature = anySignature;
+            links.resolvedSignature = resolvingSignature;
             const result = resolveSignature(node, candidatesOutArray);
             // If signature resolution originated in control flow type analysis (for example to compute the
             // assigned type in a flow assignment) we don't cache the result as it may be based on temporary
@@ -12244,7 +12283,7 @@ namespace ts {
         function getResolvedOrAnySignature(node: CallLikeExpression) {
             // If we're already in the process of resolving the given signature, don't resolve again as
             // that could cause infinite recursion. Instead, return anySignature.
-            return getNodeLinks(node).resolvedSignature === anySignature ? anySignature : getResolvedSignature(node);
+            return getNodeLinks(node).resolvedSignature === resolvingSignature ? resolvingSignature : getResolvedSignature(node);
         }
 
         function getInferredClassType(symbol: Symbol) {
@@ -12792,8 +12831,8 @@ namespace ts {
             // Enum members
             // Unions and intersections of the above (unions and intersections eagerly set isReadonly on creation)
             return symbol.isReadonly ||
-                symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0 ||
-                symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 ||
+                symbol.flags & SymbolFlags.Property && (getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly) !== 0 ||
+                symbol.flags & SymbolFlags.Variable && (getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 ||
                 symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor) ||
                 (symbol.flags & SymbolFlags.EnumMember) !== 0;
         }
@@ -13498,7 +13537,7 @@ namespace ts {
 
         function checkLiteralExpression(node: Expression): Type {
             if (node.kind === SyntaxKind.NumericLiteral) {
-                checkGrammarNumericLiteral(<LiteralExpression>node);
+                checkGrammarNumericLiteral(<NumericLiteral>node);
             }
             switch (node.kind) {
                 case SyntaxKind.StringLiteral:
@@ -13729,7 +13768,7 @@ namespace ts {
 
             checkVariableLikeDeclaration(node);
             let func = getContainingFunction(node);
-            if (node.flags & NodeFlags.ParameterPropertyModifier) {
+            if (getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier) {
                 func = getContainingFunction(node);
                 if (!(func.kind === SyntaxKind.Constructor && nodeIsPresent(func.body))) {
                     error(node, Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
@@ -14069,7 +14108,7 @@ namespace ts {
 
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (node.flags & NodeFlags.Abstract && node.body) {
+            if (getModifierFlags(node) & ModifierFlags.Abstract && node.body) {
                 error(node, Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, declarationNameToString(node.name));
             }
         }
@@ -14128,7 +14167,7 @@ namespace ts {
 
             function isInstancePropertyWithInitializer(n: Node): boolean {
                 return n.kind === SyntaxKind.PropertyDeclaration &&
-                    !(n.flags & NodeFlags.Static) &&
+                    !(getModifierFlags(n) & ModifierFlags.Static) &&
                     !!(<PropertyDeclaration>n).initializer;
             }
 
@@ -14151,7 +14190,7 @@ namespace ts {
                     //   or the containing class declares instance member variables with initializers.
                     const superCallShouldBeFirst =
                         forEach((<ClassDeclaration>node.parent).members, isInstancePropertyWithInitializer) ||
-                        forEach(node.parameters, p => p.flags & NodeFlags.ParameterPropertyModifier);
+                        forEach(node.parameters, p => getModifierFlags(p) & ModifierFlags.ParameterPropertyModifier);
 
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
@@ -14205,10 +14244,10 @@ namespace ts {
                     const otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
                     const otherAccessor = <AccessorDeclaration>getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & NodeFlags.AccessibilityModifier) !== (otherAccessor.flags & NodeFlags.AccessibilityModifier))) {
+                        if ((getModifierFlags(node) & ModifierFlags.AccessibilityModifier) !== (getModifierFlags(otherAccessor) & ModifierFlags.AccessibilityModifier)) {
                             error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
-                        if (((node.flags & NodeFlags.Abstract) !== (otherAccessor.flags & NodeFlags.Abstract))) {
+                        if (hasModifier(node, ModifierFlags.Abstract) !== hasModifier(otherAccessor, ModifierFlags.Abstract)) {
                             error(node.name, Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
                         }
 
@@ -14257,7 +14296,7 @@ namespace ts {
                 const constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = map(typeArgumentNodes, getTypeFromTypeNode);
+                        typeArguments = map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     const typeArgument = typeArguments[i];
@@ -14323,11 +14362,11 @@ namespace ts {
         }
 
         function isPrivateWithinAmbient(node: Node): boolean {
-            return (node.flags & NodeFlags.Private) && isInAmbientContext(node);
+            return (getModifierFlags(node) & ModifierFlags.Private) && isInAmbientContext(node);
         }
 
-        function getEffectiveDeclarationFlags(n: Node, flagsToCheck: NodeFlags): NodeFlags {
-            let flags = getCombinedNodeFlags(n);
+        function getEffectiveDeclarationFlags(n: Node, flagsToCheck: ModifierFlags): ModifierFlags {
+            let flags = getCombinedModifierFlags(n);
 
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
@@ -14335,11 +14374,11 @@ namespace ts {
                 n.parent.kind !== SyntaxKind.ClassDeclaration &&
                 n.parent.kind !== SyntaxKind.ClassExpression &&
                 isInAmbientContext(n)) {
-                if (!(flags & NodeFlags.Ambient)) {
+                if (!(flags & ModifierFlags.Ambient)) {
                     // It is nested in an ambient context, which means it is automatically exported
-                    flags |= NodeFlags.Export;
+                    flags |= ModifierFlags.Export;
                 }
-                flags |= NodeFlags.Ambient;
+                flags |= ModifierFlags.Ambient;
             }
 
             return flags & flagsToCheck;
@@ -14360,7 +14399,7 @@ namespace ts {
                 return implementationSharesContainerWithFirstOverload ? implementation : overloads[0];
             }
 
-            function checkFlagAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionLikeDeclaration, flagsToCheck: NodeFlags, someOverloadFlags: NodeFlags, allOverloadFlags: NodeFlags): void {
+            function checkFlagAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionLikeDeclaration, flagsToCheck: ModifierFlags, someOverloadFlags: ModifierFlags, allOverloadFlags: ModifierFlags): void {
                 // Error if some overloads have a flag that is not shared by all overloads. To find the
                 // deviations, we XOR someOverloadFlags with allOverloadFlags
                 const someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
@@ -14369,16 +14408,16 @@ namespace ts {
 
                     forEach(overloads, o => {
                         const deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & NodeFlags.Export) {
+                        if (deviation & ModifierFlags.Export) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
                         }
-                        else if (deviation & NodeFlags.Ambient) {
+                        else if (deviation & ModifierFlags.Ambient) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (NodeFlags.Private | NodeFlags.Protected)) {
+                        else if (deviation & (ModifierFlags.Private | ModifierFlags.Protected)) {
                             error(o.name || o, Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
-                        else if (deviation & NodeFlags.Abstract) {
+                        else if (deviation & ModifierFlags.Abstract) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
                         }
                     });
@@ -14397,8 +14436,8 @@ namespace ts {
                 }
             }
 
-            const flagsToCheck: NodeFlags = NodeFlags.Export | NodeFlags.Ambient | NodeFlags.Private | NodeFlags.Protected | NodeFlags.Abstract;
-            let someNodeFlags: NodeFlags = 0;
+            const flagsToCheck: ModifierFlags = ModifierFlags.Export | ModifierFlags.Ambient | ModifierFlags.Private | ModifierFlags.Protected | ModifierFlags.Abstract;
+            let someNodeFlags: ModifierFlags = ModifierFlags.None;
             let allNodeFlags = flagsToCheck;
             let someHaveQuestionToken = false;
             let allHaveQuestionToken = true;
@@ -14433,13 +14472,13 @@ namespace ts {
                         if (node.name && (<FunctionLikeDeclaration>subsequentNode).name && (<Identifier>node.name).text === (<Identifier>(<FunctionLikeDeclaration>subsequentNode).name).text) {
                             const reportError =
                                 (node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) &&
-                                (node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static);
+                                (getModifierFlags(node) & ModifierFlags.Static) !== (getModifierFlags(subsequentNode) & ModifierFlags.Static);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
                             // 2. something with the same name was defined before the set of overloads that prevents them from merging
                             // here we'll report error only for the first case since for second we should already report error in binder
                             if (reportError) {
-                                const diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static;
+                                const diagnostic = getModifierFlags(node) & ModifierFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static;
                                 error(errorNode, diagnostic);
                             }
                             return;
@@ -14457,7 +14496,7 @@ namespace ts {
                 else {
                     // Report different errors regarding non-consecutive blocks of declarations depending on whether
                     // the node in question is abstract.
-                    if (node.flags & NodeFlags.Abstract) {
+                    if (getModifierFlags(node) & ModifierFlags.Abstract) {
                         error(errorNode, Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
                     }
                     else {
@@ -14533,7 +14572,7 @@ namespace ts {
 
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & NodeFlags.Abstract) && !lastSeenNonAmbientDeclaration.questionToken) {
+                !(getModifierFlags(lastSeenNonAmbientDeclaration) & ModifierFlags.Abstract) && !lastSeenNonAmbientDeclaration.questionToken) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
 
@@ -14583,10 +14622,10 @@ namespace ts {
             let defaultExportedDeclarationSpaces = SymbolFlags.None;
             for (const d of symbol.declarations) {
                 const declarationSpaces = getDeclarationSpaces(d);
-                const effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, NodeFlags.Export | NodeFlags.Default);
+                const effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, ModifierFlags.Export | ModifierFlags.Default);
 
-                if (effectiveDeclarationFlags & NodeFlags.Export) {
-                    if (effectiveDeclarationFlags & NodeFlags.Default) {
+                if (effectiveDeclarationFlags & ModifierFlags.Export) {
+                    if (effectiveDeclarationFlags & ModifierFlags.Default) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
                     else {
@@ -14823,7 +14862,7 @@ namespace ts {
          * @param returnType The return type of a FunctionLikeDeclaration
          * @param location The node on which to report the error.
          */
-        function checkCorrectPromiseType(returnType: Type, location: Node) {
+        function checkCorrectPromiseType(returnType: Type, location: Node, diagnostic: DiagnosticMessage, typeName?: string) {
             if (returnType === unknownType) {
                 // The return type already had some other error, so we ignore and return
                 // the unknown type.
@@ -14842,7 +14881,7 @@ namespace ts {
 
             // The promise type was not a valid type reference to the global promise type, so we
             // report an error and return the unknown type.
-            error(location, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+            error(location, diagnostic, typeName);
             return unknownType;
         }
 
@@ -14862,7 +14901,7 @@ namespace ts {
         function checkAsyncFunctionReturnType(node: FunctionLikeDeclaration): Type {
             if (languageVersion >= ScriptTarget.ES6) {
                 const returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type);
+                return checkCorrectPromiseType(returnType, node.type, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
             }
 
             const globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
@@ -14908,11 +14947,11 @@ namespace ts {
 
             const promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
             if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
+                // try to fall back to global promise type.
                 const typeName = promiseConstructor
                     ? symbolToString(promiseConstructor)
                     : typeToString(promiseType);
-                error(node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-                return unknownType;
+                return checkCorrectPromiseType(promiseType, node.type, Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
             }
 
             // If the Promise constructor, resolved locally, is an alias symbol we should mark it as referenced.
@@ -14920,7 +14959,7 @@ namespace ts {
 
             // Validate the promise constructor type.
             const promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
+            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
                 return unknownType;
             }
 
@@ -15241,13 +15280,13 @@ namespace ts {
                 if (node.members) {
                     for (const member of node.members) {
                         if (member.kind === SyntaxKind.MethodDeclaration || member.kind === SyntaxKind.PropertyDeclaration) {
-                            if (!member.symbol.isReferenced && member.flags & NodeFlags.Private) {
+                            if (!member.symbol.isReferenced && getModifierFlags(member) & ModifierFlags.Private) {
                                 error(member.name, Diagnostics._0_is_declared_but_never_used, member.symbol.name);
                             }
                         }
                         else if (member.kind === SyntaxKind.Constructor) {
                             for (const parameter of (<ConstructorDeclaration>member).parameters) {
-                                if (!parameter.symbol.isReferenced && parameter.flags & NodeFlags.Private) {
+                                if (!parameter.symbol.isReferenced && getModifierFlags(parameter) & ModifierFlags.Private) {
                                     error(parameter.name, Diagnostics.Property_0_is_declared_but_never_used, parameter.symbol.name);
                                 }
                             }
@@ -15473,7 +15512,7 @@ namespace ts {
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & SymbolFlags.BlockScopedVariable) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & NodeFlags.BlockScoped) {
+                    if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & NodeFlags.BlockScoped) {
                         const varDeclList = getAncestor(localDeclarationSymbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
                         const container =
                             varDeclList.parent.kind === SyntaxKind.VariableStatement && varDeclList.parent.parent
@@ -15551,7 +15590,7 @@ namespace ts {
                                 // computed property names/initializers in instance property declaration of class like entities
                                 // are executed in constructor and thus deferred
                                 if (current.parent.kind === SyntaxKind.PropertyDeclaration &&
-                                    !(current.parent.flags & NodeFlags.Static) &&
+                                    !(hasModifier(current.parent, ModifierFlags.Static)) &&
                                     isClassLike(current.parent.parent)) {
                                     return;
                                 }
@@ -15666,14 +15705,14 @@ namespace ts {
                 return false;
             }
 
-            const interestingFlags = NodeFlags.Private |
-                NodeFlags.Protected |
-                NodeFlags.Async |
-                NodeFlags.Abstract |
-                NodeFlags.Readonly |
-                NodeFlags.Static;
+            const interestingFlags = ModifierFlags.Private |
+                ModifierFlags.Protected |
+                ModifierFlags.Async |
+                ModifierFlags.Abstract |
+                ModifierFlags.Readonly |
+                ModifierFlags.Static;
 
-            return (left.flags & interestingFlags) === (right.flags & interestingFlags);
+            return (getModifierFlags(left) & interestingFlags) === (getModifierFlags(right) & interestingFlags);
         }
 
         function checkVariableDeclaration(node: VariableDeclaration) {
@@ -16329,7 +16368,7 @@ namespace ts {
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
-                        if (!(member.flags & NodeFlags.Static) && hasDynamicName(member)) {
+                        if (!(getModifierFlags(member) & ModifierFlags.Static) && hasDynamicName(member)) {
                             const propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number);
@@ -16459,7 +16498,7 @@ namespace ts {
         }
 
         function checkClassDeclaration(node: ClassDeclaration) {
-            if (!node.name && !(node.flags & NodeFlags.Default)) {
+            if (!node.name && !(getModifierFlags(node) & ModifierFlags.Default)) {
                 grammarErrorOnFirstToken(node, Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
             checkClassLikeDeclaration(node);
@@ -16558,7 +16597,7 @@ namespace ts {
             const signatures = getSignaturesOfType(type, SignatureKind.Construct);
             if (signatures.length) {
                 const declaration = signatures[0].declaration;
-                if (declaration && declaration.flags & NodeFlags.Private) {
+                if (declaration && getModifierFlags(declaration) & ModifierFlags.Private) {
                     const typeClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(type.symbol);
                     if (!isNodeWithinClass(node, typeClassDeclaration)) {
                         error(node, Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, (<Identifier>node.expression).text);
@@ -16603,7 +16642,7 @@ namespace ts {
                 }
 
                 const derived = getTargetSymbol(getPropertyOfObjectType(type, base.name));
-                const baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
+                const baseDeclarationFlags = getDeclarationModifierFlagsFromSymbol(base);
 
                 Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
 
@@ -16619,7 +16658,7 @@ namespace ts {
                         // It is an error to inherit an abstract member without implementing it or being declared abstract.
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
-                        if (baseDeclarationFlags & NodeFlags.Abstract && (!derivedClassDecl || !(derivedClassDecl.flags & NodeFlags.Abstract))) {
+                        if (baseDeclarationFlags & ModifierFlags.Abstract && (!derivedClassDecl || !(getModifierFlags(derivedClassDecl) & ModifierFlags.Abstract))) {
                             if (derivedClassDecl.kind === SyntaxKind.ClassExpression) {
                                 error(derivedClassDecl, Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1,
                                     symbolToString(baseProperty), typeToString(baseType));
@@ -16632,13 +16671,13 @@ namespace ts {
                     }
                     else {
                         // derived overrides base.
-                        const derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & NodeFlags.Private) || (derivedDeclarationFlags & NodeFlags.Private)) {
+                        const derivedDeclarationFlags = getDeclarationModifierFlagsFromSymbol(derived);
+                        if ((baseDeclarationFlags & ModifierFlags.Private) || (derivedDeclarationFlags & ModifierFlags.Private)) {
                             // either base or derived property is private - not override, skip it
                             continue;
                         }
 
-                        if ((baseDeclarationFlags & NodeFlags.Static) !== (derivedDeclarationFlags & NodeFlags.Static)) {
+                        if ((baseDeclarationFlags & ModifierFlags.Static) !== (derivedDeclarationFlags & ModifierFlags.Static)) {
                             // value of 'static' is not the same for properties - not override, skip it
                             continue;
                         }
@@ -16910,7 +16949,7 @@ namespace ts {
                             }
                             return undefined;
                         case SyntaxKind.NumericLiteral:
-                            return +(<LiteralExpression>e).text;
+                            return +(<NumericLiteral>e).text;
                         case SyntaxKind.ParenthesizedExpression:
                             return evalConstant((<ParenthesizedExpression>e).expression);
                         case SyntaxKind.Identifier:
@@ -17311,7 +17350,7 @@ namespace ts {
                 // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && getModifierFlags(node) !== 0) {
                 grammarErrorOnFirstToken(node, Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -17341,7 +17380,7 @@ namespace ts {
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & NodeFlags.Export) {
+                if (getModifierFlags(node) & ModifierFlags.Export) {
                     markExportAsReferenced(node);
                 }
                 if (isInternalModuleImportEqualsDeclaration(node)) {
@@ -17374,7 +17413,7 @@ namespace ts {
                 return;
             }
 
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && getModifierFlags(node) !== 0) {
                 grammarErrorOnFirstToken(node, Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
 
@@ -17433,7 +17472,7 @@ namespace ts {
                 return;
             }
             // Grammar checking
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && getModifierFlags(node) !== 0) {
                 grammarErrorOnFirstToken(node, Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === SyntaxKind.Identifier) {
@@ -17778,7 +17817,7 @@ namespace ts {
 
         function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
             const symbols = createMap<Symbol>();
-            let memberFlags: NodeFlags = 0;
+            let memberFlags: ModifierFlags = ModifierFlags.None;
 
             if (isInsideWithStatementBody(location)) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
@@ -17819,7 +17858,7 @@ namespace ts {
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
                             // Note: that the memberFlags come from previous iteration.
-                            if (!(memberFlags & NodeFlags.Static)) {
+                            if (!(memberFlags & ModifierFlags.Static)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & SymbolFlags.Type);
                             }
                             break;
@@ -17835,7 +17874,7 @@ namespace ts {
                         copySymbol(argumentsSymbol, meaning);
                     }
 
-                    memberFlags = location.flags;
+                    memberFlags = getModifierFlags(location);
                     location = location.parent;
                 }
 
@@ -17997,7 +18036,7 @@ namespace ts {
                 meaning |= SymbolFlags.Alias;
                 return resolveEntityName(<EntityName>entityName, meaning);
             }
-            else if (isExpression(entityName)) {
+            else if (isPartOfExpression(entityName)) {
                 if (nodeIsMissing(entityName)) {
                     // Missing entity name.
                     return undefined;
@@ -18091,7 +18130,7 @@ namespace ts {
                     // fallthrough
 
                 case SyntaxKind.SuperKeyword:
-                    const type = isExpression(node) ? checkExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
+                    const type = isPartOfExpression(node) ? checkExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
                     return type.symbol;
 
                 case SyntaxKind.ThisType:
@@ -18122,7 +18161,7 @@ namespace ts {
                         if (objectType === unknownType) return undefined;
                         const apparentType = getApparentType(objectType);
                         if (apparentType === unknownType) return undefined;
-                        return getPropertyOfType(apparentType, (<LiteralExpression>node).text);
+                        return getPropertyOfType(apparentType, (<NumericLiteral>node).text);
                     }
                     break;
             }
@@ -18152,11 +18191,11 @@ namespace ts {
                 return unknownType;
             }
 
-            if (isTypeNode(node)) {
+            if (isPartOfTypeNode(node)) {
                 return getTypeFromTypeNode(<TypeNode>node);
             }
 
-            if (isExpression(node)) {
+            if (isPartOfExpression(node)) {
                 return getTypeOfExpression(<Expression>node);
             }
 
@@ -18262,7 +18301,7 @@ namespace ts {
           */
         function getParentTypeOfClassElement(node: ClassElement) {
             const classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & NodeFlags.Static
+            return getModifierFlags(node) & ModifierFlags.Static
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -18310,7 +18349,14 @@ namespace ts {
         // Emitter support
 
         function isArgumentsLocalBinding(node: Identifier): boolean {
-            return getReferencedValueSymbol(node) === argumentsSymbol;
+            if (!isGeneratedIdentifier(node)) {
+                node = getParseTreeNode(node, isIdentifier);
+                if (node) {
+                    return getReferencedValueSymbol(node) === argumentsSymbol;
+                }
+            }
+
+            return false;
         }
 
         function moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean {
@@ -18342,43 +18388,64 @@ namespace ts {
             }
         }
 
+        function isNameOfModuleOrEnumDeclaration(node: Identifier) {
+            const parent = node.parent;
+            return isModuleOrEnumDeclaration(parent) && node === parent.name;
+        }
+
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
         // node of the exported entity's container. Otherwise, return undefined.
-        function getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration {
-            let symbol = getReferencedValueSymbol(node);
-            if (symbol) {
-                if (symbol.flags & SymbolFlags.ExportValue) {
-                    // If we reference an exported entity within the same module declaration, then whether
-                    // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
-                    // kinds that we do NOT prefix.
-                    const exportSymbol = getMergedSymbol(symbol.exportSymbol);
-                    if (exportSymbol.flags & SymbolFlags.ExportHasLocal) {
-                        return undefined;
-                    }
-                    symbol = exportSymbol;
-                }
-                const parentSymbol = getParentOfSymbol(symbol);
-                if (parentSymbol) {
-                    if (parentSymbol.flags & SymbolFlags.ValueModule && parentSymbol.valueDeclaration.kind === SyntaxKind.SourceFile) {
-                        // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
-                        if (parentSymbol.valueDeclaration === getSourceFileOfNode(node)) {
-                            return <SourceFile>parentSymbol.valueDeclaration;
+        function getReferencedExportContainer(node: Identifier, prefixLocals?: boolean): SourceFile | ModuleDeclaration | EnumDeclaration {
+            node = getParseTreeNode(node, isIdentifier);
+            if (node) {
+                // When resolving the export container for the name of a module or enum
+                // declaration, we need to start resolution at the declaration's container.
+                // Otherwise, we could incorrectly resolve the export container as the
+                // declaration if it contains an exported member with the same name.
+                let symbol = getReferencedValueSymbol(node, /*startInDeclarationContainer*/ isNameOfModuleOrEnumDeclaration(node));
+                if (symbol) {
+                    if (symbol.flags & SymbolFlags.ExportValue) {
+                        // If we reference an exported entity within the same module declaration, then whether
+                        // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
+                        // kinds that we do NOT prefix.
+                        const exportSymbol = getMergedSymbol(symbol.exportSymbol);
+                        if (!prefixLocals && exportSymbol.flags & SymbolFlags.ExportHasLocal) {
+                            return undefined;
                         }
+                        symbol = exportSymbol;
                     }
-                    for (let n = node.parent; n; n = n.parent) {
-                        if ((n.kind === SyntaxKind.ModuleDeclaration || n.kind === SyntaxKind.EnumDeclaration) && getSymbolOfNode(n) === parentSymbol) {
-                            return <ModuleDeclaration | EnumDeclaration>n;
+                    const parentSymbol = getParentOfSymbol(symbol);
+                    if (parentSymbol) {
+                        if (parentSymbol.flags & SymbolFlags.ValueModule && parentSymbol.valueDeclaration.kind === SyntaxKind.SourceFile) {
+                            // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
+                            if (parentSymbol.valueDeclaration === getSourceFileOfNode(node)) {
+                                return <SourceFile>parentSymbol.valueDeclaration;
+                            }
+                        }
+                        for (let n = node.parent; n; n = n.parent) {
+                            if (isModuleOrEnumDeclaration(n) && getSymbolOfNode(n) === parentSymbol) {
+                                return <ModuleDeclaration | EnumDeclaration>n;
+                            }
                         }
                     }
                 }
             }
+
+            return undefined;
         }
 
         // When resolved as an expression identifier, if the given node references an import, return the declaration of
         // that import. Otherwise, return undefined.
         function getReferencedImportDeclaration(node: Identifier): Declaration {
-            const symbol = getReferencedValueSymbol(node);
-            return symbol && symbol.flags & SymbolFlags.Alias ? getDeclarationOfAliasSymbol(symbol) : undefined;
+            node = getParseTreeNode(node, isIdentifier);
+            if (node) {
+                const symbol = getReferencedValueSymbol(node);
+                if (symbol && symbol.flags & SymbolFlags.Alias) {
+                    return getDeclarationOfAliasSymbol(symbol);
+                }
+            }
+
+            return undefined;
         }
 
         function isSymbolOfDeclarationWithCollidingName(symbol: Symbol): boolean {
@@ -18428,35 +18495,62 @@ namespace ts {
         // a name that either hides an existing name or might hide it when compiled downlevel,
         // return the declaration of that entity. Otherwise, return undefined.
         function getReferencedDeclarationWithCollidingName(node: Identifier): Declaration {
-            const symbol = getReferencedValueSymbol(node);
-            return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined;
+            if (!isGeneratedIdentifier(node)) {
+                node = getParseTreeNode(node, isIdentifier);
+                if (node) {
+                    const symbol = getReferencedValueSymbol(node);
+                    if (symbol && isSymbolOfDeclarationWithCollidingName(symbol)) {
+                        return symbol.valueDeclaration;
+                    }
+                }
+            }
+
+            return undefined;
         }
 
         // Return true if the given node is a declaration of a nested block scoped entity with a name that either hides an
         // existing name or might hide a name when compiled downlevel
         function isDeclarationWithCollidingName(node: Declaration): boolean {
-            return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node));
+            node = getParseTreeNode(node, isDeclaration);
+            if (node) {
+                const symbol = getSymbolOfNode(node);
+                if (symbol) {
+                    return isSymbolOfDeclarationWithCollidingName(symbol);
+                }
+            }
+
+            return false;
         }
 
         function isValueAliasDeclaration(node: Node): boolean {
+            node = getParseTreeNode(node);
+            if (node === undefined) {
+                // A synthesized node comes from an emit transformation and is always a value.
+                return true;
+            }
+
             switch (node.kind) {
                 case SyntaxKind.ImportEqualsDeclaration:
                 case SyntaxKind.ImportClause:
                 case SyntaxKind.NamespaceImport:
                 case SyntaxKind.ImportSpecifier:
                 case SyntaxKind.ExportSpecifier:
-                    return isAliasResolvedToValue(getSymbolOfNode(node));
+                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
                 case SyntaxKind.ExportDeclaration:
                     const exportClause = (<ExportDeclaration>node).exportClause;
                     return exportClause && forEach(exportClause.elements, isValueAliasDeclaration);
                 case SyntaxKind.ExportAssignment:
-                    return (<ExportAssignment>node).expression && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
+                    return (<ExportAssignment>node).expression
+                        && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier
+                            ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
+                            : true;
             }
             return false;
         }
 
         function isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean {
-            if (node.parent.kind !== SyntaxKind.SourceFile || !isInternalModuleImportEqualsDeclaration(node)) {
+            node = getParseTreeNode(node, isImportEqualsDeclaration);
+            if (node === undefined || node.parent.kind !== SyntaxKind.SourceFile || !isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -18481,9 +18575,15 @@ namespace ts {
         }
 
         function isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean {
+            node = getParseTreeNode(node);
+            // Purely synthesized nodes are always emitted.
+            if (node === undefined) {
+                return true;
+            }
+
             if (isAliasSymbolDeclaration(node)) {
                 const symbol = getSymbolOfNode(node);
-                if (getSymbolLinks(symbol).referenced) {
+                if (symbol && getSymbolLinks(symbol).referenced) {
                     return true;
                 }
             }
@@ -18516,7 +18616,8 @@ namespace ts {
         }
 
         function getNodeCheckFlags(node: Node): NodeCheckFlags {
-            return getNodeLinks(node).flags;
+            node = getParseTreeNode(node);
+            return node ? getNodeLinks(node).flags : undefined;
         }
 
         function getEnumMemberValue(node: EnumMember): number {
@@ -18544,16 +18645,21 @@ namespace ts {
             return type.flags & TypeFlags.ObjectType && getSignaturesOfType(type, SignatureKind.Call).length > 0;
         }
 
-        function getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind {
+        function getTypeReferenceSerializationKind(typeName: EntityName, location?: Node): TypeReferenceSerializationKind {
             // Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
-            const valueSymbol = resolveEntityName(typeName, SymbolFlags.Value, /*ignoreErrors*/ true);
+            const valueSymbol = resolveEntityName(typeName, SymbolFlags.Value, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location);
+            const globalPromiseSymbol = tryGetGlobalPromiseConstructorSymbol();
+            if (globalPromiseSymbol && valueSymbol === globalPromiseSymbol) {
+                return TypeReferenceSerializationKind.Promise;
+            }
+
             const constructorType = valueSymbol ? getTypeOfSymbol(valueSymbol) : undefined;
             if (constructorType && isConstructorType(constructorType)) {
                 return TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue;
             }
 
             // Resolve the symbol as a type so that we can provide a more useful hint for the type serializer.
-            const typeSymbol = resolveEntityName(typeName, SymbolFlags.Type, /*ignoreErrors*/ true);
+            const typeSymbol = resolveEntityName(typeName, SymbolFlags.Type, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location);
             // We might not be able to resolve type symbol so use unknown type in that case (eg error case)
             if (!typeSymbol) {
                 return TypeReferenceSerializationKind.ObjectType;
@@ -18565,8 +18671,8 @@ namespace ts {
             else if (type.flags & TypeFlags.Any) {
                 return TypeReferenceSerializationKind.ObjectType;
             }
-            else if (isTypeOfKind(type, TypeFlags.Void)) {
-                return TypeReferenceSerializationKind.VoidType;
+            else if (isTypeOfKind(type, TypeFlags.Void | TypeFlags.Nullable | TypeFlags.Never)) {
+                return TypeReferenceSerializationKind.VoidNullableOrNeverType;
             }
             else if (isTypeOfKind(type, TypeFlags.BooleanLike)) {
                 return TypeReferenceSerializationKind.BooleanType;
@@ -18625,16 +18731,37 @@ namespace ts {
             return !!globals[name];
         }
 
-        function getReferencedValueSymbol(reference: Identifier): Symbol {
-            return getNodeLinks(reference).resolvedSymbol ||
-                resolveName(reference, reference.text, SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias,
-                    /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+        function getReferencedValueSymbol(reference: Identifier, startInDeclarationContainer?: boolean): Symbol {
+            const resolvedSymbol = getNodeLinks(reference).resolvedSymbol;
+            if (resolvedSymbol) {
+                return resolvedSymbol;
+            }
+
+            let location: Node = reference;
+            if (startInDeclarationContainer) {
+                // When resolving the name of a declaration as a value, we need to start resolution
+                // at a point outside of the declaration.
+                const parent = reference.parent;
+                if (isDeclaration(parent) && reference === parent.name) {
+                    location = getDeclarationContainer(parent);
+                }
+            }
+
+            return resolveName(location, reference.text, SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
         }
 
         function getReferencedValueDeclaration(reference: Identifier): Declaration {
-            Debug.assert(!nodeIsSynthesized(reference));
-            const symbol = getReferencedValueSymbol(reference);
-            return symbol && getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration;
+            if (!isGeneratedIdentifier(reference)) {
+                reference = getParseTreeNode(reference, isIdentifier);
+                if (reference) {
+                    const symbol = getReferencedValueSymbol(reference);
+                    if (symbol) {
+                        return getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration;
+                    }
+                }
+            }
+
+            return undefined;
         }
 
         function createResolver(): EmitResolver {
@@ -18770,20 +18897,21 @@ namespace ts {
 
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
-            forEach(host.getSourceFiles(), file => {
+            for (const file of host.getSourceFiles()) {
                 bindSourceFile(file, compilerOptions);
-            });
+            }
 
-            let augmentations: LiteralExpression[][];
             // Initialize global symbol table
-            forEach(host.getSourceFiles(), file => {
+            let augmentations: LiteralExpression[][];
+            let requestedExternalEmitHelpers: NodeFlags = 0;
+            let firstFileRequestingExternalHelpers: SourceFile;
+            for (const file of host.getSourceFiles()) {
                 if (!isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.patternAmbientModules && file.patternAmbientModules.length) {
                     patternAmbientModules = concatenate(patternAmbientModules, file.patternAmbientModules);
                 }
-
                 if (file.moduleAugmentations.length) {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
@@ -18796,7 +18924,16 @@ namespace ts {
                         }
                     }
                 }
-            });
+                if ((compilerOptions.isolatedModules || isExternalModule(file)) && !file.isDeclarationFile) {
+                    const fileRequestedExternalEmitHelpers = file.flags & NodeFlags.EmitHelperFlags;
+                    if (fileRequestedExternalEmitHelpers) {
+                        requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
+                        if (firstFileRequestingExternalHelpers === undefined) {
+                            firstFileRequestingExternalHelpers = file;
+                        }
+                    }
+                }
+            }
 
             if (augmentations) {
                 // merge module augmentations.
@@ -18836,6 +18973,7 @@ namespace ts {
             getGlobalPromiseLikeType = memoize(() => getGlobalType("PromiseLike", /*arity*/ 1));
             getInstantiatedGlobalPromiseLikeType = memoize(createInstantiatedPromiseLikeType);
             getGlobalPromiseConstructorSymbol = memoize(() => getGlobalValueSymbol("Promise"));
+            tryGetGlobalPromiseConstructorSymbol = memoize(() => getGlobalSymbol("Promise", SymbolFlags.Value, /*diagnostic*/ undefined) && getGlobalPromiseConstructorSymbol());
             getGlobalPromiseConstructorLikeType = memoize(() => getGlobalType("PromiseConstructorLike"));
             getGlobalThenableType = memoize(createThenableType);
 
@@ -18859,6 +18997,51 @@ namespace ts {
             const symbol = getGlobalSymbol("ReadonlyArray", SymbolFlags.Type, /*diagnostic*/ undefined);
             globalReadonlyArrayType = symbol && <GenericType>getTypeOfGlobalSymbol(symbol, /*arity*/ 1);
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
+
+            // If we have specified that we are importing helpers, we should report global
+            // errors if we cannot resolve the helpers external module, or if it does not have
+            // the necessary helpers exported.
+            if (compilerOptions.importHelpers && firstFileRequestingExternalHelpers) {
+                // Find the first reference to the helpers module.
+                const helpersModule = resolveExternalModule(
+                    firstFileRequestingExternalHelpers,
+                    externalHelpersModuleNameText,
+                    Diagnostics.Cannot_find_module_0,
+                    /*errorNode*/ undefined);
+
+                // If we found the module, report errors if it does not have the necessary exports.
+                if (helpersModule) {
+                    const exports = helpersModule.exports;
+                    if (requestedExternalEmitHelpers & NodeFlags.HasClassExtends && languageVersion < ScriptTarget.ES6) {
+                        verifyHelperSymbol(exports, "__extends", SymbolFlags.Value);
+                    }
+                    if (requestedExternalEmitHelpers & NodeFlags.HasJsxSpreadAttributes && compilerOptions.jsx !== JsxEmit.Preserve) {
+                        verifyHelperSymbol(exports, "__assign", SymbolFlags.Value);
+                    }
+                    if (requestedExternalEmitHelpers & NodeFlags.HasDecorators) {
+                        verifyHelperSymbol(exports, "__decorate", SymbolFlags.Value);
+                        if (compilerOptions.emitDecoratorMetadata) {
+                            verifyHelperSymbol(exports, "__metadata", SymbolFlags.Value);
+                        }
+                    }
+                    if (requestedExternalEmitHelpers & NodeFlags.HasParamDecorators) {
+                        verifyHelperSymbol(exports, "__param", SymbolFlags.Value);
+                    }
+                    if (requestedExternalEmitHelpers & NodeFlags.HasAsyncFunctions) {
+                        verifyHelperSymbol(exports, "__awaiter", SymbolFlags.Value);
+                        if (languageVersion < ScriptTarget.ES6) {
+                            verifyHelperSymbol(exports, "__generator", SymbolFlags.Value);
+                        }
+                    }
+                }
+            }
+        }
+
+        function verifyHelperSymbol(symbols: SymbolTable, name: string, meaning: SymbolFlags) {
+            const symbol = getSymbol(symbols, escapeIdentifier(name), meaning);
+            if (!symbol) {
+                error(/*location*/ undefined, Diagnostics.Module_0_has_no_exported_member_1, externalHelpersModuleNameText, name);
+            }
         }
 
         function createInstantiatedPromiseLikeType(): ObjectType {
@@ -18912,7 +19095,7 @@ namespace ts {
             }
 
             let lastStatic: Node, lastPrivate: Node, lastProtected: Node, lastDeclare: Node, lastAsync: Node, lastReadonly: Node;
-            let flags = 0;
+            let flags = ModifierFlags.None;
             for (const modifier of node.modifiers) {
                 if (modifier.kind !== SyntaxKind.ReadonlyKeyword) {
                     if (node.kind === SyntaxKind.PropertySignature || node.kind === SyntaxKind.MethodSignature) {
@@ -18940,22 +19123,22 @@ namespace ts {
                             lastPrivate = modifier;
                         }
 
-                        if (flags & NodeFlags.AccessibilityModifier) {
+                        if (flags & ModifierFlags.AccessibilityModifier) {
                             return grammarErrorOnNode(modifier, Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & NodeFlags.Static) {
+                        else if (flags & ModifierFlags.Static) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (flags & NodeFlags.Readonly) {
+                        else if (flags & ModifierFlags.Readonly) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
                         }
-                        else if (flags & NodeFlags.Async) {
+                        else if (flags & ModifierFlags.Async) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
                         else if (node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
-                        else if (flags & NodeFlags.Abstract) {
+                        else if (flags & ModifierFlags.Abstract) {
                             if (modifier.kind === SyntaxKind.PrivateKeyword) {
                                 return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
@@ -18967,13 +19150,13 @@ namespace ts {
                         break;
 
                     case SyntaxKind.StaticKeyword:
-                        if (flags & NodeFlags.Static) {
+                        if (flags & ModifierFlags.Static) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (flags & NodeFlags.Readonly) {
+                        else if (flags & ModifierFlags.Readonly) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
                         }
-                        else if (flags & NodeFlags.Async) {
+                        else if (flags & ModifierFlags.Async) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
                         else if (node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
@@ -18982,36 +19165,36 @@ namespace ts {
                         else if (node.kind === SyntaxKind.Parameter) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
-                        else if (flags & NodeFlags.Abstract) {
+                        else if (flags & ModifierFlags.Abstract) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= NodeFlags.Static;
+                        flags |= ModifierFlags.Static;
                         lastStatic = modifier;
                         break;
 
                     case SyntaxKind.ReadonlyKeyword:
-                        if (flags & NodeFlags.Readonly) {
+                        if (flags & ModifierFlags.Readonly) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "readonly");
                         }
                         else if (node.kind !== SyntaxKind.PropertyDeclaration && node.kind !== SyntaxKind.PropertySignature && node.kind !== SyntaxKind.IndexSignature && node.kind !== SyntaxKind.Parameter) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
-                        flags |= NodeFlags.Readonly;
+                        flags |= ModifierFlags.Readonly;
                         lastReadonly = modifier;
                         break;
 
                     case SyntaxKind.ExportKeyword:
-                        if (flags & NodeFlags.Export) {
+                        if (flags & ModifierFlags.Export) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & NodeFlags.Ambient) {
+                        else if (flags & ModifierFlags.Ambient) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
-                        else if (flags & NodeFlags.Abstract) {
+                        else if (flags & ModifierFlags.Abstract) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
                         }
-                        else if (flags & NodeFlags.Async) {
+                        else if (flags & ModifierFlags.Async) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (node.parent.kind === SyntaxKind.ClassDeclaration) {
@@ -19020,14 +19203,14 @@ namespace ts {
                         else if (node.kind === SyntaxKind.Parameter) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= NodeFlags.Export;
+                        flags |= ModifierFlags.Export;
                         break;
 
                     case SyntaxKind.DeclareKeyword:
-                        if (flags & NodeFlags.Ambient) {
+                        if (flags & ModifierFlags.Ambient) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "declare");
                         }
-                        else if (flags & NodeFlags.Async) {
+                        else if (flags & ModifierFlags.Async) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.parent.kind === SyntaxKind.ClassDeclaration) {
@@ -19039,12 +19222,12 @@ namespace ts {
                         else if (isInAmbientContext(node.parent) && node.parent.kind === SyntaxKind.ModuleBlock) {
                             return grammarErrorOnNode(modifier, Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= NodeFlags.Ambient;
+                        flags |= ModifierFlags.Ambient;
                         lastDeclare = modifier;
                         break;
 
                     case SyntaxKind.AbstractKeyword:
-                        if (flags & NodeFlags.Abstract) {
+                        if (flags & ModifierFlags.Abstract) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "abstract");
                         }
                         if (node.kind !== SyntaxKind.ClassDeclaration) {
@@ -19054,61 +19237,61 @@ namespace ts {
                                 node.kind !== SyntaxKind.SetAccessor) {
                                 return grammarErrorOnNode(modifier, Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === SyntaxKind.ClassDeclaration && node.parent.flags & NodeFlags.Abstract)) {
+                            if (!(node.parent.kind === SyntaxKind.ClassDeclaration && getModifierFlags(node.parent) & ModifierFlags.Abstract)) {
                                 return grammarErrorOnNode(modifier, Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & NodeFlags.Static) {
+                            if (flags & ModifierFlags.Static) {
                                 return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & NodeFlags.Private) {
+                            if (flags & ModifierFlags.Private) {
                                 return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
 
-                        flags |= NodeFlags.Abstract;
+                        flags |= ModifierFlags.Abstract;
                         break;
 
                     case SyntaxKind.AsyncKeyword:
-                        if (flags & NodeFlags.Async) {
+                        if (flags & ModifierFlags.Async) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & NodeFlags.Ambient || isInAmbientContext(node.parent)) {
+                        else if (flags & ModifierFlags.Ambient || isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (node.kind === SyntaxKind.Parameter) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
-                        flags |= NodeFlags.Async;
+                        flags |= ModifierFlags.Async;
                         lastAsync = modifier;
                         break;
                 }
             }
 
             if (node.kind === SyntaxKind.Constructor) {
-                if (flags & NodeFlags.Static) {
+                if (flags & ModifierFlags.Static) {
                     return grammarErrorOnNode(lastStatic, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & NodeFlags.Abstract) {
+                if (flags & ModifierFlags.Abstract) {
                     return grammarErrorOnNode(lastStatic, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & NodeFlags.Async) {
+                else if (flags & ModifierFlags.Async) {
                     return grammarErrorOnNode(lastAsync, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
-                else if (flags & NodeFlags.Readonly) {
+                else if (flags & ModifierFlags.Readonly) {
                     return grammarErrorOnNode(lastReadonly, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
                 }
                 return;
             }
-            else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && flags & NodeFlags.Ambient) {
+            else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && flags & ModifierFlags.Ambient) {
                 return grammarErrorOnNode(lastDeclare, Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === SyntaxKind.Parameter && (flags & NodeFlags.ParameterPropertyModifier) && isBindingPattern((<ParameterDeclaration>node).name)) {
+            else if (node.kind === SyntaxKind.Parameter && (flags & ModifierFlags.ParameterPropertyModifier) && isBindingPattern((<ParameterDeclaration>node).name)) {
                 return grammarErrorOnNode(node, Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === SyntaxKind.Parameter && (flags & NodeFlags.ParameterPropertyModifier) && (<ParameterDeclaration>node).dotDotDotToken) {
+            else if (node.kind === SyntaxKind.Parameter && (flags & ModifierFlags.ParameterPropertyModifier) && (<ParameterDeclaration>node).dotDotDotToken) {
                 return grammarErrorOnNode(node, Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
-            if (flags & NodeFlags.Async) {
+            if (flags & ModifierFlags.Async) {
                 return checkGrammarAsyncModifier(node, lastAsync);
             }
         }
@@ -19169,10 +19352,6 @@ namespace ts {
         }
 
         function checkGrammarAsyncModifier(node: Node, asyncModifier: Node): boolean {
-            if (languageVersion < ScriptTarget.ES6) {
-                return grammarErrorOnNode(asyncModifier, Diagnostics.Async_functions_are_only_available_when_targeting_ECMAScript_2015_or_higher);
-            }
-
             switch (node.kind) {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.FunctionDeclaration:
@@ -19276,7 +19455,7 @@ namespace ts {
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & NodeFlags.Modifier) {
+            if (getModifierFlags(parameter) !== 0) {
                 return grammarErrorOnNode(parameter.name, Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -19461,11 +19640,13 @@ namespace ts {
                 }
 
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
-                forEach(prop.modifiers, mod => {
-                    if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) {
-                        grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod));
+                if (prop.modifiers) {
+                    for (const mod of prop.modifiers) {
+                        if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) {
+                            grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod));
+                        }
                     }
-                });
+                }
 
                 // ECMA-262 11.1.5 Object Initializer
                 // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
@@ -19480,7 +19661,7 @@ namespace ts {
                     // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                     checkGrammarForInvalidQuestionMark(prop, (<PropertyAssignment>prop).questionToken, Diagnostics.An_object_member_cannot_be_declared_optional);
                     if (name.kind === SyntaxKind.NumericLiteral) {
-                        checkGrammarNumericLiteral(<LiteralExpression>name);
+                        checkGrammarNumericLiteral(<NumericLiteral>name);
                     }
                     currentKind = Property;
                 }
@@ -19603,7 +19784,7 @@ namespace ts {
             else if (isInAmbientContext(accessor)) {
                 return grammarErrorOnNode(accessor.name, Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
             }
-            else if (accessor.body === undefined && !(accessor.flags & NodeFlags.Abstract)) {
+            else if (accessor.body === undefined && !(getModifierFlags(accessor) & ModifierFlags.Abstract)) {
                 return grammarErrorAtPos(getSourceFileOfNode(accessor), accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
             }
             else if (accessor.typeParameters) {
@@ -19948,10 +20129,8 @@ namespace ts {
                 node.kind === SyntaxKind.ExportDeclaration ||
                 node.kind === SyntaxKind.ExportAssignment ||
                 node.kind === SyntaxKind.NamespaceExportDeclaration ||
-                (node.flags & NodeFlags.Ambient) ||
-                (node.flags & (NodeFlags.Export | NodeFlags.Default))) {
-
-                return false;
+                getModifierFlags(node) & (ModifierFlags.Ambient | ModifierFlags.Export | ModifierFlags.Default)) {
+                    return false;
             }
 
             return grammarErrorOnFirstToken(node, Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -20004,7 +20183,7 @@ namespace ts {
             }
         }
 
-        function checkGrammarNumericLiteral(node: LiteralExpression): boolean {
+        function checkGrammarNumericLiteral(node: NumericLiteral): boolean {
             // Grammar checking
             if (node.isOctalLiteral && languageVersion >= ScriptTarget.ES5) {
                 return grammarErrorOnNode(node, Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
@@ -20019,5 +20198,15 @@ namespace ts {
                 return true;
             }
         }
+
+        function getAmbientModules(): Symbol[] {
+            const result: Symbol[] = [];
+            for (const sym in globals) {
+                if (ambientModuleSymbolRegex.test(sym)) {
+                    result.push(globals[sym]);
+                }
+            }
+            return result;
+        }
     }
 }
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 3596233ed14..9a958f68b73 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -30,6 +30,7 @@ namespace ts {
         {
             name: "extendedDiagnostics",
             type: "boolean",
+            experimental: true
         },
         {
             name: "emitBOM",
@@ -433,6 +434,11 @@ namespace ts {
             name: "strictNullChecks",
             type: "boolean",
             description: Diagnostics.Enable_strict_null_checks
+        },
+        {
+            name: "importHelpers",
+            type: "boolean",
+            description: Diagnostics.Import_emit_helpers_from_tslib
         }
     ];
 
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
new file mode 100644
index 00000000000..1bca13a4bdb
--- /dev/null
+++ b/src/compiler/comments.ts
@@ -0,0 +1,352 @@
+/// <reference path="sourcemap.ts" />
+
+/* @internal */
+namespace ts {
+    export interface CommentWriter {
+        reset(): void;
+        setSourceFile(sourceFile: SourceFile): void;
+        emitNodeWithComments(node: Node, emitCallback: (node: Node) => void): void;
+        emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void;
+        emitTrailingCommentsOfPosition(pos: number): void;
+    }
+
+    export function createCommentWriter(host: EmitHost, writer: EmitTextWriter, sourceMap: SourceMapWriter): CommentWriter {
+        const compilerOptions = host.getCompilerOptions();
+        const extendedDiagnostics = compilerOptions.extendedDiagnostics;
+        const newLine = host.getNewLine();
+        const { emitPos } = sourceMap;
+
+        let containerPos = -1;
+        let containerEnd = -1;
+        let declarationListContainerEnd = -1;
+        let currentSourceFile: SourceFile;
+        let currentText: string;
+        let currentLineMap: number[];
+        let detachedCommentsInfo: { nodePos: number, detachedCommentEndPos: number}[];
+        let hasWrittenComment = false;
+        let disabled: boolean = compilerOptions.removeComments;
+
+        return {
+            reset,
+            setSourceFile,
+            emitNodeWithComments,
+            emitBodyWithDetachedComments,
+            emitTrailingCommentsOfPosition,
+        };
+
+        function emitNodeWithComments(node: Node, emitCallback: (node: Node) => void) {
+            if (disabled) {
+                emitCallback(node);
+                return;
+            }
+
+            if (node) {
+                const { pos, end } = node.commentRange || node;
+                const emitFlags = node.emitFlags;
+                if ((pos < 0 && end < 0) || (pos === end)) {
+                    // Both pos and end are synthesized, so just emit the node without comments.
+                    if (emitFlags & NodeEmitFlags.NoNestedComments) {
+                        disableCommentsAndEmit(node, emitCallback);
+                    }
+                    else {
+                        emitCallback(node);
+                    }
+                }
+                else {
+                    if (extendedDiagnostics) {
+                        performance.mark("preEmitNodeWithComment");
+                    }
+
+                    const isEmittedNode = node.kind !== SyntaxKind.NotEmittedStatement;
+                    const skipLeadingComments = pos < 0 || (emitFlags & NodeEmitFlags.NoLeadingComments) !== 0;
+                    const skipTrailingComments = end < 0 || (emitFlags & NodeEmitFlags.NoTrailingComments) !== 0;
+
+                    // Emit leading comments if the position is not synthesized and the node
+                    // has not opted out from emitting leading comments.
+                    if (!skipLeadingComments) {
+                        emitLeadingComments(pos, isEmittedNode);
+                    }
+
+                    // Save current container state on the stack.
+                    const savedContainerPos = containerPos;
+                    const savedContainerEnd = containerEnd;
+                    const savedDeclarationListContainerEnd = declarationListContainerEnd;
+
+                    if (!skipLeadingComments) {
+                        containerPos = pos;
+                    }
+
+                    if (!skipTrailingComments) {
+                        containerEnd = end;
+
+                        // To avoid invalid comment emit in a down-level binding pattern, we
+                        // keep track of the last declaration list container's end
+                        if (node.kind === SyntaxKind.VariableDeclarationList) {
+                            declarationListContainerEnd = end;
+                        }
+                    }
+
+                    if (extendedDiagnostics) {
+                        performance.measure("commentTime", "preEmitNodeWithComment");
+                    }
+
+                    if (emitFlags & NodeEmitFlags.NoNestedComments) {
+                        disableCommentsAndEmit(node, emitCallback);
+                    }
+                    else {
+                        emitCallback(node);
+                    }
+
+                    if (extendedDiagnostics) {
+                        performance.mark("beginEmitNodeWithComment");
+                    }
+
+                    // Restore previous container state.
+                    containerPos = savedContainerPos;
+                    containerEnd = savedContainerEnd;
+                    declarationListContainerEnd = savedDeclarationListContainerEnd;
+
+                    // Emit trailing comments if the position is not synthesized and the node
+                    // has not opted out from emitting leading comments and is an emitted node.
+                    if (!skipTrailingComments && isEmittedNode) {
+                        emitTrailingComments(end);
+                    }
+
+                    if (extendedDiagnostics) {
+                        performance.measure("commentTime", "beginEmitNodeWithComment");
+                    }
+                }
+            }
+        }
+
+        function emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void) {
+            if (extendedDiagnostics) {
+                performance.mark("preEmitBodyWithDetachedComments");
+            }
+
+            const { pos, end } = detachedRange;
+            const emitFlags = node.emitFlags;
+            const skipLeadingComments = pos < 0 || (emitFlags & NodeEmitFlags.NoLeadingComments) !== 0;
+            const skipTrailingComments = disabled || end < 0 || (emitFlags & NodeEmitFlags.NoTrailingComments) !== 0;
+
+            if (!skipLeadingComments) {
+                emitDetachedCommentsAndUpdateCommentsInfo(detachedRange);
+            }
+
+            if (extendedDiagnostics) {
+                performance.measure("commentTime", "preEmitBodyWithDetachedComments");
+            }
+
+            if (emitFlags & NodeEmitFlags.NoNestedComments) {
+                disableCommentsAndEmit(node, emitCallback);
+            }
+            else {
+                emitCallback(node);
+            }
+
+            if (extendedDiagnostics) {
+                performance.mark("beginEmitBodyWithDetachedCommetns");
+            }
+
+            if (!skipTrailingComments) {
+                emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
+            }
+
+            if (extendedDiagnostics) {
+                performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+            }
+        }
+
+        function emitLeadingComments(pos: number, isEmittedNode: boolean) {
+            hasWrittenComment = false;
+
+            if (isEmittedNode) {
+                forEachLeadingCommentToEmit(pos, emitLeadingComment);
+            }
+            else if (pos === 0) {
+                // If the node will not be emitted in JS, remove all the comments(normal, pinned and ///) associated with the node,
+                // unless it is a triple slash comment at the top of the file.
+                // For Example:
+                //      /// <reference-path ...>
+                //      declare var x;
+                //      /// <reference-path ...>
+                //      interface F {}
+                //  The first /// will NOT be removed while the second one will be removed even though both node will not be emitted
+                forEachLeadingCommentToEmit(pos, emitTripleSlashLeadingComment);
+            }
+        }
+
+        function emitTripleSlashLeadingComment(commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean, rangePos: number) {
+            if (isTripleSlashComment(commentPos, commentEnd)) {
+                emitLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos);
+            }
+        }
+
+        function emitLeadingComment(commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean, rangePos: number) {
+            if (!hasWrittenComment) {
+                emitNewLineBeforeLeadingCommentOfPosition(currentLineMap, writer, rangePos, commentPos);
+                hasWrittenComment = true;
+            }
+
+            // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
+            emitPos(commentPos);
+            writeCommentRange(currentText, currentLineMap, writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+
+            if (hasTrailingNewLine) {
+                writer.writeLine();
+            }
+            else {
+                writer.write(" ");
+            }
+        }
+
+        function emitTrailingComments(pos: number) {
+            forEachTrailingCommentToEmit(pos, emitTrailingComment);
+        }
+
+        function emitTrailingComment(commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean) {
+            // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment2*/
+            if (!writer.isAtStartOfLine()) {
+                writer.write(" ");
+            }
+
+            emitPos(commentPos);
+            writeCommentRange(currentText, currentLineMap, writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+
+            if (hasTrailingNewLine) {
+                writer.writeLine();
+            }
+        }
+
+        function emitTrailingCommentsOfPosition(pos: number) {
+            if (disabled) {
+                return;
+            }
+
+            if (extendedDiagnostics) {
+                performance.mark("beforeEmitTrailingCommentsOfPosition");
+            }
+
+            forEachTrailingCommentToEmit(pos, emitTrailingCommentOfPosition);
+
+            if (extendedDiagnostics) {
+                performance.measure("commentTime", "beforeEmitTrailingCommentsOfPosition");
+            }
+        }
+
+        function emitTrailingCommentOfPosition(commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean) {
+            // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
+
+            emitPos(commentPos);
+            writeCommentRange(currentText, currentLineMap, writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+
+            if (hasTrailingNewLine) {
+                writer.writeLine();
+            }
+            else {
+                writer.write(" ");
+            }
+        }
+
+        function forEachLeadingCommentToEmit(pos: number, cb: (commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean, rangePos: number) => void) {
+            // Emit the leading comments only if the container's pos doesn't match because the container should take care of emitting these comments
+            if (containerPos === -1 || pos !== containerPos) {
+                if (hasDetachedComments(pos)) {
+                    forEachLeadingCommentWithoutDetachedComments(cb);
+                }
+                else {
+                    forEachLeadingCommentRange(currentText, pos, cb, /*state*/ pos);
+                }
+            }
+        }
+
+        function forEachTrailingCommentToEmit(end: number, cb: (commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean) => void) {
+            // Emit the trailing comments only if the container's end doesn't match because the container should take care of emitting these comments
+            if (containerEnd === -1 || (end !== containerEnd && end !== declarationListContainerEnd)) {
+                forEachTrailingCommentRange(currentText, end, cb);
+            }
+        }
+
+        function reset() {
+            currentSourceFile = undefined;
+            currentText = undefined;
+            currentLineMap = undefined;
+            detachedCommentsInfo = undefined;
+        }
+
+        function setSourceFile(sourceFile: SourceFile) {
+            currentSourceFile = sourceFile;
+            currentText = currentSourceFile.text;
+            currentLineMap = getLineStarts(currentSourceFile);
+            detachedCommentsInfo = undefined;
+        }
+
+        function disableCommentsAndEmit(node: Node, emitCallback: (node: Node) => void): void {
+            if (disabled) {
+                emitCallback(node);
+            }
+            else {
+                disabled = true;
+                emitCallback(node);
+                disabled = false;
+            }
+        }
+
+        function hasDetachedComments(pos: number) {
+            return detachedCommentsInfo !== undefined && lastOrUndefined(detachedCommentsInfo).nodePos === pos;
+        }
+
+        function forEachLeadingCommentWithoutDetachedComments(cb: (commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean, rangePos: number) => void) {
+            // get the leading comments from detachedPos
+            const pos = lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos;
+            if (detachedCommentsInfo.length - 1) {
+                detachedCommentsInfo.pop();
+            }
+            else {
+                detachedCommentsInfo = undefined;
+            }
+
+            forEachLeadingCommentRange(currentText, pos, cb, /*state*/ pos);
+        }
+
+        function emitDetachedCommentsAndUpdateCommentsInfo(range: TextRange) {
+            const currentDetachedCommentInfo = emitDetachedComments(currentText, currentLineMap, writer, writeComment, range, newLine, disabled);
+            if (currentDetachedCommentInfo) {
+                if (detachedCommentsInfo) {
+                    detachedCommentsInfo.push(currentDetachedCommentInfo);
+                }
+                else {
+                    detachedCommentsInfo = [currentDetachedCommentInfo];
+                }
+            }
+        }
+
+        function writeComment(text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) {
+            emitPos(commentPos);
+            writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+        }
+
+        /**
+         * Determine if the given comment is a triple-slash
+         *
+         * @return true if the comment is a triple-slash comment else false
+         **/
+        function isTripleSlashComment(commentPos: number, commentEnd: number) {
+            // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
+            // so that we don't end up computing comment string and doing match for all // comments
+            if (currentText.charCodeAt(commentPos + 1) === CharacterCodes.slash &&
+                commentPos + 2 < commentEnd &&
+                currentText.charCodeAt(commentPos + 2) === CharacterCodes.slash) {
+                const textSubStr = currentText.substring(commentPos, commentEnd);
+                return textSubStr.match(fullTripleSlashReferencePathRegEx) ||
+                    textSubStr.match(fullTripleSlashAMDReferencePathRegEx) ?
+                    true : false;
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 27b27bc6532..75a724e4fd8 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -113,6 +113,23 @@ namespace ts {
         return undefined;
     }
 
+    /**
+     * Iterates through `array` by index and performs the callback on each element of array until the callback
+     * returns a falsey value, then returns false.
+     * If no such value is found, the callback is applied to each element of array and `true` is returned.
+     */
+    export function every<T>(array: T[], callback: (element: T, index: number) => boolean): boolean {
+        if (array) {
+            for (let i = 0, len = array.length; i < len; i++) {
+                if (!callback(array[i], i)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
     /** Works like Array.prototype.find, returning `undefined` if no element satisfying the predicate is found. */
     export function find<T>(array: T[], predicate: (element: T, index: number) => boolean): T | undefined {
         for (let i = 0, len = array.length; i < len; i++) {
@@ -169,11 +186,12 @@ namespace ts {
         return -1;
     }
 
-    export function countWhere<T>(array: T[], predicate: (x: T) => boolean): number {
+    export function countWhere<T>(array: T[], predicate: (x: T, i: number) => boolean): number {
         let count = 0;
         if (array) {
-            for (const v of array) {
-                if (predicate(v)) {
+            for (let i = 0; i < array.length; i++) {
+                const v = array[i];
+                if (predicate(v, i)) {
                     count++;
                 }
             }
@@ -185,6 +203,8 @@ namespace ts {
      * Filters an array by a predicate function. Returns the same array instance if the predicate is
      * true for all elements, otherwise returns a new array instance containing the filtered subset.
      */
+    export function filter<T, U extends T>(array: T[], f: (x: T) => x is U): U[];
+    export function filter<T>(array: T[], f: (x: T) => boolean): T[]
     export function filter<T>(array: T[], f: (x: T) => boolean): T[] {
         if (array) {
             const len = array.length;
@@ -232,22 +252,135 @@ namespace ts {
         array.length = outIndex;
     }
 
-    export function map<T, U>(array: T[], f: (x: T) => U): U[] {
+    export function map<T, U>(array: T[], f: (x: T, i: number) => U): U[] {
         let result: U[];
         if (array) {
             result = [];
-            for (const v of array) {
-                result.push(f(v));
+            for (let i = 0; i < array.length; i++) {
+                const v = array[i];
+                result.push(f(v, i));
             }
         }
         return result;
     }
 
+    /**
+     * Flattens an array containing a mix of array or non-array elements.
+     *
+     * @param array The array to flatten.
+     */
+    export function flatten<T>(array: (T | T[])[]): T[] {
+        let result: T[];
+        if (array) {
+            result = [];
+            for (const v of array) {
+                if (v) {
+                    if (isArray(v)) {
+                        addRange(result, v);
+                    }
+                    else {
+                        result.push(v);
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Maps an array. If the mapped value is an array, it is spread into the result.
+     *
+     * @param array The array to map.
+     * @param mapfn The callback used to map the result into one or more values.
+     */
+    export function flatMap<T, U>(array: T[], mapfn: (x: T, i: number) => U | U[]): U[] {
+        let result: U[];
+        if (array) {
+            result = [];
+            for (let i = 0; i < array.length; i++) {
+                const v = mapfn(array[i], i);
+                if (v) {
+                    if (isArray(v)) {
+                        addRange(result, v);
+                    }
+                    else {
+                        result.push(v);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Computes the first matching span of elements and returns a tuple of the first span
+     * and the remaining elements.
+     */
+    export function span<T>(array: T[], f: (x: T, i: number) => boolean): [T[], T[]] {
+        if (array) {
+            for (let i = 0; i < array.length; i++) {
+                if (!f(array[i], i)) {
+                    return [array.slice(0, i), array.slice(i)];
+                }
+            }
+            return [array.slice(0), []];
+        }
+
+        return undefined;
+    }
+
+    /**
+     * Maps contiguous spans of values with the same key.
+     *
+     * @param array The array to map.
+     * @param keyfn A callback used to select the key for an element.
+     * @param mapfn A callback used to map a contiguous chunk of values to a single value.
+     */
+    export function spanMap<T, K, U>(array: T[], keyfn: (x: T, i: number) => K, mapfn: (chunk: T[], key: K, start: number, end: number) => U): U[] {
+        let result: U[];
+        if (array) {
+            result = [];
+            const len = array.length;
+            let previousKey: K;
+            let key: K;
+            let start = 0;
+            let pos = 0;
+            while (start < len) {
+                while (pos < len) {
+                    const value = array[pos];
+                    key = keyfn(value, pos);
+                    if (pos === 0) {
+                        previousKey = key;
+                    }
+                    else if (key !== previousKey) {
+                        break;
+                    }
+
+                    pos++;
+                }
+
+                if (start < pos) {
+                    const v = mapfn(array.slice(start, pos), previousKey, start, pos);
+                    if (v) {
+                        result.push(v);
+                    }
+
+                    start = pos;
+                }
+
+                previousKey = key;
+                pos++;
+            }
+        }
+
+        return result;
+    }
+
     export function concatenate<T>(array1: T[], array2: T[]): T[] {
         if (!array2 || !array2.length) return array1;
         if (!array1 || !array1.length) return array2;
-
-        return array1.concat(array2);
+        return [...array1, ...array2];
     }
 
     export function deduplicate<T>(array: T[], areEqual?: (a: T, b: T) => boolean): T[] {
@@ -266,6 +399,27 @@ namespace ts {
         return result;
     }
 
+    /**
+     * Compacts an array, removing any falsey elements.
+     */
+    export function compact<T>(array: T[]): T[] {
+        let result: T[];
+        if (array) {
+            for (let i = 0; i < array.length; i++) {
+                const v = array[i];
+                if (result || !v) {
+                    if (!result) {
+                        result = array.slice(0, i);
+                    }
+                    if (v) {
+                        result.push(v);
+                    }
+                }
+            }
+        }
+        return result || array;
+    }
+
     export function sum(array: any[], prop: string): number {
         let result = 0;
         for (const v of array) {
@@ -277,7 +431,9 @@ namespace ts {
     export function addRange<T>(to: T[], from: T[]): void {
         if (to && from) {
             for (const v of from) {
-                to.push(v);
+                if (v !== undefined) {
+                    to.push(v);
+                }
             }
         }
     }
@@ -292,15 +448,31 @@ namespace ts {
         return true;
     }
 
+    export function firstOrUndefined<T>(array: T[]): T {
+        return array && array.length > 0
+            ? array[0]
+            : undefined;
+    }
+
+    export function singleOrUndefined<T>(array: T[]): T {
+        return array && array.length === 1
+            ? array[0]
+            : undefined;
+    }
+
+    export function singleOrMany<T>(array: T[]): T | T[] {
+        return array && array.length === 1
+            ? array[0]
+            : array;
+    }
+
     /**
      * Returns the last element of an array if non-empty, undefined otherwise.
      */
     export function lastOrUndefined<T>(array: T[]): T {
-        if (array.length === 0) {
-            return undefined;
-        }
-
-        return array[array.length - 1];
+        return array && array.length > 0
+            ? array[array.length - 1]
+            : undefined;
     }
 
     /**
@@ -332,14 +504,15 @@ namespace ts {
         return ~low;
     }
 
-    export function reduceLeft<T>(array: T[], f: (a: T, x: T) => T): T;
-    export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
-    export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
-        if (array) {
-            const count = array.length;
-            if (count > 0) {
-                let pos = 0;
-                let result: T | U;
+    export function reduceLeft<T, U>(array: T[], f: (memo: U, value: T, i: number) => U, initial: U, start?: number, count?: number): U;
+    export function reduceLeft<T>(array: T[], f: (memo: T, value: T, i: number) => T): T;
+    export function reduceLeft<T>(array: T[], f: (memo: T, value: T, i: number) => T, initial?: T, start?: number, count?: number): T {
+        if (array && array.length > 0) {
+            const size = array.length;
+            if (size > 0) {
+                let pos = start === undefined || start < 0 ? 0 : start;
+                const end = count === undefined || pos + count > size - 1 ? size - 1 : pos + count;
+                let result: T;
                 if (arguments.length <= 2) {
                     result = array[pos];
                     pos++;
@@ -347,23 +520,25 @@ namespace ts {
                 else {
                     result = initial;
                 }
-                while (pos < count) {
-                    result = f(<U>result, array[pos]);
+                while (pos <= end) {
+                    result = f(result, array[pos], pos);
                     pos++;
                 }
-                return <U>result;
+                return result;
             }
         }
         return initial;
     }
 
-    export function reduceRight<T>(array: T[], f: (a: T, x: T) => T): T;
-    export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
-    export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
+    export function reduceRight<T, U>(array: T[], f: (memo: U, value: T, i: number) => U, initial: U, start?: number, count?: number): U;
+    export function reduceRight<T>(array: T[], f: (memo: T, value: T, i: number) => T): T;
+    export function reduceRight<T>(array: T[], f: (memo: T, value: T, i: number) => T, initial?: T, start?: number, count?: number): T {
         if (array) {
-            let pos = array.length - 1;
-            if (pos >= 0) {
-                let result: T | U;
+            const size = array.length;
+            if (size > 0) {
+                let pos = start === undefined || start > size - 1 ? size - 1 : start;
+                const end = count === undefined || pos - count < 0 ? 0 : pos - count;
+                let result: T;
                 if (arguments.length <= 2) {
                     result = array[pos];
                     pos--;
@@ -371,11 +546,11 @@ namespace ts {
                 else {
                     result = initial;
                 }
-                while (pos >= 0) {
-                    result = f(<U>result, array[pos]);
+                while (pos >= end) {
+                    result = f(result, array[pos], pos);
                     pos--;
                 }
-                return <U>result;
+                return result;
             }
         }
         return initial;
@@ -539,6 +714,15 @@ namespace ts {
         return result;
     }
 
+    export function isEmpty<T>(map: Map<T>) {
+        for (const id in map) {
+            if (hasProperty(map, id)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     export function cloneMap<T>(map: Map<T>) {
         const clone = createMap<T>();
         copyProperties(map, clone);
@@ -566,6 +750,36 @@ namespace ts {
         return result;
     }
 
+    /**
+     * Adds the value to an array of values associated with the key, and returns the array.
+     * Creates the array if it does not already exist.
+     */
+    export function multiMapAdd<V>(map: Map<V[]>, key: string, value: V): V[] {
+        const values = map[key];
+        if (values) {
+            values.push(value);
+            return values;
+        }
+        else {
+            return map[key] = [value];
+        }
+    }
+
+    /**
+     * Removes a value from an array of values associated with the key.
+     * Does not preserve the order of those values.
+     * Does nothing if `key` is not in `map`, or `value` is not in `map[key]`.
+     */
+    export function multiMapRemove<V>(map: Map<V[]>, key: string, value: V): void {
+        const values = map[key];
+        if (values) {
+            unorderedRemoveItem(values, value);
+            if (!values.length) {
+                delete map[key];
+            }
+        }
+    }
+
     /**
      * Tests whether a value is an array.
      */
@@ -1453,11 +1667,16 @@ namespace ts {
     }
 
     function Node(this: Node, kind: SyntaxKind, pos: number, end: number) {
+        this.id = 0;
         this.kind = kind;
         this.pos = pos;
         this.end = end;
         this.flags = NodeFlags.None;
+        this.modifierFlagsCache = ModifierFlags.None;
+        this.transformFlags = TransformFlags.None;
         this.parent = undefined;
+        this.original = undefined;
+        this.transformId = 0;
     }
 
     export let objectAllocator: ObjectAllocator = {
@@ -1478,10 +1697,13 @@ namespace ts {
     }
 
     export namespace Debug {
-        const currentAssertionLevel = AssertionLevel.None;
+        declare var process: any;
+        declare var require: any;
+
+        let currentAssertionLevel: AssertionLevel;
 
         export function shouldAssert(level: AssertionLevel): boolean {
-            return currentAssertionLevel >= level;
+            return getCurrentAssertionLevel() >= level;
         }
 
         export function assert(expression: boolean, message?: string, verboseDebugInfo?: () => string): void {
@@ -1498,22 +1720,70 @@ namespace ts {
         export function fail(message?: string): void {
             Debug.assert(/*expression*/ false, message);
         }
+
+        function getCurrentAssertionLevel() {
+            if (currentAssertionLevel !== undefined) {
+                return currentAssertionLevel;
+            }
+
+            if (sys === undefined) {
+                return AssertionLevel.None;
+            }
+
+            const developmentMode = /^development$/i.test(getEnvironmentVariable("NODE_ENV"));
+            currentAssertionLevel = developmentMode
+                ? AssertionLevel.Normal
+                : AssertionLevel.None;
+
+            return currentAssertionLevel;
+        }
     }
 
-    export function copyListRemovingItem<T>(item: T, list: T[]) {
-        const copiedList: T[] = [];
-        for (const e of list) {
-            if (e !== item) {
-                copiedList.push(e);
+    export function getEnvironmentVariable(name: string, host?: CompilerHost) {
+        if (host && host.getEnvironmentVariable) {
+            return host.getEnvironmentVariable(name);
+        }
+
+        if (sys && sys.getEnvironmentVariable) {
+            return sys.getEnvironmentVariable(name);
+        }
+
+        return "";
+    }
+
+    /** Remove an item from an array, moving everything to its right one space left. */
+    export function orderedRemoveItemAt<T>(array: T[], index: number): void {
+        // This seems to be faster than either `array.splice(i, 1)` or `array.copyWithin(i, i+ 1)`.
+        for (let i = index; i < array.length - 1; i++) {
+            array[i] = array[i + 1];
+        }
+        array.pop();
+    }
+
+    export function unorderedRemoveItemAt<T>(array: T[], index: number): void {
+        // Fill in the "hole" left at `index`.
+        array[index] = array[array.length - 1];
+        array.pop();
+    }
+
+    /** Remove the *first* occurrence of `item` from the array. */
+    export function unorderedRemoveItem<T>(array: T[], item: T): void {
+        unorderedRemoveFirstItemWhere(array, element => element === item);
+    }
+
+    /** Remove the *first* element satisfying `predicate`. */
+    function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {
+        for (let i = 0; i < array.length; i++) {
+            if (predicate(array[i])) {
+                unorderedRemoveItemAt(array, i);
+                break;
             }
         }
-        return copiedList;
     }
 
-    export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string {
-        return useCaseSensitivefileNames
+    export function createGetCanonicalFileName(useCaseSensitiveFileNames: boolean): (fileName: string) => string {
+        return useCaseSensitiveFileNames
             ? ((fileName) => fileName)
             : ((fileName) => fileName.toLowerCase());
     }
-
 }
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index ab1ca518256..68e488295e7 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -374,7 +374,7 @@ namespace ts {
                 const jsDocComments = getJsDocCommentsFromText(declaration, currentText);
                 emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, writeCommentRange);
+                emitComments(currentText, currentLineMap, writer, jsDocComments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeCommentRange);
             }
         }
 
@@ -655,12 +655,13 @@ namespace ts {
         function emitModuleElementDeclarationFlags(node: Node) {
             // If the node is parented in the current source file we need to emit export declare or just export
             if (node.parent.kind === SyntaxKind.SourceFile) {
+                const modifiers = getModifierFlags(node);
                 // If the node is exported
-                if (node.flags & NodeFlags.Export) {
+                if (modifiers & ModifierFlags.Export) {
                     write("export ");
                 }
 
-                if (node.flags & NodeFlags.Default) {
+                if (modifiers & ModifierFlags.Default) {
                     write("default ");
                 }
                 else if (node.kind !== SyntaxKind.InterfaceDeclaration && !noDeclare) {
@@ -669,21 +670,21 @@ namespace ts {
             }
         }
 
-        function emitClassMemberDeclarationFlags(flags: NodeFlags) {
-            if (flags & NodeFlags.Private) {
+        function emitClassMemberDeclarationFlags(flags: ModifierFlags) {
+            if (flags & ModifierFlags.Private) {
                 write("private ");
             }
-            else if (flags & NodeFlags.Protected) {
+            else if (flags & ModifierFlags.Protected) {
                 write("protected ");
             }
 
-            if (flags & NodeFlags.Static) {
+            if (flags & ModifierFlags.Static) {
                 write("static ");
             }
-            if (flags & NodeFlags.Readonly) {
+            if (flags & ModifierFlags.Readonly) {
                 write("readonly ");
             }
-            if (flags & NodeFlags.Abstract) {
+            if (flags & ModifierFlags.Abstract) {
                 write("abstract ");
             }
         }
@@ -692,7 +693,7 @@ namespace ts {
             // note usage of writer. methods instead of aliases created, just to make sure we are using
             // correct writer especially to handle asynchronous alias writing
             emitJsDocComments(node);
-            if (node.flags & NodeFlags.Export) {
+            if (hasModifier(node, ModifierFlags.Export)) {
                 write("export ");
             }
             write("import ");
@@ -731,7 +732,7 @@ namespace ts {
 
         function writeImportDeclaration(node: ImportDeclaration) {
             emitJsDocComments(node);
-            if (node.flags & NodeFlags.Export) {
+            if (hasModifier(node, ModifierFlags.Export)) {
                 write("export ");
             }
             write("import ");
@@ -926,7 +927,7 @@ namespace ts {
         }
 
         function isPrivateMethodTypeParameter(node: TypeParameterDeclaration) {
-            return node.parent.kind === SyntaxKind.MethodDeclaration && (node.parent.flags & NodeFlags.Private);
+            return node.parent.kind === SyntaxKind.MethodDeclaration && hasModifier(node.parent, ModifierFlags.Private);
         }
 
         function emitTypeParameters(typeParameters: TypeParameterDeclaration[]) {
@@ -976,7 +977,7 @@ namespace ts {
 
                         case SyntaxKind.MethodDeclaration:
                         case SyntaxKind.MethodSignature:
-                            if (node.parent.flags & NodeFlags.Static) {
+                            if (hasModifier(node.parent, ModifierFlags.Static)) {
                                 diagnosticMessage = Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
@@ -1055,7 +1056,7 @@ namespace ts {
             function emitParameterProperties(constructorDeclaration: ConstructorDeclaration) {
                 if (constructorDeclaration) {
                     forEach(constructorDeclaration.parameters, param => {
-                        if (param.flags & NodeFlags.ParameterPropertyModifier) {
+                        if (hasModifier(param, ModifierFlags.ParameterPropertyModifier)) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -1064,7 +1065,7 @@ namespace ts {
 
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & NodeFlags.Abstract) {
+            if (hasModifier(node, ModifierFlags.Abstract)) {
                 write("abstract ");
             }
 
@@ -1114,7 +1115,7 @@ namespace ts {
             }
 
             emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node.flags);
+            emitClassMemberDeclarationFlags(getModifierFlags(node));
             emitVariableDeclaration(<VariableDeclaration>node);
             write(";");
             writeLine();
@@ -1141,7 +1142,7 @@ namespace ts {
                     if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && node.parent.kind === SyntaxKind.TypeLiteral) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & NodeFlags.Private)) {
+                    else if (!hasModifier(node, ModifierFlags.Private)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
@@ -1158,7 +1159,7 @@ namespace ts {
                 // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
                 else if (node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
-                    if (node.flags & NodeFlags.Static) {
+                    if (hasModifier(node, ModifierFlags.Static)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -1269,9 +1270,9 @@ namespace ts {
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
-                emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : NodeFlags.Readonly));
+                emitClassMemberDeclarationFlags(getModifierFlags(node) | (accessors.setAccessor ? 0 : ModifierFlags.Readonly));
                 writeTextOfNode(currentText, node.name);
-                if (!(node.flags & NodeFlags.Private)) {
+                if (!hasModifier(node, ModifierFlags.Private)) {
                     accessorWithTypeAnnotation = node;
                     let type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
@@ -1302,7 +1303,7 @@ namespace ts {
                 let diagnosticMessage: DiagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === SyntaxKind.SetAccessor) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
-                    if (accessorWithTypeAnnotation.parent.flags & NodeFlags.Static) {
+                    if (hasModifier(accessorWithTypeAnnotation.parent, ModifierFlags.Static)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
@@ -1320,7 +1321,7 @@ namespace ts {
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & NodeFlags.Static) {
+                    if (hasModifier(accessorWithTypeAnnotation, ModifierFlags.Static)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -1356,7 +1357,7 @@ namespace ts {
                     emitModuleElementDeclarationFlags(node);
                 }
                 else if (node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.Constructor) {
-                    emitClassMemberDeclarationFlags(node.flags);
+                    emitClassMemberDeclarationFlags(getModifierFlags(node));
                 }
                 if (node.kind === SyntaxKind.FunctionDeclaration) {
                     write("function ");
@@ -1387,7 +1388,7 @@ namespace ts {
 
             if (node.kind === SyntaxKind.IndexSignature) {
                 // Index signature can have readonly modifier
-                emitClassMemberDeclarationFlags(node.flags);
+                emitClassMemberDeclarationFlags(getModifierFlags(node));
                 write("[");
             }
             else {
@@ -1428,7 +1429,7 @@ namespace ts {
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== SyntaxKind.Constructor && !(node.flags & NodeFlags.Private)) {
+            else if (node.kind !== SyntaxKind.Constructor && !hasModifier(node, ModifierFlags.Private)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
 
@@ -1468,7 +1469,7 @@ namespace ts {
 
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
-                        if (node.flags & NodeFlags.Static) {
+                        if (hasModifier(node, ModifierFlags.Static)) {
                             diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                     Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -1534,7 +1535,7 @@ namespace ts {
                 node.parent.parent.kind === SyntaxKind.TypeLiteral) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & NodeFlags.Private)) {
+            else if (!hasModifier(node.parent, ModifierFlags.Private)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
 
@@ -1570,7 +1571,7 @@ namespace ts {
 
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
-                        if (node.parent.flags & NodeFlags.Static) {
+                        if (hasModifier(node.parent, ModifierFlags.Static)) {
                             return symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                     Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index e6bf1d5a170..cddb132f56c 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -827,10 +827,6 @@
         "category": "Error",
         "code": 1308
     },
-    "Async functions are only available when targeting ECMAScript 2015 or higher.": {
-        "category": "Error",
-        "code": 1311
-    },
     "'=' can only be used in an object literal property inside a destructuring assignment.": {
         "category": "Error",
         "code": 1312
@@ -1703,7 +1699,7 @@
         "category": "Error",
         "code": 2521
     },
-    "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression.": {
+    "The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method.": {
         "category": "Error",
         "code": 2522
     },
@@ -2840,6 +2836,10 @@
         "category": "Error",
         "code": 6138
     },
+    "Import emit helpers from 'tslib'.": {
+        "category": "Message",
+        "code": 6139
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f02cf266744..680c446c0d5 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1,285 +1,11 @@
 /// <reference path="checker.ts"/>
-/// <reference path="sourcemap.ts" />
+/// <reference path="transformer.ts" />
 /// <reference path="declarationEmitter.ts"/>
+/// <reference path="sourcemap.ts"/>
+/// <reference path="comments.ts" />
 
 /* @internal */
 namespace ts {
-    export function getResolvedExternalModuleName(host: EmitHost, file: SourceFile): string {
-        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
-    }
-
-    export function getExternalModuleNameFromDeclaration(host: EmitHost, resolver: EmitResolver, declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): string {
-        const file = resolver.getExternalModuleFileFromDeclaration(declaration);
-        if (!file || isDeclarationFile(file)) {
-            return undefined;
-        }
-        return getResolvedExternalModuleName(host, file);
-    }
-
-    type DependencyGroup = Array<ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration>;
-
-    const enum Jump {
-        Break       = 1 << 1,
-        Continue    = 1 << 2,
-        Return      = 1 << 3
-    }
-
-    const entities = createMap({
-        "quot": 0x0022,
-        "amp": 0x0026,
-        "apos": 0x0027,
-        "lt": 0x003C,
-        "gt": 0x003E,
-        "nbsp": 0x00A0,
-        "iexcl": 0x00A1,
-        "cent": 0x00A2,
-        "pound": 0x00A3,
-        "curren": 0x00A4,
-        "yen": 0x00A5,
-        "brvbar": 0x00A6,
-        "sect": 0x00A7,
-        "uml": 0x00A8,
-        "copy": 0x00A9,
-        "ordf": 0x00AA,
-        "laquo": 0x00AB,
-        "not": 0x00AC,
-        "shy": 0x00AD,
-        "reg": 0x00AE,
-        "macr": 0x00AF,
-        "deg": 0x00B0,
-        "plusmn": 0x00B1,
-        "sup2": 0x00B2,
-        "sup3": 0x00B3,
-        "acute": 0x00B4,
-        "micro": 0x00B5,
-        "para": 0x00B6,
-        "middot": 0x00B7,
-        "cedil": 0x00B8,
-        "sup1": 0x00B9,
-        "ordm": 0x00BA,
-        "raquo": 0x00BB,
-        "frac14": 0x00BC,
-        "frac12": 0x00BD,
-        "frac34": 0x00BE,
-        "iquest": 0x00BF,
-        "Agrave": 0x00C0,
-        "Aacute": 0x00C1,
-        "Acirc": 0x00C2,
-        "Atilde": 0x00C3,
-        "Auml": 0x00C4,
-        "Aring": 0x00C5,
-        "AElig": 0x00C6,
-        "Ccedil": 0x00C7,
-        "Egrave": 0x00C8,
-        "Eacute": 0x00C9,
-        "Ecirc": 0x00CA,
-        "Euml": 0x00CB,
-        "Igrave": 0x00CC,
-        "Iacute": 0x00CD,
-        "Icirc": 0x00CE,
-        "Iuml": 0x00CF,
-        "ETH": 0x00D0,
-        "Ntilde": 0x00D1,
-        "Ograve": 0x00D2,
-        "Oacute": 0x00D3,
-        "Ocirc": 0x00D4,
-        "Otilde": 0x00D5,
-        "Ouml": 0x00D6,
-        "times": 0x00D7,
-        "Oslash": 0x00D8,
-        "Ugrave": 0x00D9,
-        "Uacute": 0x00DA,
-        "Ucirc": 0x00DB,
-        "Uuml": 0x00DC,
-        "Yacute": 0x00DD,
-        "THORN": 0x00DE,
-        "szlig": 0x00DF,
-        "agrave": 0x00E0,
-        "aacute": 0x00E1,
-        "acirc": 0x00E2,
-        "atilde": 0x00E3,
-        "auml": 0x00E4,
-        "aring": 0x00E5,
-        "aelig": 0x00E6,
-        "ccedil": 0x00E7,
-        "egrave": 0x00E8,
-        "eacute": 0x00E9,
-        "ecirc": 0x00EA,
-        "euml": 0x00EB,
-        "igrave": 0x00EC,
-        "iacute": 0x00ED,
-        "icirc": 0x00EE,
-        "iuml": 0x00EF,
-        "eth": 0x00F0,
-        "ntilde": 0x00F1,
-        "ograve": 0x00F2,
-        "oacute": 0x00F3,
-        "ocirc": 0x00F4,
-        "otilde": 0x00F5,
-        "ouml": 0x00F6,
-        "divide": 0x00F7,
-        "oslash": 0x00F8,
-        "ugrave": 0x00F9,
-        "uacute": 0x00FA,
-        "ucirc": 0x00FB,
-        "uuml": 0x00FC,
-        "yacute": 0x00FD,
-        "thorn": 0x00FE,
-        "yuml": 0x00FF,
-        "OElig": 0x0152,
-        "oelig": 0x0153,
-        "Scaron": 0x0160,
-        "scaron": 0x0161,
-        "Yuml": 0x0178,
-        "fnof": 0x0192,
-        "circ": 0x02C6,
-        "tilde": 0x02DC,
-        "Alpha": 0x0391,
-        "Beta": 0x0392,
-        "Gamma": 0x0393,
-        "Delta": 0x0394,
-        "Epsilon": 0x0395,
-        "Zeta": 0x0396,
-        "Eta": 0x0397,
-        "Theta": 0x0398,
-        "Iota": 0x0399,
-        "Kappa": 0x039A,
-        "Lambda": 0x039B,
-        "Mu": 0x039C,
-        "Nu": 0x039D,
-        "Xi": 0x039E,
-        "Omicron": 0x039F,
-        "Pi": 0x03A0,
-        "Rho": 0x03A1,
-        "Sigma": 0x03A3,
-        "Tau": 0x03A4,
-        "Upsilon": 0x03A5,
-        "Phi": 0x03A6,
-        "Chi": 0x03A7,
-        "Psi": 0x03A8,
-        "Omega": 0x03A9,
-        "alpha": 0x03B1,
-        "beta": 0x03B2,
-        "gamma": 0x03B3,
-        "delta": 0x03B4,
-        "epsilon": 0x03B5,
-        "zeta": 0x03B6,
-        "eta": 0x03B7,
-        "theta": 0x03B8,
-        "iota": 0x03B9,
-        "kappa": 0x03BA,
-        "lambda": 0x03BB,
-        "mu": 0x03BC,
-        "nu": 0x03BD,
-        "xi": 0x03BE,
-        "omicron": 0x03BF,
-        "pi": 0x03C0,
-        "rho": 0x03C1,
-        "sigmaf": 0x03C2,
-        "sigma": 0x03C3,
-        "tau": 0x03C4,
-        "upsilon": 0x03C5,
-        "phi": 0x03C6,
-        "chi": 0x03C7,
-        "psi": 0x03C8,
-        "omega": 0x03C9,
-        "thetasym": 0x03D1,
-        "upsih": 0x03D2,
-        "piv": 0x03D6,
-        "ensp": 0x2002,
-        "emsp": 0x2003,
-        "thinsp": 0x2009,
-        "zwnj": 0x200C,
-        "zwj": 0x200D,
-        "lrm": 0x200E,
-        "rlm": 0x200F,
-        "ndash": 0x2013,
-        "mdash": 0x2014,
-        "lsquo": 0x2018,
-        "rsquo": 0x2019,
-        "sbquo": 0x201A,
-        "ldquo": 0x201C,
-        "rdquo": 0x201D,
-        "bdquo": 0x201E,
-        "dagger": 0x2020,
-        "Dagger": 0x2021,
-        "bull": 0x2022,
-        "hellip": 0x2026,
-        "permil": 0x2030,
-        "prime": 0x2032,
-        "Prime": 0x2033,
-        "lsaquo": 0x2039,
-        "rsaquo": 0x203A,
-        "oline": 0x203E,
-        "frasl": 0x2044,
-        "euro": 0x20AC,
-        "image": 0x2111,
-        "weierp": 0x2118,
-        "real": 0x211C,
-        "trade": 0x2122,
-        "alefsym": 0x2135,
-        "larr": 0x2190,
-        "uarr": 0x2191,
-        "rarr": 0x2192,
-        "darr": 0x2193,
-        "harr": 0x2194,
-        "crarr": 0x21B5,
-        "lArr": 0x21D0,
-        "uArr": 0x21D1,
-        "rArr": 0x21D2,
-        "dArr": 0x21D3,
-        "hArr": 0x21D4,
-        "forall": 0x2200,
-        "part": 0x2202,
-        "exist": 0x2203,
-        "empty": 0x2205,
-        "nabla": 0x2207,
-        "isin": 0x2208,
-        "notin": 0x2209,
-        "ni": 0x220B,
-        "prod": 0x220F,
-        "sum": 0x2211,
-        "minus": 0x2212,
-        "lowast": 0x2217,
-        "radic": 0x221A,
-        "prop": 0x221D,
-        "infin": 0x221E,
-        "ang": 0x2220,
-        "and": 0x2227,
-        "or": 0x2228,
-        "cap": 0x2229,
-        "cup": 0x222A,
-        "int": 0x222B,
-        "there4": 0x2234,
-        "sim": 0x223C,
-        "cong": 0x2245,
-        "asymp": 0x2248,
-        "ne": 0x2260,
-        "equiv": 0x2261,
-        "le": 0x2264,
-        "ge": 0x2265,
-        "sub": 0x2282,
-        "sup": 0x2283,
-        "nsub": 0x2284,
-        "sube": 0x2286,
-        "supe": 0x2287,
-        "oplus": 0x2295,
-        "otimes": 0x2297,
-        "perp": 0x22A5,
-        "sdot": 0x22C5,
-        "lceil": 0x2308,
-        "rceil": 0x2309,
-        "lfloor": 0x230A,
-        "rfloor": 0x230B,
-        "lang": 0x2329,
-        "rang": 0x232A,
-        "loz": 0x25CA,
-        "spades": 0x2660,
-        "clubs": 0x2663,
-        "hearts": 0x2665,
-        "diams": 0x2666
-    });
-
     // Flags enum to track count of temp variables and a few dedicated names
     const enum TempFlags {
         Auto      = 0x00000000,  // No preferred name
@@ -287,56 +13,11 @@ namespace ts {
         _i        = 0x10000000,  // Use/preference flag for '_i'
     }
 
-    const enum CopyDirection {
-        ToOriginal,
-        ToOutParameter
-    }
-
-    /**
-     * If loop contains block scoped binding captured in some function then loop body is converted to a function.
-     * Lexical bindings declared in loop initializer will be passed into the loop body function as parameters,
-     * however if this binding is modified inside the body - this new value should be propagated back to the original binding.
-     * This is done by declaring new variable (out parameter holder) outside of the loop for every binding that is reassigned inside the body.
-     * On every iteration this variable is initialized with value of corresponding binding.
-     * At every point where control flow leaves the loop either explicitly (break/continue) or implicitly (at the end of loop body)
-     * we copy the value inside the loop to the out parameter holder.
-     *
-     * for (let x;;) {
-     *     let a = 1;
-     *     let b = () => a;
-     *     x++
-     *     if (...) break;
-     *     ...
-     * }
-     *
-     * will be converted to
-     *
-     * var out_x;
-     * var loop = function(x) {
-     *     var a = 1;
-     *     var b = function() { return a; }
-     *     x++;
-     *     if (...) return out_x = x, "break";
-     *     ...
-     *     out_x = x;
-     * }
-     * for (var x;;) {
-     *     out_x = x;
-     *     var state = loop(x);
-     *     x = out_x;
-     *     if (state === "break") break;
-     * }
-     *
-     * NOTE: values to out parameters are not copies if loop is abrupted with 'return' - in this case this will end the entire enclosing function
-     * so nobody can observe this new value.
-     */
-    interface LoopOutParameter {
-        originalName: Identifier;
-        outParamName: string;
-    }
-
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile): EmitResult {
+        const delimiters = createDelimiterMap();
+        const brackets = createBracketsMap();
+
         // emit output for the __extends helper function
         const extendsHelper = `
 var __extends = (this && this.__extends) || function (d, b) {
@@ -345,6 +26,9 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };`;
 
+        // Emit output for the __assign helper function.
+        // This is typically used for JSX spread attributes,
+        // and can be used for object literal spread properties.
         const assignHelper = `
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -376,6 +60,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };`;
 
+        // emit output for the __awaiter helper function
         const awaiterHelper = `
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -386,17 +71,146 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };`;
 
+        const generatorHelper = `
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};`;
+
+        // emit output for the __export helper function
+        const exportStarHelper = `
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}`;
+
+        // emit output for the UMD helper function.
+        const umdHelper = `
+(function (dependencies, factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(dependencies, factory);
+    }
+})`;
+
+        const superHelper = `
+const _super = name => super[name];`;
+
+        const advancedSuperHelper = `
+const _super = (function (geti, seti) {
+    const cache = Object.create(null);
+    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
+})(name => super[name], (name, value) => super[name] = value);`;
+
         const compilerOptions = host.getCompilerOptions();
         const languageVersion = getEmitScriptTarget(compilerOptions);
-        const modulekind = getEmitModuleKind(compilerOptions);
+        const moduleKind = getEmitModuleKind(compilerOptions);
         const sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
         const emittedFilesList: string[] = compilerOptions.listEmittedFiles ? [] : undefined;
         const emitterDiagnostics = createDiagnosticCollection();
-        let emitSkipped = false;
         const newLine = host.getNewLine();
+        const transformers = getTransformers(compilerOptions);
+        const writer = createTextWriter(newLine);
+        const {
+            write,
+            writeLine,
+            increaseIndent,
+            decreaseIndent
+        } = writer;
 
-        const emitJavaScript = createFileEmitter();
-        forEachExpectedEmitFile(host, emitFile, targetSourceFile);
+        const sourceMap = createSourceMapWriter(host, writer);
+        const {
+            emitStart,
+            emitEnd,
+            emitTokenStart,
+            emitTokenEnd
+        } = sourceMap;
+
+        const comments = createCommentWriter(host, writer, sourceMap);
+        const {
+            emitNodeWithComments,
+            emitBodyWithDetachedComments,
+            emitTrailingCommentsOfPosition
+        } = comments;
+
+        let nodeIdToGeneratedName: string[];
+        let autoGeneratedIdToGeneratedName: string[];
+        let generatedNameSet: Map<string>;
+        let tempFlags: TempFlags;
+        let currentSourceFile: SourceFile;
+        let currentText: string;
+        let currentFileIdentifiers: Map<string>;
+        let extendsEmitted: boolean;
+        let assignEmitted: boolean;
+        let decorateEmitted: boolean;
+        let paramEmitted: boolean;
+        let awaiterEmitted: boolean;
+        let isOwnFileEmit: boolean;
+        let emitSkipped = false;
+
+        performance.mark("beforeTransform");
+
+        // Transform the source files
+        const transformed = transformFiles(
+            resolver,
+            host,
+            getSourceFilesToEmit(host, targetSourceFile),
+            transformers);
+
+        performance.measure("transformTime", "beforeTransform");
+
+        // Extract helpers from the result
+        const {
+            getTokenSourceMapRange,
+            isSubstitutionEnabled,
+            isEmitNotificationEnabled,
+            onSubstituteNode,
+            onEmitNode
+        } = transformed;
+
+        performance.mark("beforePrint");
+
+        // Emit each output file
+        forEachTransformedEmitFile(host, transformed.getSourceFiles(), emitFile);
+
+        // Clean up after transformation
+        transformed.dispose();
+
+        performance.measure("printTime", "beforePrint");
 
         return {
             emitSkipped,
@@ -405,7981 +219,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             sourceMaps: sourceMapDataList
         };
 
-        function isUniqueLocalName(name: string, container: Node): boolean {
-            for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
-                if (node.locals && name in node.locals) {
-                    // We conservatively include alias symbols to cover cases where they're emitted as locals
-                    if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        interface ConvertedLoopState {
-            /*
-             * set of labels that occurred inside the converted loop
-             * used to determine if labeled jump can be emitted as is or it should be dispatched to calling code
-             */
-            labels?: Map<string>;
-            /*
-             * collection of labeled jumps that transfer control outside the converted loop.
-             * maps store association 'label -> labelMarker' where
-             * - label - value of label as it appear in code
-             * - label marker - return value that should be interpreted by calling code as 'jump to <label>'
-             */
-            labeledNonLocalBreaks?: Map<string>;
-            labeledNonLocalContinues?: Map<string>;
-
-            /*
-             * set of non-labeled jumps that transfer control outside the converted loop
-             * used to emit dispatching logic in the caller of converted loop
-             */
-            nonLocalJumps?: Jump;
-
-            /*
-             * set of non-labeled jumps that should be interpreted as local
-             * i.e. if converted loop contains normal loop or switch statement then inside this loop break should be treated as local jump
-             */
-            allowedNonLabeledJumps?: Jump;
-
-            /*
-             * alias for 'arguments' object from the calling code stack frame
-             * i.e.
-             * for (let x;;) <statement that captures x in closure and uses 'arguments'>
-             * should be converted to
-             * var loop = function(x) { <code where 'arguments' is replaced with 'arguments_1'> }
-             * var arguments_1 = arguments
-             * for (var x;;) loop(x);
-             * otherwise semantics of the code will be different since 'arguments' inside converted loop body
-             * will refer to function that holds converted loop.
-             * This value is set on demand.
-             */
-            argumentsName?: string;
-
-            /*
-             * alias for 'this' from the calling code stack frame in case if this was used inside the converted loop
-             */
-            thisName?: string;
-
-            /*
-             * list of non-block scoped variable declarations that appear inside converted loop
-             * such variable declarations should be moved outside the loop body
-             * for (let x;;) {
-             *     var y = 1;
-             *     ...
-             * }
-             * should be converted to
-             * var loop = function(x) {
-             *    y = 1;
-             *    ...
-             * }
-             * var y;
-             * for (var x;;) loop(x);
-             */
-            hoistedLocalVariables?: Identifier[];
-
-            /**
-             * List of loop out parameters - detailed descripion can be found in the comment to LoopOutParameter
-             */
-            loopOutParameters?: LoopOutParameter[];
-        }
-
-        function setLabeledJump(state: ConvertedLoopState, isBreak: boolean, labelText: string, labelMarker: string): void {
-            if (isBreak) {
-                if (!state.labeledNonLocalBreaks) {
-                    state.labeledNonLocalBreaks = createMap<string>();
-                }
-                state.labeledNonLocalBreaks[labelText] = labelMarker;
-            }
-            else {
-                if (!state.labeledNonLocalContinues) {
-                    state.labeledNonLocalContinues = createMap<string>();
-                }
-                state.labeledNonLocalContinues[labelText] = labelMarker;
-            }
-        }
-
-        function hoistVariableDeclarationFromLoop(state: ConvertedLoopState, declaration: VariableDeclaration): void {
-            if (!state.hoistedLocalVariables) {
-                state.hoistedLocalVariables = [];
-            }
-
-            visit(declaration.name);
-
-            function visit(node: Identifier | BindingPattern) {
-                if (node.kind === SyntaxKind.Identifier) {
-                    state.hoistedLocalVariables.push((<Identifier>node));
-                }
-                else {
-                    for (const element of (<BindingPattern>node).elements) {
-                        visit(element.name);
-                    }
-                }
-            }
-        }
-
-        function createFileEmitter(): (jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) => void {
-            const writer = createTextWriter(newLine);
-            const { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer;
-
-            let sourceMap = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? createSourceMapWriter(host, writer) : getNullSourceMapWriter();
-            let { setSourceFile, emitStart, emitEnd, emitPos } = sourceMap;
-
-            let currentSourceFile: SourceFile;
-            let currentText: string;
-            let currentLineMap: number[];
-            let currentFileIdentifiers: Map<string>;
-            let renamedDependencies: Map<string>;
-            let isEs6Module: boolean;
-            let isCurrentFileExternalModule: boolean;
-
-            // name of an exporter function if file is a System external module
-            // System.register([...], function (<exporter>) {...})
-            // exporting in System modules looks like:
-            // export var x; ... x = 1
-            // =>
-            // var x;... exporter("x", x = 1)
-            let exportFunctionForFile: string;
-            let contextObjectForFile: string;
-
-            let generatedNameSet: Map<string>;
-            let nodeToGeneratedName: string[];
-            let computedPropertyNamesToGeneratedNames: string[];
-            let decoratedClassAliases: string[];
-
-            let convertedLoopState: ConvertedLoopState;
-
-            let extendsEmitted: boolean;
-            let assignEmitted: boolean;
-            let decorateEmitted: boolean;
-            let paramEmitted: boolean;
-            let awaiterEmitted: boolean;
-            let tempFlags: TempFlags = 0;
-            let tempVariables: Identifier[];
-            let tempParameters: Identifier[];
-            let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
-            let exportSpecifiers: Map<ExportSpecifier[]>;
-            let exportEquals: ExportAssignment;
-            let hasExportStarsToExportValues: boolean;
-
-            let detachedCommentsInfo: { nodePos: number; detachedCommentEndPos: number }[];
-
-            /** Sourcemap data that will get encoded */
-            let sourceMapData: SourceMapData;
-
-            /** Is the file being emitted into its own file */
-            let isOwnFileEmit: boolean;
-
-            /** If removeComments is true, no leading-comments needed to be emitted **/
-            const emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos: number) { } : emitLeadingCommentsOfPositionWorker;
-
-            const setSourceMapWriterEmit = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? changeSourceMapEmit : function (writer: SourceMapWriter) { };
-
-            const moduleEmitDelegates = createMap<(node: SourceFile, emitRelativePathAsModuleName?: boolean) => void>({
-                [ModuleKind.ES6]: emitES6Module,
-                [ModuleKind.AMD]: emitAMDModule,
-                [ModuleKind.System]: emitSystemModule,
-                [ModuleKind.UMD]: emitUMDModule,
-                [ModuleKind.CommonJS]: emitCommonJSModule,
-            });
-
-            const bundleEmitDelegates = createMap<(node: SourceFile, emitRelativePathAsModuleName?: boolean) => void>({
-                [ModuleKind.ES6]() {},
-                [ModuleKind.AMD]: emitAMDModule,
-                [ModuleKind.System]: emitSystemModule,
-                [ModuleKind.UMD]() {},
-                [ModuleKind.CommonJS]() {},
-            });
-
-            return doEmit;
-
-            function doEmit(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
-                sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
-                generatedNameSet = createMap<string>();
-                nodeToGeneratedName = [];
-                decoratedClassAliases = [];
-                isOwnFileEmit = !isBundledEmit;
-
-                // Emit helpers from all the files
-                if (isBundledEmit && modulekind) {
-                    forEach(sourceFiles, emitEmitHelpers);
-                }
-
-                // Do not call emit directly. It does not set the currentSourceFile.
-                forEach(sourceFiles, emitSourceFile);
-
-                writeLine();
-
-                const sourceMappingURL = sourceMap.getSourceMappingURL();
-                if (sourceMappingURL) {
-                    write(`//# ${"sourceMappingURL"}=${sourceMappingURL}`); // Sometimes tools can sometimes see this line as a source mapping url comment
-                }
-
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
-
-                // reset the state
-                sourceMap.reset();
-                writer.reset();
-                currentSourceFile = undefined;
-                currentText = undefined;
-                currentLineMap = undefined;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                generatedNameSet = undefined;
-                nodeToGeneratedName = undefined;
-                decoratedClassAliases = undefined;
-                computedPropertyNamesToGeneratedNames = undefined;
-                convertedLoopState = undefined;
-                extendsEmitted = false;
-                decorateEmitted = false;
-                paramEmitted = false;
-                awaiterEmitted = false;
-                assignEmitted = false;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = undefined;
-                detachedCommentsInfo = undefined;
-                sourceMapData = undefined;
-                isEs6Module = false;
-                renamedDependencies = undefined;
-                isCurrentFileExternalModule = false;
-            }
-
-            function emitSourceFile(sourceFile: SourceFile): void {
-                currentSourceFile = sourceFile;
-
-                currentText = sourceFile.text;
-                currentLineMap = getLineStarts(sourceFile);
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
-                renamedDependencies = sourceFile.renamedDependencies;
-                currentFileIdentifiers = sourceFile.identifiers;
-                isCurrentFileExternalModule = isExternalModule(sourceFile);
-
-                setSourceFile(sourceFile);
-                emitNodeWithCommentsAndWithoutSourcemap(sourceFile);
-            }
-
-            function isUniqueName(name: string): boolean {
-                return !resolver.hasGlobalName(name) &&
-                    !(name in currentFileIdentifiers) &&
-                    !(name in generatedNameSet);
-            }
-
-            // Return the next available name in the pattern _a ... _z, _0, _1, ...
-            // TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
-            // Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
-            function makeTempVariableName(flags: TempFlags): string {
-                if (flags && !(tempFlags & flags)) {
-                    const name = flags === TempFlags._i ? "_i" : "_n";
-                    if (isUniqueName(name)) {
-                        tempFlags |= flags;
-                        return name;
-                    }
-                }
-                while (true) {
-                    const count = tempFlags & TempFlags.CountMask;
-                    tempFlags++;
-                    // Skip over 'i' and 'n'
-                    if (count !== 8 && count !== 13) {
-                        const name = count < 26 ? "_" + String.fromCharCode(CharacterCodes.a + count) : "_" + (count - 26);
-                        if (isUniqueName(name)) {
-                            return name;
-                        }
-                    }
-                }
-            }
-
-            // Generate a name that is unique within the current file and doesn't conflict with any names
-            // in global scope. The name is formed by adding an '_n' suffix to the specified base name,
-            // where n is a positive integer. Note that names generated by makeTempVariableName and
-            // makeUniqueName are guaranteed to never conflict.
-            function makeUniqueName(baseName: string): string {
-                // Find the first unique 'name_n', where n is a positive number
-                if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
-                    baseName += "_";
-                }
-                let i = 1;
-                while (true) {
-                    const generatedName = baseName + i;
-                    if (isUniqueName(generatedName)) {
-                        return generatedNameSet[generatedName] = generatedName;
-                    }
-                    i++;
-                }
-            }
-
-            function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
-                const name = node.name.text;
-                // Use module/enum name itself if it is unique, otherwise make a unique variation
-                return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
-            }
-
-            function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
-                const expr = getExternalModuleName(node);
-                const baseName = expr.kind === SyntaxKind.StringLiteral ?
-                    escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
-                return makeUniqueName(baseName);
-            }
-
-            function generateNameForExportDefault() {
-                return makeUniqueName("default");
-            }
-
-            function generateNameForClassExpression() {
-                return makeUniqueName("class");
-            }
-
-            function generateNameForNode(node: Node) {
-                switch (node.kind) {
-                    case SyntaxKind.Identifier:
-                        return makeUniqueName((<Identifier>node).text);
-                    case SyntaxKind.ModuleDeclaration:
-                    case SyntaxKind.EnumDeclaration:
-                        return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node);
-                    case SyntaxKind.ImportDeclaration:
-                    case SyntaxKind.ExportDeclaration:
-                        return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
-                    case SyntaxKind.FunctionDeclaration:
-                    case SyntaxKind.ClassDeclaration:
-                    case SyntaxKind.ExportAssignment:
-                        return generateNameForExportDefault();
-                    case SyntaxKind.ClassExpression:
-                        return generateNameForClassExpression();
-                    default:
-                        Debug.fail();
-                }
-            }
-
-            function getGeneratedNameForNode(node: Node) {
-                const id = getNodeId(node);
-                return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = unescapeIdentifier(generateNameForNode(node)));
-            }
-
-            /** Write emitted output to disk */
-            function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean, sourceFiles: SourceFile[]) {
-                if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
-                }
-
-                if (sourceMapDataList) {
-                    sourceMapDataList.push(sourceMap.getSourceMapData());
-                }
-
-                writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
-            }
-
-            // Create a temporary variable with a unique unused name.
-            function createTempVariable(flags: TempFlags): Identifier {
-                const result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-                result.text = makeTempVariableName(flags);
-                return result;
-            }
-
-            function recordTempDeclaration(name: Identifier): void {
-                if (!tempVariables) {
-                    tempVariables = [];
-                }
-                tempVariables.push(name);
-            }
-
-            function createAndRecordTempVariable(flags: TempFlags): Identifier {
-                const temp = createTempVariable(flags);
-                recordTempDeclaration(temp);
-
-                return temp;
-            }
-
-            function emitTempDeclarations(newLine: boolean) {
-                if (tempVariables) {
-                    if (newLine) {
-                        writeLine();
-                    }
-                    else {
-                        write(" ");
-                    }
-                    write("var ");
-                    emitCommaList(tempVariables);
-                    write(";");
-                }
-            }
-
-            /** Emit the text for the given token that comes after startPos
-              * This by default writes the text provided with the given tokenKind
-              * but if optional emitFn callback is provided the text is emitted using the callback instead of default text
-              * @param tokenKind the kind of the token to search and emit
-              * @param startPos the position in the source to start searching for the token
-              * @param emitFn if given will be invoked to emit the text instead of actual token emit */
-            function emitToken(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
-                const tokenStartPos = skipTrivia(currentText, startPos);
-                emitPos(tokenStartPos);
-
-                const tokenString = tokenToString(tokenKind);
-                if (emitFn) {
-                    emitFn();
-                }
-                else {
-                    write(tokenString);
-                }
-
-                const tokenEndPos = tokenStartPos + tokenString.length;
-                emitPos(tokenEndPos);
-                return tokenEndPos;
-            }
-
-            function emitOptional(prefix: string, node: Node) {
-                if (node) {
-                    write(prefix);
-                    emit(node);
-                }
-            }
-
-            function emitParenthesizedIf(node: Node, parenthesized: boolean) {
-                if (parenthesized) {
-                    write("(");
-                }
-                emit(node);
-                if (parenthesized) {
-                    write(")");
-                }
-            }
-
-            function emitLinePreservingList(parent: Node, nodes: NodeArray<Node>, allowTrailingComma: boolean, spacesBetweenBraces: boolean) {
-                Debug.assert(nodes.length > 0);
-
-                increaseIndent();
-
-                if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
-                    if (spacesBetweenBraces) {
-                        write(" ");
-                    }
-                }
-                else {
-                    writeLine();
-                }
-
-                for (let i = 0, n = nodes.length; i < n; i++) {
-                    if (i) {
-                        if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
-                            write(", ");
-                        }
-                        else {
-                            write(",");
-                            writeLine();
-                        }
-                    }
-
-                    emit(nodes[i]);
-                }
-
-                if (nodes.hasTrailingComma && allowTrailingComma) {
-                    write(",");
-                }
-
-                decreaseIndent();
-
-                if (nodeEndPositionsAreOnSameLine(parent, lastOrUndefined(nodes))) {
-                    if (spacesBetweenBraces) {
-                        write(" ");
-                    }
-                }
-                else {
-                    writeLine();
-                }
-            }
-
-            function emitList<TNode extends Node>(nodes: TNode[], start: number, count: number, multiLine: boolean, trailingComma: boolean, leadingComma?: boolean, noTrailingNewLine?: boolean, emitNode?: (node: TNode) => void): number {
-                if (!emitNode) {
-                    emitNode = emit;
-                }
-
-                for (let i = 0; i < count; i++) {
-                    if (multiLine) {
-                        if (i || leadingComma) {
-                            write(",");
-                        }
-                        writeLine();
-                    }
-                    else {
-                        if (i || leadingComma) {
-                            write(", ");
-                        }
-                    }
-                    const node = nodes[start + i];
-                    // This emitting is to make sure we emit following comment properly
-                    //   ...(x, /*comment1*/ y)...
-                    //         ^ => node.pos
-                    // "comment1" is not considered leading comment for "y" but rather
-                    // considered as trailing comment of the previous node.
-                    emitTrailingCommentsOfPosition(node.pos);
-                    emitNode(node);
-                    leadingComma = true;
-                }
-                if (trailingComma) {
-                    write(",");
-                }
-                if (multiLine && !noTrailingNewLine) {
-                    writeLine();
-                }
-
-                return count;
-            }
-
-            function emitCommaList(nodes: Node[]) {
-                if (nodes) {
-                    emitList(nodes, 0, nodes.length, /*multiLine*/ false, /*trailingComma*/ false);
-                }
-            }
-
-            function emitLines(nodes: Node[]) {
-                emitLinesStartingAt(nodes, /*startIndex*/ 0);
-            }
-
-            function emitLinesStartingAt(nodes: Node[], startIndex: number): void {
-                for (let i = startIndex; i < nodes.length; i++) {
-                    writeLine();
-                    emit(nodes[i]);
-                }
-            }
-
-            function isBinaryOrOctalIntegerLiteral(node: LiteralLikeNode, text: string): boolean {
-                if (node.kind === SyntaxKind.NumericLiteral && text.length > 1) {
-                    switch (text.charCodeAt(1)) {
-                        case CharacterCodes.b:
-                        case CharacterCodes.B:
-                        case CharacterCodes.o:
-                        case CharacterCodes.O:
-                            return true;
-                    }
-                }
-
-                return false;
-            }
-
-            function emitLiteral(node: LiteralExpression | TemplateLiteralFragment) {
-                const text = getLiteralText(node);
-
-                if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap) && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
-                    writer.writeLiteral(text);
-                }
-                // For versions below ES6, emit binary & octal literals in their canonical decimal form.
-                else if (languageVersion < ScriptTarget.ES6 && isBinaryOrOctalIntegerLiteral(node, text)) {
-                    write(node.text);
-                }
-                else {
-                    write(text);
-                }
-            }
-
-            function getLiteralText(node: LiteralExpression | TemplateLiteralFragment) {
-                // Any template literal or string literal with an extended escape
-                // (e.g. "\u{0067}") will need to be downleveled as a escaped string literal.
-                if (languageVersion < ScriptTarget.ES6 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-                    return getQuotedEscapedLiteralText('"', node.text, '"');
-                }
-
-                // If we don't need to downlevel and we can reach the original source text using
-                // the node's parent reference, then simply get the text as it was originally written.
-                if (node.parent) {
-                    return getTextOfNodeFromSourceText(currentText, node);
-                }
-
-                // If we can't reach the original source text, use the canonical form if it's a number,
-                // or an escaped quoted form of the original text if it's string-like.
-                switch (node.kind) {
-                    case SyntaxKind.StringLiteral:
-                        return getQuotedEscapedLiteralText('"', node.text, '"');
-                    case SyntaxKind.NoSubstitutionTemplateLiteral:
-                        return getQuotedEscapedLiteralText("`", node.text, "`");
-                    case SyntaxKind.TemplateHead:
-                        return getQuotedEscapedLiteralText("`", node.text, "${");
-                    case SyntaxKind.TemplateMiddle:
-                        return getQuotedEscapedLiteralText("}", node.text, "${");
-                    case SyntaxKind.TemplateTail:
-                        return getQuotedEscapedLiteralText("}", node.text, "`");
-                    case SyntaxKind.NumericLiteral:
-                        return node.text;
-                }
-
-                Debug.fail(`Literal kind '${node.kind}' not accounted for.`);
-            }
-
-            function getQuotedEscapedLiteralText(leftQuote: string, text: string, rightQuote: string) {
-                return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
-            }
-
-            function emitDownlevelRawTemplateLiteral(node: LiteralExpression) {
-                // Find original source text, since we need to emit the raw strings of the tagged template.
-                // The raw strings contain the (escaped) strings of what the user wrote.
-                // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-                let text = getTextOfNodeFromSourceText(currentText, node);
-
-                // text contains the original source, it will also contain quotes ("`"), dollar signs and braces ("${" and "}"),
-                // thus we need to remove those characters.
-                // First template piece starts with "`", others with "}"
-                // Last template piece ends with "`", others with "${"
-                const isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
-                text = text.substring(1, text.length - (isLast ? 1 : 2));
-
-                // Newline normalization:
-                // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's
-                // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for both TV and TRV.
-                text = text.replace(/\r\n?/g, "\n");
-                text = escapeString(text);
-
-                write(`"${text}"`);
-            }
-
-            function emitDownlevelTaggedTemplateArray(node: TaggedTemplateExpression, literalEmitter: (literal: LiteralExpression | TemplateLiteralFragment) => void) {
-                write("[");
-                if (node.template.kind === SyntaxKind.NoSubstitutionTemplateLiteral) {
-                    literalEmitter(<LiteralExpression>node.template);
-                }
-                else {
-                    literalEmitter((<TemplateExpression>node.template).head);
-                    forEach((<TemplateExpression>node.template).templateSpans, (child) => {
-                        write(", ");
-                        literalEmitter(child.literal);
-                    });
-                }
-                write("]");
-            }
-
-            function emitDownlevelTaggedTemplate(node: TaggedTemplateExpression) {
-                const tempVariable = createAndRecordTempVariable(TempFlags.Auto);
-                write("(");
-                emit(tempVariable);
-                write(" = ");
-                emitDownlevelTaggedTemplateArray(node, emit);
-                write(", ");
-
-                emit(tempVariable);
-                write(".raw = ");
-                emitDownlevelTaggedTemplateArray(node, emitDownlevelRawTemplateLiteral);
-                write(", ");
-
-                emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag));
-                write("(");
-                emit(tempVariable);
-
-                // Now we emit the expressions
-                if (node.template.kind === SyntaxKind.TemplateExpression) {
-                    forEach((<TemplateExpression>node.template).templateSpans, templateSpan => {
-                        write(", ");
-                        const needsParens = templateSpan.expression.kind === SyntaxKind.BinaryExpression
-                            && (<BinaryExpression>templateSpan.expression).operatorToken.kind === SyntaxKind.CommaToken;
-                        emitParenthesizedIf(templateSpan.expression, needsParens);
-                    });
-                }
-                write("))");
-            }
-
-            function emitTemplateExpression(node: TemplateExpression): void {
-                // In ES6 mode and above, we can simply emit each portion of a template in order, but in
-                // ES3 & ES5 we must convert the template expression into a series of string concatenations.
-                if (languageVersion >= ScriptTarget.ES6) {
-                    forEachChild(node, emit);
-                    return;
-                }
-
-                const emitOuterParens = isExpression(node.parent)
-                    && templateNeedsParens(node, <Expression>node.parent);
-
-                if (emitOuterParens) {
-                    write("(");
-                }
-
-                let headEmitted = false;
-                if (shouldEmitTemplateHead()) {
-                    emitLiteral(node.head);
-                    headEmitted = true;
-                }
-
-                for (let i = 0, n = node.templateSpans.length; i < n; i++) {
-                    const templateSpan = node.templateSpans[i];
-
-                    // Check if the expression has operands and binds its operands less closely than binary '+'.
-                    // If it does, we need to wrap the expression in parentheses. Otherwise, something like
-                    //    `abc${ 1 << 2 }`
-                    // becomes
-                    //    "abc" + 1 << 2 + ""
-                    // which is really
-                    //    ("abc" + 1) << (2 + "")
-                    // rather than
-                    //    "abc" + (1 << 2) + ""
-                    const needsParens = templateSpan.expression.kind !== SyntaxKind.ParenthesizedExpression
-                        && comparePrecedenceToBinaryPlus(templateSpan.expression) !== Comparison.GreaterThan;
-
-                    if (i > 0 || headEmitted) {
-                        // If this is the first span and the head was not emitted, then this templateSpan's
-                        // expression will be the first to be emitted. Don't emit the preceding ' + ' in that
-                        // case.
-                        write(" + ");
-                    }
-
-                    emitParenthesizedIf(templateSpan.expression, needsParens);
-
-                    // Only emit if the literal is non-empty.
-                    // The binary '+' operator is left-associative, so the first string concatenation
-                    // with the head will force the result up to this point to be a string.
-                    // Emitting a '+ ""' has no semantic effect for middles and tails.
-                    if (templateSpan.literal.text.length !== 0) {
-                        write(" + ");
-                        emitLiteral(templateSpan.literal);
-                    }
-                }
-
-                if (emitOuterParens) {
-                    write(")");
-                }
-
-                function shouldEmitTemplateHead() {
-                    // If this expression has an empty head literal and the first template span has a non-empty
-                    // literal, then emitting the empty head literal is not necessary.
-                    //     `${ foo } and ${ bar }`
-                    // can be emitted as
-                    //     foo + " and " + bar
-                    // This is because it is only required that one of the first two operands in the emit
-                    // output must be a string literal, so that the other operand and all following operands
-                    // are forced into strings.
-                    //
-                    // If the first template span has an empty literal, then the head must still be emitted.
-                    //     `${ foo }${ bar }`
-                    // must still be emitted as
-                    //     "" + foo + bar
-
-                    // There is always atleast one templateSpan in this code path, since
-                    // NoSubstitutionTemplateLiterals are directly emitted via emitLiteral()
-                    Debug.assert(node.templateSpans.length !== 0);
-
-                    return node.head.text.length !== 0 || node.templateSpans[0].literal.text.length === 0;
-                }
-
-                function templateNeedsParens(template: TemplateExpression, parent: Expression) {
-                    switch (parent.kind) {
-                        case SyntaxKind.CallExpression:
-                        case SyntaxKind.NewExpression:
-                            return (<CallExpression>parent).expression === template;
-                        case SyntaxKind.TaggedTemplateExpression:
-                        case SyntaxKind.ParenthesizedExpression:
-                            return false;
-                        default:
-                            return comparePrecedenceToBinaryPlus(parent) !== Comparison.LessThan;
-                    }
-                }
-
-                /**
-                 * Returns whether the expression has lesser, greater,
-                 * or equal precedence to the binary '+' operator
-                 */
-                function comparePrecedenceToBinaryPlus(expression: Expression): Comparison {
-                    // All binary expressions have lower precedence than '+' apart from '*', '/', and '%'
-                    // which have greater precedence and '-' which has equal precedence.
-                    // All unary operators have a higher precedence apart from yield.
-                    // Arrow functions and conditionals have a lower precedence,
-                    // although we convert the former into regular function expressions in ES5 mode,
-                    // and in ES6 mode this function won't get called anyway.
-                    //
-                    // TODO (drosen): Note that we need to account for the upcoming 'yield' and
-                    //                spread ('...') unary operators that are anticipated for ES6.
-                    switch (expression.kind) {
-                        case SyntaxKind.BinaryExpression:
-                            switch ((<BinaryExpression>expression).operatorToken.kind) {
-                                case SyntaxKind.AsteriskToken:
-                                case SyntaxKind.SlashToken:
-                                case SyntaxKind.PercentToken:
-                                    return Comparison.GreaterThan;
-                                case SyntaxKind.PlusToken:
-                                case SyntaxKind.MinusToken:
-                                    return Comparison.EqualTo;
-                                default:
-                                    return Comparison.LessThan;
-                            }
-                        case SyntaxKind.YieldExpression:
-                        case SyntaxKind.ConditionalExpression:
-                            return Comparison.LessThan;
-                        default:
-                            return Comparison.GreaterThan;
-                    }
-                }
-            }
-
-            function emitTemplateSpan(span: TemplateSpan) {
-                emit(span.expression);
-                emit(span.literal);
-            }
-
-            function jsxEmitReact(node: JsxElement | JsxSelfClosingElement) {
-                /// Emit a tag name, which is either '"div"' for lower-cased names, or
-                /// 'Div' for upper-cased or dotted names
-                function emitTagName(name: LeftHandSideExpression) {
-                    if (name.kind === SyntaxKind.Identifier && isIntrinsicJsxName((<Identifier>name).text)) {
-                        write('"');
-                        emit(name);
-                        write('"');
-                    }
-                    else {
-                        emit(name);
-                    }
-                }
-
-                /// Emit an attribute name, which is quoted if it needs to be quoted. Because
-                /// these emit into an object literal property name, we don't need to be worried
-                /// about keywords, just non-identifier characters
-                function emitAttributeName(name: Identifier) {
-                    if (/^[A-Za-z_]\w*$/.test(name.text)) {
-                        emit(name);
-                    }
-                    else {
-                        write('"');
-                        emit(name);
-                        write('"');
-                    }
-                }
-
-                /// Emit an name/value pair for an attribute (e.g. "x: 3")
-                function emitJsxAttribute(node: JsxAttribute) {
-                    emitAttributeName(node.name);
-                    write(": ");
-                    if (node.initializer) {
-                        emit(node.initializer);
-                    }
-                    else {
-                        write("true");
-                    }
-                }
-
-                function emitJsxElement(openingNode: JsxOpeningLikeElement, children?: JsxChild[]) {
-                    const syntheticReactRef = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-                    syntheticReactRef.text = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
-                    syntheticReactRef.parent = openingNode;
-
-                    // Call React.createElement(tag, ...
-                    emitLeadingComments(openingNode);
-                    emitExpressionIdentifier(syntheticReactRef);
-                    write(".createElement(");
-                    emitTagName(openingNode.tagName);
-                    write(", ");
-
-                    // Attribute list
-                    if (openingNode.attributes.length === 0) {
-                        // When there are no attributes, React wants "null"
-                        write("null");
-                    }
-                    else {
-                        // Either emit one big object literal (no spread attribs), or
-                        // a call to the __assign helper
-                        const attrs = openingNode.attributes;
-                        if (forEach(attrs, attr => attr.kind === SyntaxKind.JsxSpreadAttribute)) {
-                            write("__assign(");
-
-                            let haveOpenedObjectLiteral = false;
-                            for (let i = 0; i < attrs.length; i++) {
-                                if (attrs[i].kind === SyntaxKind.JsxSpreadAttribute) {
-                                    // If this is the first argument, we need to emit a {} as the first argument
-                                    if (i === 0) {
-                                        write("{}, ");
-                                    }
-
-                                    if (haveOpenedObjectLiteral) {
-                                        write("}");
-                                        haveOpenedObjectLiteral = false;
-                                    }
-                                    if (i > 0) {
-                                        write(", ");
-                                    }
-                                    emit((<JsxSpreadAttribute>attrs[i]).expression);
-                                }
-                                else {
-                                    Debug.assert(attrs[i].kind === SyntaxKind.JsxAttribute);
-                                    if (haveOpenedObjectLiteral) {
-                                        write(", ");
-                                    }
-                                    else {
-                                        haveOpenedObjectLiteral = true;
-                                        if (i > 0) {
-                                            write(", ");
-                                        }
-                                        write("{");
-                                    }
-                                    emitJsxAttribute(<JsxAttribute>attrs[i]);
-                                }
-                            }
-                            if (haveOpenedObjectLiteral) write("}");
-
-                            write(")"); // closing paren to React.__spread(
-                        }
-                        else {
-                            // One object literal with all the attributes in them
-                            write("{");
-                            for (let i = 0, n = attrs.length; i < n; i++) {
-                                if (i > 0) {
-                                    write(", ");
-                                }
-                                emitJsxAttribute(<JsxAttribute>attrs[i]);
-                            }
-                            write("}");
-                        }
-                    }
-
-                    // Children
-                    if (children) {
-                        let firstChild: JsxChild;
-                        let multipleEmittableChildren = false;
-
-                        for (let i = 0, n = children.length; i < n; i++) {
-                            const jsxChild = children[i];
-
-                            if (isJsxChildEmittable(jsxChild)) {
-                                // we need to decide whether to emit in single line or multiple lines as indented list
-                                // store firstChild reference, if we see another emittable child, then emit accordingly
-                                if (!firstChild) {
-                                    write(", ");
-                                    firstChild = jsxChild;
-                                }
-                                else {
-                                    // more than one emittable child, emit indented list
-                                    if (!multipleEmittableChildren) {
-                                        multipleEmittableChildren = true;
-                                        increaseIndent();
-                                        writeLine();
-                                        emit(firstChild);
-                                    }
-
-                                    write(", ");
-                                    writeLine();
-                                    emit(jsxChild);
-                                }
-                            }
-                        }
-
-                        if (multipleEmittableChildren) {
-                            decreaseIndent();
-                        }
-                        else if (firstChild) {
-                            if (firstChild.kind !== SyntaxKind.JsxElement && firstChild.kind !== SyntaxKind.JsxSelfClosingElement) {
-                                emit(firstChild);
-                            }
-                            else {
-                                // If the only child is jsx element, put it on a new indented line
-                                increaseIndent();
-                                writeLine();
-                                emit(firstChild);
-                                writeLine();
-                                decreaseIndent();
-                            }
-                        }
-                    }
-
-                    // Closing paren
-                    write(")"); // closes "React.createElement("
-                    emitTrailingComments(openingNode);
-                }
-
-                if (node.kind === SyntaxKind.JsxElement) {
-                    emitJsxElement((<JsxElement>node).openingElement, (<JsxElement>node).children);
-                }
-                else {
-                    Debug.assert(node.kind === SyntaxKind.JsxSelfClosingElement);
-                    emitJsxElement(<JsxSelfClosingElement>node);
-                }
-            }
-
-            function jsxEmitPreserve(node: JsxElement | JsxSelfClosingElement) {
-                function emitJsxAttribute(node: JsxAttribute) {
-                    emit(node.name);
-                    if (node.initializer) {
-                        write("=");
-                        emit(node.initializer);
-                    }
-                }
-
-                function emitJsxSpreadAttribute(node: JsxSpreadAttribute) {
-                    write("{...");
-                    emit(node.expression);
-                    write("}");
-                }
-
-                function emitAttributes(attribs: NodeArray<JsxAttribute | JsxSpreadAttribute>) {
-                    for (let i = 0, n = attribs.length; i < n; i++) {
-                        if (i > 0) {
-                            write(" ");
-                        }
-
-                        if (attribs[i].kind === SyntaxKind.JsxSpreadAttribute) {
-                            emitJsxSpreadAttribute(<JsxSpreadAttribute>attribs[i]);
-                        }
-                        else {
-                            Debug.assert(attribs[i].kind === SyntaxKind.JsxAttribute);
-                            emitJsxAttribute(<JsxAttribute>attribs[i]);
-                        }
-                    }
-                }
-
-                function emitJsxOpeningOrSelfClosingElement(node: JsxOpeningElement | JsxSelfClosingElement) {
-                    write("<");
-                    emit(node.tagName);
-                    if (node.attributes.length > 0 || (node.kind === SyntaxKind.JsxSelfClosingElement)) {
-                        write(" ");
-                    }
-
-                    emitAttributes(node.attributes);
-
-                    if (node.kind === SyntaxKind.JsxSelfClosingElement) {
-                        write("/>");
-                    }
-                    else {
-                        write(">");
-                    }
-                }
-
-                function emitJsxClosingElement(node: JsxClosingElement) {
-                    write("</");
-                    emit(node.tagName);
-                    write(">");
-                }
-
-                function emitJsxElement(node: JsxElement) {
-                    emitJsxOpeningOrSelfClosingElement(node.openingElement);
-
-                    for (let i = 0, n = node.children.length; i < n; i++) {
-                        emit(node.children[i]);
-                    }
-
-                    emitJsxClosingElement(node.closingElement);
-                }
-
-                if (node.kind === SyntaxKind.JsxElement) {
-                    emitJsxElement(<JsxElement>node);
-                }
-                else {
-                    Debug.assert(node.kind === SyntaxKind.JsxSelfClosingElement);
-                    emitJsxOpeningOrSelfClosingElement(<JsxSelfClosingElement>node);
-                }
-            }
-
-            // This function specifically handles numeric/string literals for enum and accessor 'identifiers'.
-            // In a sense, it does not actually emit identifiers as much as it declares a name for a specific property.
-            // For example, this is utilized when feeding in a result to Object.defineProperty.
-            function emitExpressionForPropertyName(node: DeclarationName) {
-                Debug.assert(node.kind !== SyntaxKind.BindingElement);
-
-                if (node.kind === SyntaxKind.StringLiteral) {
-                    emitLiteral(<LiteralExpression>node);
-                }
-                else if (node.kind === SyntaxKind.ComputedPropertyName) {
-                    // if this is a decorated computed property, we will need to capture the result
-                    // of the property expression so that we can apply decorators later. This is to ensure
-                    // we don't introduce unintended side effects:
-                    //
-                    //   class C {
-                    //     [_a = x]() { }
-                    //   }
-                    //
-                    // The emit for the decorated computed property decorator is:
-                    //
-                    //   __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a));
-                    //
-                    if (nodeIsDecorated(node.parent)) {
-                        if (!computedPropertyNamesToGeneratedNames) {
-                            computedPropertyNamesToGeneratedNames = [];
-                        }
-
-                        let generatedName = computedPropertyNamesToGeneratedNames[getNodeId(node)];
-                        if (generatedName) {
-                            // we have already generated a variable for this node, write that value instead.
-                            write(generatedName);
-                            return;
-                        }
-
-                        generatedName = createAndRecordTempVariable(TempFlags.Auto).text;
-                        computedPropertyNamesToGeneratedNames[getNodeId(node)] = generatedName;
-                        write(generatedName);
-                        write(" = ");
-                    }
-
-                    emit((<ComputedPropertyName>node).expression);
-                }
-                else {
-                    write('"');
-
-                    if (node.kind === SyntaxKind.NumericLiteral) {
-                        write((<LiteralExpression>node).text);
-                    }
-                    else {
-                        writeTextOfNode(currentText, node);
-                    }
-
-                    write('"');
-                }
-            }
-
-            function isExpressionIdentifier(node: Node): boolean {
-                const parent = node.parent;
-                switch (parent.kind) {
-                    case SyntaxKind.ArrayLiteralExpression:
-                    case SyntaxKind.AsExpression:
-                    case SyntaxKind.AwaitExpression:
-                    case SyntaxKind.BinaryExpression:
-                    case SyntaxKind.CallExpression:
-                    case SyntaxKind.CaseClause:
-                    case SyntaxKind.ComputedPropertyName:
-                    case SyntaxKind.ConditionalExpression:
-                    case SyntaxKind.Decorator:
-                    case SyntaxKind.DeleteExpression:
-                    case SyntaxKind.DoStatement:
-                    case SyntaxKind.ElementAccessExpression:
-                    case SyntaxKind.ExportAssignment:
-                    case SyntaxKind.ExpressionStatement:
-                    case SyntaxKind.ExpressionWithTypeArguments:
-                    case SyntaxKind.ForStatement:
-                    case SyntaxKind.ForInStatement:
-                    case SyntaxKind.ForOfStatement:
-                    case SyntaxKind.IfStatement:
-                    case SyntaxKind.JsxClosingElement:
-                    case SyntaxKind.JsxSelfClosingElement:
-                    case SyntaxKind.JsxOpeningElement:
-                    case SyntaxKind.JsxSpreadAttribute:
-                    case SyntaxKind.JsxExpression:
-                    case SyntaxKind.NewExpression:
-                    case SyntaxKind.NonNullExpression:
-                    case SyntaxKind.ParenthesizedExpression:
-                    case SyntaxKind.PostfixUnaryExpression:
-                    case SyntaxKind.PrefixUnaryExpression:
-                    case SyntaxKind.ReturnStatement:
-                    case SyntaxKind.ShorthandPropertyAssignment:
-                    case SyntaxKind.SpreadElementExpression:
-                    case SyntaxKind.SwitchStatement:
-                    case SyntaxKind.TaggedTemplateExpression:
-                    case SyntaxKind.TemplateSpan:
-                    case SyntaxKind.ThrowStatement:
-                    case SyntaxKind.TypeAssertionExpression:
-                    case SyntaxKind.TypeOfExpression:
-                    case SyntaxKind.VoidExpression:
-                    case SyntaxKind.WhileStatement:
-                    case SyntaxKind.WithStatement:
-                    case SyntaxKind.YieldExpression:
-                        return true;
-                    case SyntaxKind.BindingElement:
-                    case SyntaxKind.EnumMember:
-                    case SyntaxKind.Parameter:
-                    case SyntaxKind.PropertyAssignment:
-                    case SyntaxKind.PropertyDeclaration:
-                    case SyntaxKind.VariableDeclaration:
-                        return (<BindingElement | EnumMember | ParameterDeclaration | PropertyAssignment | PropertyDeclaration | VariableDeclaration>parent).initializer === node;
-                    case SyntaxKind.PropertyAccessExpression:
-                        return (<ExpressionStatement>parent).expression === node;
-                    case SyntaxKind.ArrowFunction:
-                    case SyntaxKind.FunctionExpression:
-                        return (<FunctionLikeDeclaration>parent).body === node;
-                    case SyntaxKind.ImportEqualsDeclaration:
-                        return (<ImportEqualsDeclaration>parent).moduleReference === node;
-                    case SyntaxKind.QualifiedName:
-                        return (<QualifiedName>parent).left === node;
-                }
-                return false;
-            }
-
-            function emitExpressionIdentifier(node: Identifier) {
-                const container = resolver.getReferencedExportContainer(node);
-                if (container) {
-                    if (container.kind === SyntaxKind.SourceFile) {
-                        // Identifier references module export
-                        if (modulekind !== ModuleKind.ES6 && modulekind !== ModuleKind.System) {
-                            write("exports.");
-                        }
-                    }
-                    else {
-                        // Identifier references namespace export
-                        write(getGeneratedNameForNode(container));
-                        write(".");
-                    }
-                }
-                else {
-                    if (modulekind !== ModuleKind.ES6) {
-                        const declaration = resolver.getReferencedImportDeclaration(node);
-                        if (declaration) {
-                            if (declaration.kind === SyntaxKind.ImportClause) {
-                                // Identifier references default import
-                                write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent));
-                                write(languageVersion === ScriptTarget.ES3 ? '["default"]' : ".default");
-                                return;
-                            }
-                            else if (declaration.kind === SyntaxKind.ImportSpecifier) {
-                                // Identifier references named import
-                                write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent.parent.parent));
-                                const name =  (<ImportSpecifier>declaration).propertyName || (<ImportSpecifier>declaration).name;
-                                const identifier = getTextOfNodeFromSourceText(currentText, name);
-                                if (languageVersion === ScriptTarget.ES3 && identifier === "default") {
-                                    write('["default"]');
-                                }
-                                else {
-                                    write(".");
-                                    write(identifier);
-                                }
-                                return;
-                            }
-                        }
-                    }
-
-                    if (languageVersion < ScriptTarget.ES6) {
-                        const declaration = resolver.getReferencedDeclarationWithCollidingName(node);
-                        if (declaration) {
-                            write(getGeneratedNameForNode(declaration.name));
-                            return;
-                        }
-                    }
-                    else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.BodyScopedClassBinding) {
-                        // Due to the emit for class decorators, any reference to the class from inside of the class body
-                        // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
-                        // behavior of class names in ES6.
-                        const declaration = resolver.getReferencedValueDeclaration(node);
-                        if (declaration) {
-                            const classAlias = decoratedClassAliases[getNodeId(declaration)];
-                            if (classAlias !== undefined) {
-                                write(classAlias);
-                                return;
-                            }
-                        }
-                    }
-                }
-
-                if (nodeIsSynthesized(node)) {
-                    write(node.text);
-                }
-                else {
-                    writeTextOfNode(currentText, node);
-                }
-            }
-
-            function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node: Identifier) {
-                if (languageVersion < ScriptTarget.ES6) {
-                    const parent = node.parent;
-                    switch (parent.kind) {
-                        case SyntaxKind.BindingElement:
-                        case SyntaxKind.ClassDeclaration:
-                        case SyntaxKind.EnumDeclaration:
-                        case SyntaxKind.VariableDeclaration:
-                            return (<Declaration>parent).name === node && resolver.isDeclarationWithCollidingName(<Declaration>parent);
-                    }
-                }
-                return false;
-            }
-
-            function getClassExpressionInPropertyAccessInStaticPropertyDeclaration(node: Identifier) {
-                if (languageVersion >= ScriptTarget.ES6) {
-                    let parent = node.parent;
-                    if (parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>parent).expression === node) {
-                        parent = parent.parent;
-                        while (parent && parent.kind !== SyntaxKind.PropertyDeclaration) {
-                            parent = parent.parent;
-                        }
-                        return parent && parent.kind === SyntaxKind.PropertyDeclaration && (parent.flags & NodeFlags.Static) !== 0 &&
-                            parent.parent.kind === SyntaxKind.ClassExpression ? parent.parent : undefined;
-                    }
-                }
-                return undefined;
-            }
-
-            function emitIdentifier(node: Identifier) {
-                if (convertedLoopState) {
-                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
-                        // in converted loop body arguments cannot be used directly.
-                        const name = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
-                        write(name);
-                        return;
-                    }
-                }
-
-                if (!node.parent) {
-                    write(node.text);
-                }
-                else if (isExpressionIdentifier(node)) {
-                    const classExpression = getClassExpressionInPropertyAccessInStaticPropertyDeclaration(node);
-                    if (classExpression) {
-                        const declaration = resolver.getReferencedValueDeclaration(node);
-                        if (declaration === classExpression) {
-                            write(getGeneratedNameForNode(declaration.name));
-                            return;
-                        }
-                    }
-                    emitExpressionIdentifier(node);
-                }
-                else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) {
-                    write(getGeneratedNameForNode(node));
-                }
-                else if (nodeIsSynthesized(node)) {
-                    write(node.text);
-                }
-                else {
-                    writeTextOfNode(currentText, node);
-                }
-            }
-
-            function emitThis(node: Node) {
-                if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LexicalThis) {
-                    write("_this");
-                }
-                else if (convertedLoopState) {
-                    write(convertedLoopState.thisName || (convertedLoopState.thisName = makeUniqueName("this")));
-                }
-                else {
-                    write("this");
-                }
-            }
-
-            function emitSuper(node: Node) {
-                if (languageVersion >= ScriptTarget.ES6) {
-                    write("super");
-                }
-                else {
-                    const flags = resolver.getNodeCheckFlags(node);
-                    if (flags & NodeCheckFlags.SuperInstance) {
-                        write("_super.prototype");
-                    }
-                    else {
-                        write("_super");
-                    }
-                }
-            }
-
-            function emitObjectBindingPattern(node: BindingPattern) {
-                write("{ ");
-                const elements = node.elements;
-                emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
-                write(" }");
-            }
-
-            function emitArrayBindingPattern(node: BindingPattern) {
-                write("[");
-                const elements = node.elements;
-                emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
-                write("]");
-            }
-
-            function emitBindingElement(node: BindingElement) {
-                if (node.propertyName) {
-                    emit(node.propertyName);
-                    write(": ");
-                }
-                if (node.dotDotDotToken) {
-                    write("...");
-                }
-                if (isBindingPattern(node.name)) {
-                    emit(node.name);
-                }
-                else {
-                    emitModuleMemberName(node);
-                }
-                emitOptional(" = ", node.initializer);
-            }
-
-            function emitSpreadElementExpression(node: SpreadElementExpression) {
-                write("...");
-                emit((<SpreadElementExpression>node).expression);
-            }
-
-            function emitYieldExpression(node: YieldExpression) {
-                write(tokenToString(SyntaxKind.YieldKeyword));
-                if (node.asteriskToken) {
-                    write("*");
-                }
-                if (node.expression) {
-                    write(" ");
-                    emit(node.expression);
-                }
-            }
-
-            function emitAwaitExpression(node: AwaitExpression) {
-                const needsParenthesis = needsParenthesisForAwaitExpressionAsYield(node);
-                if (needsParenthesis) {
-                    write("(");
-                }
-                write(tokenToString(SyntaxKind.YieldKeyword));
-                write(" ");
-                emit(node.expression);
-                if (needsParenthesis) {
-                    write(")");
-                }
-            }
-
-            function needsParenthesisForAwaitExpressionAsYield(node: AwaitExpression) {
-                if (node.parent.kind === SyntaxKind.BinaryExpression && !isAssignmentOperator((<BinaryExpression>node.parent).operatorToken.kind)) {
-                    return true;
-                }
-                else if (node.parent.kind === SyntaxKind.ConditionalExpression && (<ConditionalExpression>node.parent).condition === node) {
-                    return true;
-                }
-                else if (node.parent.kind === SyntaxKind.PrefixUnaryExpression || node.parent.kind === SyntaxKind.DeleteExpression ||
-                    node.parent.kind === SyntaxKind.TypeOfExpression || node.parent.kind === SyntaxKind.VoidExpression) {
-                    return true;
-                }
-
-                return false;
-            }
-
-            function needsParenthesisForPropertyAccessOrInvocation(node: Expression) {
-                switch (node.kind) {
-                    case SyntaxKind.Identifier:
-                    case SyntaxKind.ArrayLiteralExpression:
-                    case SyntaxKind.PropertyAccessExpression:
-                    case SyntaxKind.ElementAccessExpression:
-                    case SyntaxKind.CallExpression:
-                    case SyntaxKind.ParenthesizedExpression:
-                        // This list is not exhaustive and only includes those cases that are relevant
-                        // to the check in emitArrayLiteral. More cases can be added as needed.
-                        return false;
-                }
-                return true;
-            }
-
-            function emitListWithSpread(elements: Expression[], needsUniqueCopy: boolean, multiLine: boolean, trailingComma: boolean, useConcat: boolean) {
-                let pos = 0;
-                let group = 0;
-                const length = elements.length;
-                while (pos < length) {
-                    // Emit using the pattern <group0>.concat(<group1>, <group2>, ...)
-                    if (group === 1 && useConcat) {
-                        write(".concat(");
-                    }
-                    else if (group > 0) {
-                        write(", ");
-                    }
-                    let e = elements[pos];
-                    if (e.kind === SyntaxKind.SpreadElementExpression) {
-                        e = (<SpreadElementExpression>e).expression;
-                        emitParenthesizedIf(e, /*parenthesized*/ group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
-                        pos++;
-                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== SyntaxKind.ArrayLiteralExpression) {
-                            write(".slice()");
-                        }
-                    }
-                    else {
-                        let i = pos;
-                        while (i < length && elements[i].kind !== SyntaxKind.SpreadElementExpression) {
-                            i++;
-                        }
-                        write("[");
-                        if (multiLine) {
-                            increaseIndent();
-                        }
-                        emitList(elements, pos, i - pos, multiLine, trailingComma && i === length);
-                        if (multiLine) {
-                            decreaseIndent();
-                        }
-                        write("]");
-                        pos = i;
-                    }
-                    group++;
-                }
-                if (group > 1) {
-                    if (useConcat) {
-                        write(")");
-                    }
-                }
-            }
-
-            function isSpreadElementExpression(node: Node) {
-                return node.kind === SyntaxKind.SpreadElementExpression;
-            }
-
-            function emitArrayLiteral(node: ArrayLiteralExpression) {
-                const elements = node.elements;
-                if (elements.length === 0) {
-                    write("[]");
-                }
-                else if (languageVersion >= ScriptTarget.ES6 || !forEach(elements, isSpreadElementExpression)) {
-                    write("[");
-                    emitLinePreservingList(node, node.elements, elements.hasTrailingComma, /*spacesBetweenBraces*/ false);
-                    write("]");
-                }
-                else {
-                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ node.multiLine,
-                        /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true);
-                }
-            }
-
-            function emitObjectLiteralBody(node: ObjectLiteralExpression, numElements: number): void {
-                if (numElements === 0) {
-                    write("{}");
-                    return;
-                }
-
-                write("{");
-
-                if (numElements > 0) {
-                    const properties = node.properties;
-
-                    // If we are not doing a downlevel transformation for object literals,
-                    // then try to preserve the original shape of the object literal.
-                    // Otherwise just try to preserve the formatting.
-                    if (numElements === properties.length) {
-                        emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= ScriptTarget.ES5, /*spacesBetweenBraces*/ true);
-                    }
-                    else {
-                        const multiLine = node.multiLine;
-                        if (!multiLine) {
-                            write(" ");
-                        }
-                        else {
-                            increaseIndent();
-                        }
-
-                        emitList(properties, 0, numElements, /*multiLine*/ multiLine, /*trailingComma*/ false);
-
-                        if (!multiLine) {
-                            write(" ");
-                        }
-                        else {
-                            decreaseIndent();
-                        }
-                    }
-                }
-
-                write("}");
-            }
-
-            function emitDownlevelObjectLiteralWithComputedProperties(node: ObjectLiteralExpression, firstComputedPropertyIndex: number) {
-                const multiLine = node.multiLine;
-                const properties = node.properties;
-
-                write("(");
-
-                if (multiLine) {
-                    increaseIndent();
-                }
-
-                // For computed properties, we need to create a unique handle to the object
-                // literal so we can modify it without risking internal assignments tainting the object.
-                const tempVar = createAndRecordTempVariable(TempFlags.Auto);
-
-                // Write out the first non-computed properties
-                // (or all properties if none of them are computed),
-                // then emit the rest through indexing on the temp variable.
-                emit(tempVar);
-                write(" = ");
-                emitObjectLiteralBody(node, firstComputedPropertyIndex);
-
-                for (let i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
-                    writeComma();
-
-                    const property = properties[i];
-
-                    emitStart(property);
-                    if (property.kind === SyntaxKind.GetAccessor || property.kind === SyntaxKind.SetAccessor) {
-                        // TODO (drosen): Reconcile with 'emitMemberFunctions'.
-                        const accessors = getAllAccessorDeclarations(node.properties, <AccessorDeclaration>property);
-                        if (property !== accessors.firstAccessor) {
-                            continue;
-                        }
-                        write("Object.defineProperty(");
-                        emit(tempVar);
-                        write(", ");
-                        emitStart(property.name);
-                        emitExpressionForPropertyName(property.name);
-                        emitEnd(property.name);
-                        write(", {");
-                        increaseIndent();
-                        if (accessors.getAccessor) {
-                            writeLine();
-                            emitLeadingComments(accessors.getAccessor);
-                            write("get: ");
-                            emitStart(accessors.getAccessor);
-                            write("function ");
-                            emitSignatureAndBody(accessors.getAccessor);
-                            emitEnd(accessors.getAccessor);
-                            emitTrailingComments(accessors.getAccessor);
-                            write(",");
-                        }
-                        if (accessors.setAccessor) {
-                            writeLine();
-                            emitLeadingComments(accessors.setAccessor);
-                            write("set: ");
-                            emitStart(accessors.setAccessor);
-                            write("function ");
-                            emitSignatureAndBody(accessors.setAccessor);
-                            emitEnd(accessors.setAccessor);
-                            emitTrailingComments(accessors.setAccessor);
-                            write(",");
-                        }
-                        writeLine();
-                        write("enumerable: true,");
-                        writeLine();
-                        write("configurable: true");
-                        decreaseIndent();
-                        writeLine();
-                        write("})");
-                        emitEnd(property);
-                    }
-                    else {
-                        emitLeadingComments(property);
-                        emitStart(property.name);
-                        emit(tempVar);
-                        emitMemberAccessForPropertyName(property.name);
-                        emitEnd(property.name);
-
-                        write(" = ");
-
-                        if (property.kind === SyntaxKind.PropertyAssignment) {
-                            emit((<PropertyAssignment>property).initializer);
-                        }
-                        else if (property.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                            emitExpressionIdentifier((<ShorthandPropertyAssignment>property).name);
-                        }
-                        else if (property.kind === SyntaxKind.MethodDeclaration) {
-                            emitFunctionDeclaration(<MethodDeclaration>property);
-                        }
-                        else {
-                            Debug.fail("ObjectLiteralElement type not accounted for: " + property.kind);
-                        }
-                    }
-
-                    emitEnd(property);
-                }
-
-                writeComma();
-                emit(tempVar);
-
-                if (multiLine) {
-                    decreaseIndent();
-                    writeLine();
-                }
-
-                write(")");
-
-                function writeComma() {
-                    if (multiLine) {
-                        write(",");
-                        writeLine();
-                    }
-                    else {
-                        write(", ");
-                    }
-                }
-            }
-
-            function emitObjectLiteral(node: ObjectLiteralExpression): void {
-                const properties = node.properties;
-
-                if (languageVersion < ScriptTarget.ES6) {
-                    const numProperties = properties.length;
-
-                    // Find the first computed property.
-                    // Everything until that point can be emitted as part of the initial object literal.
-                    let numInitialNonComputedProperties = numProperties;
-                    for (let i = 0, n = properties.length; i < n; i++) {
-                        if (properties[i].name.kind === SyntaxKind.ComputedPropertyName) {
-                            numInitialNonComputedProperties = i;
-                            break;
-                        }
-                    }
-
-                    const hasComputedProperty = numInitialNonComputedProperties !== properties.length;
-                    if (hasComputedProperty) {
-                        emitDownlevelObjectLiteralWithComputedProperties(node, numInitialNonComputedProperties);
-                        return;
-                    }
-                }
-
-                // Ordinary case: either the object has no computed properties
-                // or we're compiling with an ES6+ target.
-                emitObjectLiteralBody(node, properties.length);
-            }
-
-            function createBinaryExpression(left: Expression, operator: SyntaxKind, right: Expression, startsOnNewLine?: boolean): BinaryExpression {
-                const result = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression, startsOnNewLine);
-                result.operatorToken = createSynthesizedNode(operator);
-                result.left = left;
-                result.right = right;
-
-                return result;
-            }
-
-            function createPropertyAccessExpression(expression: Expression, name: Identifier): PropertyAccessExpression {
-                const result = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression);
-                result.expression = parenthesizeForAccess(expression);
-                result.name = name;
-                return result;
-            }
-
-            function createElementAccessExpression(expression: Expression, argumentExpression: Expression): ElementAccessExpression {
-                const result = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
-                result.expression = parenthesizeForAccess(expression);
-                result.argumentExpression = argumentExpression;
-
-                return result;
-            }
-
-            function parenthesizeForAccess(expr: Expression): LeftHandSideExpression {
-                // When diagnosing whether the expression needs parentheses, the decision should be based
-                // on the innermost expression in a chain of nested type assertions.
-                while (expr.kind === SyntaxKind.TypeAssertionExpression ||
-                    expr.kind === SyntaxKind.AsExpression ||
-                    expr.kind === SyntaxKind.NonNullExpression) {
-                    expr = (<AssertionExpression | NonNullExpression>expr).expression;
-                }
-
-                // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
-                // to parenthesize the expression before a dot. The known exceptions are:
-                //
-                //    NewExpression:
-                //       new C.x        -> not the same as (new C).x
-                //    NumberLiteral
-                //       1.x            -> not the same as (1).x
-                //
-                if (isLeftHandSideExpression(expr) &&
-                    expr.kind !== SyntaxKind.NewExpression &&
-                    expr.kind !== SyntaxKind.NumericLiteral) {
-
-                    return <LeftHandSideExpression>expr;
-                }
-                const node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
-                node.expression = expr;
-                return node;
-            }
-
-            function emitComputedPropertyName(node: ComputedPropertyName) {
-                write("[");
-                emitExpressionForPropertyName(node);
-                write("]");
-            }
-
-            function emitMethod(node: MethodDeclaration) {
-                if (languageVersion >= ScriptTarget.ES6 && node.asteriskToken) {
-                    write("*");
-                }
-
-                emit(node.name);
-                if (languageVersion < ScriptTarget.ES6) {
-                    write(": function ");
-                }
-                emitSignatureAndBody(node);
-            }
-
-            function emitPropertyAssignment(node: PropertyDeclaration) {
-                emit(node.name);
-                write(": ");
-                // This is to ensure that we emit comment in the following case:
-                //      For example:
-                //          obj = {
-                //              id: /*comment1*/ ()=>void
-                //          }
-                // "comment1" is not considered to be leading comment for node.initializer
-                // but rather a trailing comment on the previous node.
-                emitTrailingCommentsOfPosition(node.initializer.pos);
-                emit(node.initializer);
-            }
-
-            // Return true if identifier resolves to an exported member of a namespace
-            function isExportReference(node: Identifier) {
-                const container = resolver.getReferencedExportContainer(node);
-                return !!container;
-            }
-
-            // Return true if identifier resolves to an imported identifier
-            function isImportedReference(node: Identifier) {
-                const declaration = resolver.getReferencedImportDeclaration(node);
-                return declaration && (declaration.kind === SyntaxKind.ImportClause || declaration.kind === SyntaxKind.ImportSpecifier);
-            }
-
-            function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
-                // The name property of a short-hand property assignment is considered an expression position, so here
-                // we manually emit the identifier to avoid rewriting.
-                writeTextOfNode(currentText, node.name);
-                // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier,
-                // we emit a normal property assignment. For example:
-                //   module m {
-                //       export let y;
-                //   }
-                //   module m {
-                //       let obj = { y };
-                //   }
-                // Here we need to emit obj = { y : m.y } regardless of the output target.
-                // The same rules apply for imported identifiers when targeting module formats with indirect access to
-                // the imported identifiers. For example, when targeting CommonJS:
-                //
-                //   import {foo} from './foo';
-                //   export const baz = { foo };
-                //
-                // Must be transformed into:
-                //
-                //   const foo_1 = require('./foo');
-                //   exports.baz = { foo: foo_1.foo };
-                //
-                if (languageVersion < ScriptTarget.ES6 || (modulekind !== ModuleKind.ES6 && isImportedReference(node.name)) || isExportReference(node.name)) {
-                    // Emit identifier as an identifier
-                    write(": ");
-                    emitExpressionIdentifier(node.name);
-                }
-
-                if (languageVersion >= ScriptTarget.ES6 && node.objectAssignmentInitializer) {
-                    write(" = ");
-                    emit(node.objectAssignmentInitializer);
-                }
-            }
-
-            function tryEmitConstantValue(node: PropertyAccessExpression | ElementAccessExpression): boolean {
-                const constantValue = tryGetConstEnumValue(node);
-                if (constantValue !== undefined) {
-                    write(constantValue.toString());
-                    if (!compilerOptions.removeComments) {
-                        const propertyName: string = node.kind === SyntaxKind.PropertyAccessExpression ? declarationNameToString((<PropertyAccessExpression>node).name) : getTextOfNode((<ElementAccessExpression>node).argumentExpression);
-                        write(" /* " + propertyName + " */");
-                    }
-                    return true;
-                }
-                return false;
-            }
-
-            function tryGetConstEnumValue(node: Node): number {
-                if (compilerOptions.isolatedModules) {
-                    return undefined;
-                }
-
-                return node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.ElementAccessExpression
-                    ? resolver.getConstantValue(<PropertyAccessExpression | ElementAccessExpression>node)
-                    : undefined;
-            }
-
-            // Returns 'true' if the code was actually indented, false otherwise.
-            // If the code is not indented, an optional valueToWriteWhenNotIndenting will be
-            // emitted instead.
-            function indentIfOnDifferentLines(parent: Node, node1: TextRange, node2: TextRange, valueToWriteWhenNotIndenting?: string): boolean {
-                const realNodesAreOnDifferentLines = !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
-
-                // Always use a newline for synthesized code if the synthesizer desires it.
-                const synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2 as Node);
-
-                if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
-                    increaseIndent();
-                    writeLine();
-                    return true;
-                }
-                else {
-                    if (valueToWriteWhenNotIndenting) {
-                        write(valueToWriteWhenNotIndenting);
-                    }
-                    return false;
-                }
-            }
-
-            function emitPropertyAccess(node: PropertyAccessExpression) {
-                if (tryEmitConstantValue(node)) {
-                    return;
-                }
-
-                if (languageVersion === ScriptTarget.ES6 &&
-                    node.expression.kind === SyntaxKind.SuperKeyword &&
-                    isInAsyncMethodWithSuperInES6(node)) {
-                    const name = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
-                    name.text = node.name.text;
-                    emitSuperAccessInAsyncMethod(node.expression, name);
-                    return;
-                }
-
-                emit(node.expression);
-                const dotRangeStart = nodeIsSynthesized(node.expression) ? -1 : node.expression.end;
-                const dotRangeEnd = nodeIsSynthesized(node.expression) ? -1 : skipTrivia(currentText, node.expression.end) + 1;
-                const dotToken = <TextRange>{ pos: dotRangeStart, end: dotRangeEnd };
-                const indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, dotToken);
-
-                // 1 .toString is a valid property access, emit a space after the literal
-                // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal
-                let shouldEmitSpace = false;
-                if (!indentedBeforeDot) {
-                    if (node.expression.kind === SyntaxKind.NumericLiteral) {
-                        // check if numeric literal was originally written with a dot
-                        const text = getTextOfNodeFromSourceText(currentText, node.expression);
-                        shouldEmitSpace = text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
-                    }
-                    else {
-                        // check if constant enum value is integer
-                        const constantValue = tryGetConstEnumValue(node.expression);
-                        // isFinite handles cases when constantValue is undefined
-                        shouldEmitSpace = isFinite(constantValue) && Math.floor(constantValue) === constantValue;
-                    }
-                }
-
-                if (shouldEmitSpace) {
-                    write(" .");
-                }
-                else {
-                    write(".");
-                }
-
-                const indentedAfterDot = indentIfOnDifferentLines(node, dotToken, node.name);
-                emit(node.name);
-                decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
-            }
-
-            function emitQualifiedName(node: QualifiedName) {
-                emit(node.left);
-                write(".");
-                emit(node.right);
-            }
-
-            function emitQualifiedNameAsExpression(node: QualifiedName, useFallback: boolean) {
-                if (node.left.kind === SyntaxKind.Identifier) {
-                    emitEntityNameAsExpression(node.left, useFallback);
-                }
-                else if (useFallback) {
-                    const temp = createAndRecordTempVariable(TempFlags.Auto);
-                    write("(");
-                    emitNodeWithoutSourceMap(temp);
-                    write(" = ");
-                    emitEntityNameAsExpression(node.left, /*useFallback*/ true);
-                    write(") && ");
-                    emitNodeWithoutSourceMap(temp);
-                }
-                else {
-                    emitEntityNameAsExpression(node.left, /*useFallback*/ false);
-                }
-
-                write(".");
-                emit(node.right);
-            }
-
-            function emitEntityNameAsExpression(node: EntityName | Expression, useFallback: boolean) {
-                switch (node.kind) {
-                    case SyntaxKind.Identifier:
-                        if (useFallback) {
-                            write("typeof ");
-                            emitExpressionIdentifier(<Identifier>node);
-                            write(" !== 'undefined' && ");
-                        }
-
-                        emitExpressionIdentifier(<Identifier>node);
-                        break;
-
-                    case SyntaxKind.QualifiedName:
-                        emitQualifiedNameAsExpression(<QualifiedName>node, useFallback);
-                        break;
-
-                    default:
-                        emitNodeWithoutSourceMap(node);
-                        break;
-                }
-            }
-
-            function emitIndexedAccess(node: ElementAccessExpression) {
-                if (tryEmitConstantValue(node)) {
-                    return;
-                }
-
-                if (languageVersion === ScriptTarget.ES6 &&
-                    node.expression.kind === SyntaxKind.SuperKeyword &&
-                    isInAsyncMethodWithSuperInES6(node)) {
-                    emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression);
-                    return;
-                }
-
-                emit(node.expression);
-                write("[");
-                emit(node.argumentExpression);
-                write("]");
-            }
-
-            function hasSpreadElement(elements: Expression[]) {
-                return forEach(elements, e => e.kind === SyntaxKind.SpreadElementExpression);
-            }
-
-            function skipParentheses(node: Expression): Expression {
-                while (node.kind === SyntaxKind.ParenthesizedExpression ||
-                    node.kind === SyntaxKind.TypeAssertionExpression ||
-                    node.kind === SyntaxKind.AsExpression ||
-                    node.kind === SyntaxKind.NonNullExpression) {
-                    node = (<ParenthesizedExpression | AssertionExpression | NonNullExpression>node).expression;
-                }
-                return node;
-            }
-
-            function emitCallTarget(node: Expression): Expression {
-                if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.SuperKeyword) {
-                    emit(node);
-                    return node;
-                }
-                const temp = createAndRecordTempVariable(TempFlags.Auto);
-
-                write("(");
-                emit(temp);
-                write(" = ");
-                emit(node);
-                write(")");
-                return temp;
-            }
-
-            function emitCallWithSpread(node: CallExpression) {
-                let target: Expression;
-                const expr = skipParentheses(node.expression);
-                if (expr.kind === SyntaxKind.PropertyAccessExpression) {
-                    // Target will be emitted as "this" argument
-                    target = emitCallTarget((<PropertyAccessExpression>expr).expression);
-                    write(".");
-                    emit((<PropertyAccessExpression>expr).name);
-                }
-                else if (expr.kind === SyntaxKind.ElementAccessExpression) {
-                    // Target will be emitted as "this" argument
-                    target = emitCallTarget((<PropertyAccessExpression>expr).expression);
-                    write("[");
-                    emit((<ElementAccessExpression>expr).argumentExpression);
-                    write("]");
-                }
-                else if (expr.kind === SyntaxKind.SuperKeyword) {
-                    target = expr;
-                    write("_super");
-                }
-                else {
-                    emit(node.expression);
-                }
-                write(".apply(");
-                if (target) {
-                    if (target.kind === SyntaxKind.SuperKeyword) {
-                        // Calls of form super(...) and super.foo(...)
-                        emitThis(target);
-                    }
-                    else {
-                        // Calls of form obj.foo(...)
-                        emit(target);
-                    }
-                }
-                else {
-                    // Calls of form foo(...)
-                    write("void 0");
-                }
-                write(", ");
-                emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ true);
-                write(")");
-            }
-
-            function isInAsyncMethodWithSuperInES6(node: Node) {
-                if (languageVersion === ScriptTarget.ES6) {
-                    const container = getSuperContainer(node, /*includeFunctions*/ false);
-                    if (container && resolver.getNodeCheckFlags(container) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding)) {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-
-            function emitSuperAccessInAsyncMethod(superNode: Node, argumentExpression: Expression) {
-                const container = getSuperContainer(superNode, /*includeFunctions*/ false);
-                const isSuperBinding = resolver.getNodeCheckFlags(container) & NodeCheckFlags.AsyncMethodWithSuperBinding;
-                write("_super(");
-                emit(argumentExpression);
-                write(isSuperBinding ? ").value" : ")");
-            }
-
-            function emitCallExpression(node: CallExpression) {
-                if (languageVersion < ScriptTarget.ES6 && hasSpreadElement(node.arguments)) {
-                    emitCallWithSpread(node);
-                    return;
-                }
-
-                const expression = node.expression;
-                let superCall = false;
-                let isAsyncMethodWithSuper = false;
-                if (expression.kind === SyntaxKind.SuperKeyword) {
-                    emitSuper(expression);
-                    superCall = true;
-                }
-                else {
-                    superCall = isSuperPropertyOrElementAccess(expression);
-                    isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node);
-                    emit(expression);
-                }
-
-                if (superCall && (languageVersion < ScriptTarget.ES6 || isAsyncMethodWithSuper)) {
-                    write(".call(");
-                    emitThis(expression);
-                    if (node.arguments.length) {
-                        write(", ");
-                        emitCommaList(node.arguments);
-                    }
-                    write(")");
-                }
-                else {
-                    write("(");
-                    emitCommaList(node.arguments);
-                    write(")");
-                }
-            }
-
-            function emitNewExpression(node: NewExpression) {
-                write("new ");
-
-                // Spread operator logic is supported in new expressions in ES5 using a combination
-                // of Function.prototype.bind() and Function.prototype.apply().
-                //
-                //     Example:
-                //
-                //         var args = [1, 2, 3, 4, 5];
-                //         new Array(...args);
-                //
-                //     is compiled into the following ES5:
-                //
-                //         var args = [1, 2, 3, 4, 5];
-                //         new (Array.bind.apply(Array, [void 0].concat(args)));
-                //
-                // The 'thisArg' to 'bind' is ignored when invoking the result of 'bind' with 'new',
-                // Thus, we set it to undefined ('void 0').
-                if (languageVersion === ScriptTarget.ES5 &&
-                    node.arguments &&
-                    hasSpreadElement(node.arguments)) {
-
-                    write("(");
-                    const target = emitCallTarget(node.expression);
-                    write(".bind.apply(");
-                    emit(target);
-                    write(", [void 0].concat(");
-                    emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ false);
-                    write(")))");
-                    write("()");
-                }
-                else {
-                    emit(node.expression);
-                    if (node.arguments) {
-                        write("(");
-                        emitCommaList(node.arguments);
-                        write(")");
-                    }
-                }
-            }
-
-            function emitTaggedTemplateExpression(node: TaggedTemplateExpression): void {
-                if (languageVersion >= ScriptTarget.ES6) {
-                    emit(node.tag);
-                    write(" ");
-                    emit(node.template);
-                }
-                else {
-                    emitDownlevelTaggedTemplate(node);
-                }
-            }
-
-            function emitParenExpression(node: ParenthesizedExpression) {
-                // If the node is synthesized, it means the emitter put the parentheses there,
-                // not the user. If we didn't want them, the emitter would not have put them
-                // there.
-                if (!nodeIsSynthesized(node) && node.parent.kind !== SyntaxKind.ArrowFunction) {
-                    if (node.expression.kind === SyntaxKind.TypeAssertionExpression ||
-                        node.expression.kind === SyntaxKind.AsExpression ||
-                        node.expression.kind === SyntaxKind.NonNullExpression) {
-                        let operand = (<TypeAssertion | NonNullExpression>node.expression).expression;
-
-                        // Make sure we consider all nested cast expressions, e.g.:
-                        // (<any><number><any>-A).x;
-                        while (operand.kind === SyntaxKind.TypeAssertionExpression ||
-                            operand.kind === SyntaxKind.AsExpression ||
-                            operand.kind === SyntaxKind.NonNullExpression) {
-                            operand = (<TypeAssertion | NonNullExpression>operand).expression;
-                        }
-
-                        // We have an expression of the form: (<Type>SubExpr) or (SubExpr as Type)
-                        // Emitting this as (SubExpr) is really not desirable. We would like to emit the subexpr as is.
-                        // Omitting the parentheses, however, could cause change in the semantics of the generated
-                        // code if the casted expression has a lower precedence than the rest of the expression, e.g.:
-                        //      (<any>new A).foo should be emitted as (new A).foo and not new A.foo
-                        //      (<any>typeof A).toString() should be emitted as (typeof A).toString() and not typeof A.toString()
-                        //      new (<any>A()) should be emitted as new (A()) and not new A()
-                        //      (<any>function foo() { })() should be emitted as an IIF (function foo(){})() and not declaration function foo(){} ()
-                        if (operand.kind !== SyntaxKind.PrefixUnaryExpression &&
-                            operand.kind !== SyntaxKind.VoidExpression &&
-                            operand.kind !== SyntaxKind.TypeOfExpression &&
-                            operand.kind !== SyntaxKind.DeleteExpression &&
-                            operand.kind !== SyntaxKind.PostfixUnaryExpression &&
-                            operand.kind !== SyntaxKind.NewExpression &&
-                            !(operand.kind === SyntaxKind.BinaryExpression && node.expression.kind === SyntaxKind.AsExpression) &&
-                            !(operand.kind === SyntaxKind.CallExpression && node.parent.kind === SyntaxKind.NewExpression) &&
-                            !(operand.kind === SyntaxKind.FunctionExpression && node.parent.kind === SyntaxKind.CallExpression) &&
-                            !(operand.kind === SyntaxKind.NumericLiteral && node.parent.kind === SyntaxKind.PropertyAccessExpression)) {
-                            emit(operand);
-                            return;
-                        }
-                    }
-                }
-
-                write("(");
-                emit(node.expression);
-                write(")");
-            }
-
-            function emitDeleteExpression(node: DeleteExpression) {
-                write(tokenToString(SyntaxKind.DeleteKeyword));
-                write(" ");
-                emit(node.expression);
-            }
-
-            function emitVoidExpression(node: VoidExpression) {
-                write(tokenToString(SyntaxKind.VoidKeyword));
-                write(" ");
-                emit(node.expression);
-            }
-
-            function emitTypeOfExpression(node: TypeOfExpression) {
-                write(tokenToString(SyntaxKind.TypeOfKeyword));
-                write(" ");
-                emit(node.expression);
-            }
-
-            function isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node: Node): boolean {
-                if (!isCurrentFileSystemExternalModule() || node.kind !== SyntaxKind.Identifier || nodeIsSynthesized(node)) {
-                    return false;
-                }
-
-                const isVariableDeclarationOrBindingElement =
-                    node.parent && (node.parent.kind === SyntaxKind.VariableDeclaration || node.parent.kind === SyntaxKind.BindingElement);
-
-                const targetDeclaration =
-                    isVariableDeclarationOrBindingElement
-                        ? <Declaration>node.parent
-                        : resolver.getReferencedValueDeclaration(<Identifier>node);
-
-                return isSourceFileLevelDeclarationInSystemJsModule(targetDeclaration, /*isExported*/ true);
-            }
-
-            function isNameOfExportedDeclarationInNonES6Module(node: Node): boolean {
-                if (modulekind === ModuleKind.System || node.kind !== SyntaxKind.Identifier || nodeIsSynthesized(node)) {
-                    return false;
-                }
-
-                return !exportEquals && exportSpecifiers && (<Identifier>node).text in exportSpecifiers;
-            }
-
-            function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
-                const isPlusPlusOrMinusMinus = (node.operator === SyntaxKind.PlusPlusToken
-                    || node.operator === SyntaxKind.MinusMinusToken);
-                const externalExportChanged = isPlusPlusOrMinusMinus &&
-                    isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.operand);
-
-                if (externalExportChanged) {
-                    // emit
-                    // ++x
-                    // as
-                    // exports('x', ++x)
-                    write(`${exportFunctionForFile}("`);
-                    emitNodeWithoutSourceMap(node.operand);
-                    write(`", `);
-                }
-                const internalExportChanged = isPlusPlusOrMinusMinus &&
-                    isNameOfExportedDeclarationInNonES6Module(node.operand);
-
-                if (internalExportChanged) {
-                    emitAliasEqual(<Identifier>node.operand);
-                }
-
-                write(tokenToString(node.operator));
-                // In some cases, we need to emit a space between the operator and the operand. One obvious case
-                // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
-                // and minus expressions in certain cases. Specifically, consider the following two cases (parens
-                // are just for clarity of exposition, and not part of the source code):
-                //
-                //  (+(+1))
-                //  (+(++1))
-                //
-                // We need to emit a space in both cases. In the first case, the absence of a space will make
-                // the resulting expression a prefix increment operation. And in the second, it will make the resulting
-                // expression a prefix increment whose operand is a plus expression - (++(+x))
-                // The same is true of minus of course.
-                if (node.operand.kind === SyntaxKind.PrefixUnaryExpression) {
-                    const operand = <PrefixUnaryExpression>node.operand;
-                    if (node.operator === SyntaxKind.PlusToken && (operand.operator === SyntaxKind.PlusToken || operand.operator === SyntaxKind.PlusPlusToken)) {
-                        write(" ");
-                    }
-                    else if (node.operator === SyntaxKind.MinusToken && (operand.operator === SyntaxKind.MinusToken || operand.operator === SyntaxKind.MinusMinusToken)) {
-                        write(" ");
-                    }
-                }
-                emit(node.operand);
-
-                if (externalExportChanged) {
-                    write(")");
-                }
-            }
-
-            function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
-                const externalExportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.operand);
-                const internalExportChanged = isNameOfExportedDeclarationInNonES6Module(node.operand);
-
-                if (externalExportChanged) {
-                    // export function returns the value that was passes as the second argument
-                    // however for postfix unary expressions result value should be the value before modification.
-                    // emit 'x++' as '(export('x', ++x) - 1)' and 'x--' as '(export('x', --x) + 1)'
-                    write(`(${exportFunctionForFile}("`);
-                    emitNodeWithoutSourceMap(node.operand);
-                    write(`", `);
-
-                    write(tokenToString(node.operator));
-                    emit(node.operand);
-
-                    if (node.operator === SyntaxKind.PlusPlusToken) {
-                        write(") - 1)");
-                    }
-                    else {
-                        write(") + 1)");
-                    }
-                }
-                else if (internalExportChanged) {
-                    emitAliasEqual(<Identifier>node.operand);
-                    emit(node.operand);
-                    if (node.operator === SyntaxKind.PlusPlusToken) {
-                        write(" += 1");
-                    }
-                    else {
-                        write(" -= 1");
-                    }
-                }
-                else {
-                    emit(node.operand);
-                    write(tokenToString(node.operator));
-                }
-            }
-
-            function shouldHoistDeclarationInSystemJsModule(node: Node): boolean {
-                return isSourceFileLevelDeclarationInSystemJsModule(node, /*isExported*/ false);
-            }
-
-            /*
-             * Checks if given node is a source file level declaration (not nested in module/function).
-             * If 'isExported' is true - then declaration must also be exported.
-             * This function is used in two cases:
-             * - check if node is a exported source file level value to determine
-             *   if we should also export the value after its it changed
-             * - check if node is a source level declaration to emit it differently,
-             *   i.e non-exported variable statement 'var x = 1' is hoisted so
-             *   when we emit variable statement 'var' should be dropped.
-             */
-            function isSourceFileLevelDeclarationInSystemJsModule(node: Node, isExported: boolean): boolean {
-                if (!node || !isCurrentFileSystemExternalModule()) {
-                    return false;
-                }
-
-                let current = getRootDeclaration(node).parent;
-                while (current) {
-                    if (current.kind === SyntaxKind.SourceFile) {
-                        return !isExported || ((getCombinedNodeFlags(node) & NodeFlags.Export) !== 0);
-                    }
-                    else if (isDeclaration(current)) {
-                        return false;
-                    }
-                    else {
-                        current = current.parent;
-                    }
-                }
-            }
-
-            /**
-             * Emit ES7 exponentiation operator downlevel using Math.pow
-             * @param node a binary expression node containing exponentiationOperator (**, **=)
-             */
-            function emitExponentiationOperator(node: BinaryExpression) {
-                const leftHandSideExpression = node.left;
-                if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken) {
-                    let synthesizedLHS: ElementAccessExpression | PropertyAccessExpression;
-                    let shouldEmitParentheses = false;
-                    if (isElementAccessExpression(leftHandSideExpression)) {
-                        shouldEmitParentheses = true;
-                        write("(");
-
-                        synthesizedLHS = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression, /*startsOnNewLine*/ false);
-
-                        const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
-                        synthesizedLHS.expression = identifier;
-
-                        if (leftHandSideExpression.argumentExpression.kind !== SyntaxKind.NumericLiteral &&
-                            leftHandSideExpression.argumentExpression.kind !== SyntaxKind.StringLiteral) {
-                            const tempArgumentExpression = createAndRecordTempVariable(TempFlags._i);
-                            (<ElementAccessExpression>synthesizedLHS).argumentExpression = tempArgumentExpression;
-                            emitAssignment(tempArgumentExpression, leftHandSideExpression.argumentExpression, /*shouldEmitCommaBeforeAssignment*/ true, leftHandSideExpression.expression);
-                        }
-                        else {
-                            (<ElementAccessExpression>synthesizedLHS).argumentExpression = leftHandSideExpression.argumentExpression;
-                        }
-                        write(", ");
-                    }
-                    else if (isPropertyAccessExpression(leftHandSideExpression)) {
-                        shouldEmitParentheses = true;
-                        write("(");
-                        synthesizedLHS = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression, /*startsOnNewLine*/ false);
-
-                        const identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
-                        synthesizedLHS.expression = identifier;
-
-                        (<PropertyAccessExpression>synthesizedLHS).name = leftHandSideExpression.name;
-                        write(", ");
-                    }
-
-                    emit(synthesizedLHS || leftHandSideExpression);
-                    write(" = ");
-                    write("Math.pow(");
-                    emit(synthesizedLHS || leftHandSideExpression);
-                    write(", ");
-                    emit(node.right);
-                    write(")");
-                    if (shouldEmitParentheses) {
-                        write(")");
-                    }
-                }
-                else {
-                    write("Math.pow(");
-                    emit(leftHandSideExpression);
-                    write(", ");
-                    emit(node.right);
-                    write(")");
-                }
-            }
-
-            function emitAliasEqual(name: Identifier): boolean {
-                for (const specifier of exportSpecifiers[name.text]) {
-                    emitStart(specifier.name);
-                    emitContainingModuleName(specifier);
-                    if (languageVersion === ScriptTarget.ES3 && name.text === "default") {
-                        write('["default"]');
-                    }
-                    else {
-                        write(".");
-                        emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                    }
-                    emitEnd(specifier.name);
-                    write(" = ");
-                }
-                return true;
-            }
-
-            function emitBinaryExpression(node: BinaryExpression) {
-                if (languageVersion < ScriptTarget.ES6 && node.operatorToken.kind === SyntaxKind.EqualsToken &&
-                    (node.left.kind === SyntaxKind.ObjectLiteralExpression || node.left.kind === SyntaxKind.ArrayLiteralExpression)) {
-                    emitDestructuring(node, node.parent.kind === SyntaxKind.ExpressionStatement);
-                }
-                else {
-                    const isAssignment = isAssignmentOperator(node.operatorToken.kind);
-
-                    const externalExportChanged = isAssignment &&
-                        isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.left);
-
-                    if (externalExportChanged) {
-                        // emit assignment 'x <op> y' as 'exports("x", x <op> y)'
-                        write(`${exportFunctionForFile}("`);
-                        emitNodeWithoutSourceMap(node.left);
-                        write(`", `);
-                    }
-
-                    const internalExportChanged = isAssignment &&
-                        isNameOfExportedDeclarationInNonES6Module(node.left);
-
-                    if (internalExportChanged) {
-                        // export { foo }
-                        // emit foo = 2 as exports.foo = foo = 2
-                        emitAliasEqual(<Identifier>node.left);
-                    }
-
-                    if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskToken || node.operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken) {
-                        // Downleveled emit exponentiation operator using Math.pow
-                        emitExponentiationOperator(node);
-                    }
-                    else {
-                        emit(node.left);
-                        // Add indentation before emit the operator if the operator is on different line
-                        // For example:
-                        //      3
-                        //      + 2;
-                        //   emitted as
-                        //      3
-                        //          + 2;
-                        const indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
-                        write(tokenToString(node.operatorToken.kind));
-                        const indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
-                        emit(node.right);
-                        decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
-                    }
-
-                    if (externalExportChanged) {
-                        write(")");
-                    }
-                }
-            }
-
-            function synthesizedNodeStartsOnNewLine(node: Node) {
-                return nodeIsSynthesized(node) && (<SynthesizedNode>node).startsOnNewLine;
-            }
-
-            function emitConditionalExpression(node: ConditionalExpression) {
-                emit(node.condition);
-                const indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
-                write("?");
-                const indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
-                emit(node.whenTrue);
-                decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
-                const indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
-                write(":");
-                const indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
-                emit(node.whenFalse);
-                decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
-            }
-
-            // Helper function to decrease the indent if we previously indented.  Allows multiple
-            // previous indent values to be considered at a time.  This also allows caller to just
-            // call this once, passing in all their appropriate indent values, instead of needing
-            // to call this helper function multiple times.
-            function decreaseIndentIf(value1: boolean, value2?: boolean) {
-                if (value1) {
-                    decreaseIndent();
-                }
-                if (value2) {
-                    decreaseIndent();
-                }
-            }
-
-            function isSingleLineEmptyBlock(node: Node) {
-                if (node && node.kind === SyntaxKind.Block) {
-                    const block = <Block>node;
-                    return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
-                }
-            }
-
-            function emitBlock(node: Block) {
-                if (isSingleLineEmptyBlock(node)) {
-                    emitToken(SyntaxKind.OpenBraceToken, node.pos);
-                    write(" ");
-                    emitToken(SyntaxKind.CloseBraceToken, node.statements.end);
-                    return;
-                }
-
-                emitToken(SyntaxKind.OpenBraceToken, node.pos);
-                increaseIndent();
-                if (node.kind === SyntaxKind.ModuleBlock) {
-                    Debug.assert(node.parent.kind === SyntaxKind.ModuleDeclaration);
-                    emitCaptureThisForNodeIfNecessary(node.parent);
-                }
-                emitLines(node.statements);
-                if (node.kind === SyntaxKind.ModuleBlock) {
-                    emitTempDeclarations(/*newLine*/ true);
-                }
-                decreaseIndent();
-                writeLine();
-                emitToken(SyntaxKind.CloseBraceToken, node.statements.end);
-            }
-
-            function emitEmbeddedStatement(node: Node) {
-                if (node.kind === SyntaxKind.Block) {
-                    write(" ");
-                    emit(<Block>node);
-                }
-                else {
-                    increaseIndent();
-                    writeLine();
-                    emit(node);
-                    decreaseIndent();
-                }
-            }
-
-            function emitExpressionStatement(node: ExpressionStatement) {
-                emitParenthesizedIf(node.expression, /*parenthesized*/ node.expression.kind === SyntaxKind.ArrowFunction);
-                write(";");
-            }
-
-            function emitIfStatement(node: IfStatement) {
-                let endPos = emitToken(SyntaxKind.IfKeyword, node.pos);
-                write(" ");
-                endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
-                emit(node.expression);
-                emitToken(SyntaxKind.CloseParenToken, node.expression.end);
-                emitEmbeddedStatement(node.thenStatement);
-                if (node.elseStatement) {
-                    writeLine();
-                    emitToken(SyntaxKind.ElseKeyword, node.thenStatement.end);
-                    if (node.elseStatement.kind === SyntaxKind.IfStatement) {
-                        write(" ");
-                        emit(node.elseStatement);
-                    }
-                    else {
-                        emitEmbeddedStatement(node.elseStatement);
-                    }
-                }
-            }
-
-            function emitDoStatement(node: DoStatement) {
-                emitLoop(node, emitDoStatementWorker);
-            }
-
-            function emitDoStatementWorker(node: DoStatement, loop: ConvertedLoop) {
-                write("do");
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-                if (node.statement.kind === SyntaxKind.Block) {
-                    write(" ");
-                }
-                else {
-                    writeLine();
-                }
-                write("while (");
-                emit(node.expression);
-                write(");");
-            }
-
-            function emitWhileStatement(node: WhileStatement) {
-                emitLoop(node, emitWhileStatementWorker);
-            }
-
-            function emitWhileStatementWorker(node: WhileStatement, loop: ConvertedLoop) {
-                write("while (");
-                emit(node.expression);
-                write(")");
-
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-            }
-
-            /**
-             * Returns true if start of variable declaration list was emitted.
-             * Returns false if nothing was written - this can happen for source file level variable declarations
-             *     in system modules where such variable declarations are hoisted.
-             */
-            function tryEmitStartOfVariableDeclarationList(decl: VariableDeclarationList): boolean {
-                if (shouldHoistVariable(decl, /*checkIfSourceFileLevelDecl*/ true)) {
-                    // variables in variable declaration list were already hoisted
-                    return false;
-                }
-
-                if (convertedLoopState && (getCombinedNodeFlags(decl) & NodeFlags.BlockScoped) === 0) {
-                    // we are inside a converted loop - this can only happen in downlevel scenarios
-                    // record names for all variable declarations
-                    for (const varDecl of decl.declarations) {
-                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
-                    }
-                    return false;
-                }
-
-                emitStart(decl);
-                if (decl && languageVersion >= ScriptTarget.ES6) {
-                    if (isLet(decl)) {
-                        write("let ");
-                    }
-                    else if (isConst(decl)) {
-                        write("const ");
-                    }
-                    else {
-                        write("var ");
-                    }
-                }
-                else {
-                    write("var ");
-                }
-                // Note here we specifically dont emit end so that if we are going to emit binding pattern
-                // we can alter the source map correctly
-                return true;
-            }
-
-            function emitVariableDeclarationListSkippingUninitializedEntries(list: VariableDeclarationList): boolean {
-                let started = false;
-                for (const decl of list.declarations) {
-                    if (!decl.initializer) {
-                        continue;
-                    }
-
-                    if (!started) {
-                        started = true;
-                    }
-                    else {
-                        write(", ");
-                    }
-
-                    emit(decl);
-                }
-
-                return started;
-            }
-
-            interface ConvertedLoop {
-                functionName: string;
-                paramList: string;
-                state: ConvertedLoopState;
-            }
-
-            function shouldConvertLoopBody(node: IterationStatement): boolean {
-                return languageVersion < ScriptTarget.ES6 &&
-                    (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LoopWithCapturedBlockScopedBinding) !== 0;
-            }
-
-            function emitLoop(node: IterationStatement, loopEmitter: (n: IterationStatement, convertedLoop: ConvertedLoop) => void): void {
-                const shouldConvert = shouldConvertLoopBody(node);
-                if (!shouldConvert) {
-                    loopEmitter(node, /* convertedLoop*/ undefined);
-                }
-                else {
-                    const loop = convertLoopBody(node);
-                    if (node.parent.kind === SyntaxKind.LabeledStatement) {
-                        // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
-                        emitLabelAndColon(<LabeledStatement>node.parent);
-                    }
-                    loopEmitter(node, loop);
-                }
-            }
-
-            function convertLoopBody(node: IterationStatement): ConvertedLoop {
-                const functionName = makeUniqueName("_loop");
-
-                let loopInitializer: VariableDeclarationList;
-                switch (node.kind) {
-                    case SyntaxKind.ForStatement:
-                    case SyntaxKind.ForInStatement:
-                    case SyntaxKind.ForOfStatement:
-                        const initializer = (<ForStatement | ForInStatement | ForOfStatement>node).initializer;
-                        if (initializer && initializer.kind === SyntaxKind.VariableDeclarationList) {
-                            loopInitializer = <VariableDeclarationList>(<ForStatement | ForInStatement | ForOfStatement>node).initializer;
-                        }
-                        break;
-                }
-
-                let loopParameters: string[];
-                let loopOutParameters: LoopOutParameter[];
-                if (loopInitializer && (getCombinedNodeFlags(loopInitializer) & NodeFlags.BlockScoped)) {
-                    // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
-                    loopParameters = [];
-                    for (const varDeclaration of loopInitializer.declarations) {
-                        processVariableDeclaration(varDeclaration.name);
-                    }
-                }
-
-                const bodyIsBlock = node.statement.kind === SyntaxKind.Block;
-                const paramList = loopParameters ? loopParameters.join(", ") : "";
-
-                writeLine();
-                write(`var ${functionName} = function(${paramList})`);
-
-                const convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = { loopOutParameters };
-
-                if (convertedOuterLoopState) {
-                    // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
-                    // if outer converted loop has already accumulated some state - pass it through
-                    if (convertedOuterLoopState.argumentsName) {
-                        // outer loop has already used 'arguments' so we've already have some name to alias it
-                        // use the same name in all nested loops
-                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
-                    }
-
-                    if (convertedOuterLoopState.thisName) {
-                        // outer loop has already used 'this' so we've already have some name to alias it
-                        // use the same name in all nested loops
-                        convertedLoopState.thisName = convertedOuterLoopState.thisName;
-                    }
-
-                    if (convertedOuterLoopState.hoistedLocalVariables) {
-                        // we've already collected some non-block scoped variable declarations in enclosing loop
-                        // use the same storage in nested loop
-                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
-                    }
-                }
-
-                write(" {");
-                writeLine();
-                increaseIndent();
-
-                if (bodyIsBlock) {
-                    emitLines((<Block>node.statement).statements);
-                }
-                else {
-                    emit(node.statement);
-                }
-
-                writeLine();
-                // end of loop body -> copy out parameter
-                copyLoopOutParameters(convertedLoopState, CopyDirection.ToOutParameter, /*emitAsStatements*/true);
-
-                decreaseIndent();
-                writeLine();
-                write("};");
-                writeLine();
-
-                if (loopOutParameters) {
-                    // declare variables to hold out params for loop body
-                    write(`var `);
-                    for (let i = 0; i < loopOutParameters.length; i++) {
-                        if (i !== 0) {
-                            write(", ");
-                        }
-                        write(loopOutParameters[i].outParamName);
-                    }
-                    write(";");
-                    writeLine();
-                }
-                if (convertedLoopState.argumentsName) {
-                    // if alias for arguments is set
-                    if (convertedOuterLoopState) {
-                        // pass it to outer converted loop
-                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
-                    }
-                    else {
-                        // this is top level converted loop and we need to create an alias for 'arguments' object
-                        write(`var ${convertedLoopState.argumentsName} = arguments;`);
-                        writeLine();
-                    }
-                }
-                if (convertedLoopState.thisName) {
-                    // if alias for this is set
-                    if (convertedOuterLoopState) {
-                        // pass it to outer converted loop
-                        convertedOuterLoopState.thisName = convertedLoopState.thisName;
-                    }
-                    else {
-                        // this is top level converted loop so we need to create an alias for 'this' here
-                        // NOTE:
-                        // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set.
-                        // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'.
-                        write(`var ${convertedLoopState.thisName} = this;`);
-                        writeLine();
-                    }
-                }
-
-                if (convertedLoopState.hoistedLocalVariables) {
-                    // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
-                    if (convertedOuterLoopState) {
-                        // pass them to outer converted loop
-                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
-                    }
-                    else {
-                        // deduplicate and hoist collected variable declarations
-                        write("var ");
-                        let seen: Map<string>;
-                        for (const id of convertedLoopState.hoistedLocalVariables) {
-                           // Don't initialize seen unless we have at least one element.
-                           // Emit a comma to separate for all but the first element.
-                           if (!seen) {
-                               seen = createMap<string>();
-                           }
-                           else {
-                               write(", ");
-                           }
-
-                           if (!(id.text in seen)) {
-                               emit(id);
-                               seen[id.text] = id.text;
-                           }
-                        }
-                        write(";");
-                        writeLine();
-                    }
-                }
-
-                const currentLoopState = convertedLoopState;
-                convertedLoopState = convertedOuterLoopState;
-
-                return { functionName, paramList, state: currentLoopState };
-
-                function processVariableDeclaration(name: Identifier | BindingPattern): void {
-                    if (name.kind === SyntaxKind.Identifier) {
-                        const nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(<Identifier>name)
-                            ? getGeneratedNameForNode(name)
-                            : (<Identifier>name).text;
-
-                        loopParameters.push(nameText);
-                        if (resolver.getNodeCheckFlags(name.parent) & NodeCheckFlags.NeedsLoopOutParameter) {
-                            const reassignedVariable = { originalName: <Identifier>name, outParamName: makeUniqueName(`out_${nameText}`) };
-                            (loopOutParameters || (loopOutParameters = [])).push(reassignedVariable);
-                        }
-                    }
-                    else {
-                        for (const element of (<BindingPattern>name).elements) {
-                            processVariableDeclaration(element.name);
-                        }
-                    }
-                }
-            }
-
-            function emitNormalLoopBody(node: IterationStatement, emitAsEmbeddedStatement: boolean): void {
-                let saveAllowedNonLabeledJumps: Jump;
-                if (convertedLoopState) {
-                    // we get here if we are trying to emit normal loop loop inside converted loop
-                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
-                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
-                    convertedLoopState.allowedNonLabeledJumps = Jump.Break | Jump.Continue;
-                }
-
-                if (emitAsEmbeddedStatement) {
-                    emitEmbeddedStatement(node.statement);
-                }
-                else if (node.statement.kind === SyntaxKind.Block) {
-                    emitLines((<Block>node.statement).statements);
-                }
-                else {
-                    writeLine();
-                    emit(node.statement);
-                }
-
-                if (convertedLoopState) {
-                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
-                }
-            }
-
-            function copyLoopOutParameters(state: ConvertedLoopState, copyDirection: CopyDirection, emitAsStatements: boolean) {
-                if (state.loopOutParameters) {
-                    for (const outParam of state.loopOutParameters) {
-                        if (copyDirection === CopyDirection.ToOriginal) {
-                            emitIdentifier(outParam.originalName);
-                            write(` = ${outParam.outParamName}`);
-                        }
-                        else {
-                            write(`${outParam.outParamName} = `);
-                            emitIdentifier(outParam.originalName);
-                        }
-                        if (emitAsStatements) {
-                            write(";");
-                            writeLine();
-                        }
-                        else {
-                            write(", ");
-                        }
-                    }
-                }
-            }
-
-            function emitConvertedLoopCall(loop: ConvertedLoop, emitAsBlock: boolean): void {
-                if (emitAsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
-
-                // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
-                // simple loops are emitted as just 'loop()';
-                // NOTE: if loop uses only 'continue' it still will be emitted as simple loop
-                const isSimpleLoop =
-                    !(loop.state.nonLocalJumps & ~Jump.Continue) &&
-                    !loop.state.labeledNonLocalBreaks &&
-                    !loop.state.labeledNonLocalContinues;
-
-                const loopResult = makeUniqueName("state");
-                if (!isSimpleLoop) {
-                    write(`var ${loopResult} = `);
-                }
-
-                write(`${loop.functionName}(${loop.paramList});`);
-                writeLine();
-
-                copyLoopOutParameters(loop.state, CopyDirection.ToOriginal, /*emitAsStatements*/ true);
-
-                if (!isSimpleLoop) {
-                    // for non simple loops we need to store result returned from converted loop function and use it to do dispatching
-                    // converted loop function can return:
-                    // - object - used when body of the converted loop contains return statement. Property "value" of this object stores retuned value
-                    // - string - used to dispatch jumps. "break" and "continue" are used to non-labeled jumps, other values are used to transfer control to
-                    //   different labels
-                    writeLine();
-                    if (loop.state.nonLocalJumps & Jump.Return) {
-                        write(`if (typeof ${loopResult} === "object") `);
-                        if (convertedLoopState) {
-                            // we are currently nested in another converted loop - return unwrapped result
-                            write(`return ${loopResult};`);
-                            // propagate 'hasReturn' flag to outer loop
-                            convertedLoopState.nonLocalJumps |= Jump.Return;
-                        }
-                        else {
-                            // top level converted loop - return unwrapped value
-                            write(`return ${loopResult}.value;`);
-                        }
-                        writeLine();
-                    }
-
-                    if (loop.state.nonLocalJumps & Jump.Break) {
-                        write(`if (${loopResult} === "break") break;`);
-                        writeLine();
-                    }
-
-                    // in case of labeled breaks emit code that either breaks to some known label inside outer loop or delegates jump decision to outer loop
-                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
-                    // in case of 'continue' we'll just fallthough here
-                }
-
-                if (emitAsBlock) {
-                    writeLine();
-                    decreaseIndent();
-                    write("}");
-                }
-
-                function emitDispatchTableForLabeledJumps(loopResultVariable: string, currentLoop: ConvertedLoopState, outerLoop: ConvertedLoopState) {
-                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
-                        return;
-                    }
-
-                    write(`switch(${loopResultVariable}) {`);
-                    increaseIndent();
-
-                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /*isBreak*/ true, loopResultVariable, outerLoop);
-                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /*isBreak*/ false, loopResultVariable, outerLoop);
-
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-
-                function emitDispatchEntriesForLabeledJumps(table: Map<string>, isBreak: boolean, loopResultVariable: string, outerLoop: ConvertedLoopState): void {
-                    if (!table) {
-                        return;
-                    }
-
-                    for (const labelText in table) {
-                        const labelMarker = table[labelText];
-                        writeLine();
-                        write(`case "${labelMarker}": `);
-                        // if there are no outer converted loop or outer label in question is located inside outer converted loop
-                        // then emit labeled break\continue
-                        // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do
-                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
-                            if (isBreak) {
-                                write("break ");
-                            }
-                            else {
-                                write("continue ");
-                            }
-                            write(`${labelText};`);
-                        }
-                        else {
-                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
-                            write(`return ${loopResultVariable};`);
-                        }
-                    }
-                }
-            }
-
-            function emitForStatement(node: ForStatement) {
-                emitLoop(node, emitForStatementWorker);
-            }
-
-            function emitForStatementWorker(node: ForStatement, loop: ConvertedLoop) {
-                let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
-                write(" ");
-                endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
-                if (node.initializer && node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    const variableDeclarationList = <VariableDeclarationList>node.initializer;
-                    const startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList);
-                    if (startIsEmitted) {
-                        emitCommaList(variableDeclarationList.declarations);
-                    }
-                    else {
-                        emitVariableDeclarationListSkippingUninitializedEntries(variableDeclarationList);
-                    }
-                }
-                else if (node.initializer) {
-                    emit(node.initializer);
-                }
-                write(";");
-                emitOptional(" ", node.condition);
-                write(";");
-                emitOptional(" ", node.incrementor);
-                write(")");
-
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-            }
-
-            function emitForInOrForOfStatement(node: ForInStatement | ForOfStatement) {
-                if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.ForOfStatement) {
-                    emitLoop(node, emitDownLevelForOfStatementWorker);
-                }
-                else {
-                    emitLoop(node, emitForInOrForOfStatementWorker);
-                }
-            }
-
-            function emitForInOrForOfStatementWorker(node: ForInStatement | ForOfStatement, loop: ConvertedLoop) {
-                let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
-                write(" ");
-                endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
-                if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    const variableDeclarationList = <VariableDeclarationList>node.initializer;
-                    if (variableDeclarationList.declarations.length >= 1) {
-                        tryEmitStartOfVariableDeclarationList(variableDeclarationList);
-                        emit(variableDeclarationList.declarations[0]);
-                    }
-                }
-                else {
-                    emit(node.initializer);
-                }
-
-                if (node.kind === SyntaxKind.ForInStatement) {
-                    write(" in ");
-                }
-                else {
-                    write(" of ");
-                }
-                emit(node.expression);
-                emitToken(SyntaxKind.CloseParenToken, node.expression.end);
-
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-            }
-
-            function emitDownLevelForOfStatementWorker(node: ForOfStatement, loop: ConvertedLoop) {
-                // The following ES6 code:
-                //
-                //    for (let v of expr) { }
-                //
-                // should be emitted as
-                //
-                //    for (let _i = 0, _a = expr; _i < _a.length; _i++) {
-                //        let v = _a[_i];
-                //    }
-                //
-                // where _a and _i are temps emitted to capture the RHS and the counter,
-                // respectively.
-                // When the left hand side is an expression instead of a let declaration,
-                // the "let v" is not emitted.
-                // When the left hand side is a let/const, the v is renamed if there is
-                // another v in scope.
-                // Note that all assignments to the LHS are emitted in the body, including
-                // all destructuring.
-                // Note also that because an extra statement is needed to assign to the LHS,
-                // for-of bodies are always emitted as blocks.
-
-                let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
-                write(" ");
-                endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
-
-                // Do not emit the LHS let declaration yet, because it might contain destructuring.
-
-                // Do not call recordTempDeclaration because we are declaring the temps
-                // right here. Recording means they will be declared later.
-                // In the case where the user wrote an identifier as the RHS, like this:
-                //
-                //     for (let v of arr) { }
-                //
-                // we can't reuse 'arr' because it might be modified within the body of the loop.
-                const counter = createTempVariable(TempFlags._i);
-                const rhsReference = createSynthesizedNode(SyntaxKind.Identifier) as Identifier;
-                rhsReference.text = node.expression.kind === SyntaxKind.Identifier ?
-                    makeUniqueName((<Identifier>node.expression).text) :
-                    makeTempVariableName(TempFlags.Auto);
-
-                // This is the let keyword for the counter and rhsReference. The let keyword for
-                // the LHS will be emitted inside the body.
-                emitStart(node.expression);
-                write("var ");
-
-                // _i = 0
-                emitNodeWithoutSourceMap(counter);
-                write(" = 0");
-                emitEnd(node.expression);
-
-                // , _a = expr
-                write(", ");
-                emitStart(node.expression);
-                emitNodeWithoutSourceMap(rhsReference);
-                write(" = ");
-                emitNodeWithoutSourceMap(node.expression);
-                emitEnd(node.expression);
-
-                write("; ");
-
-                // _i < _a.length;
-                emitStart(node.expression);
-                emitNodeWithoutSourceMap(counter);
-                write(" < ");
-
-                emitNodeWithCommentsAndWithoutSourcemap(rhsReference);
-                write(".length");
-
-                emitEnd(node.expression);
-                write("; ");
-
-                // _i++)
-                emitStart(node.expression);
-                emitNodeWithoutSourceMap(counter);
-                write("++");
-                emitEnd(node.expression);
-                emitToken(SyntaxKind.CloseParenToken, node.expression.end);
-
-                // Body
-                write(" {");
-                writeLine();
-                increaseIndent();
-
-                // Initialize LHS
-                // let v = _a[_i];
-                const rhsIterationValue = createElementAccessExpression(rhsReference, counter);
-                emitStart(node.initializer);
-                if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    write("var ");
-                    const variableDeclarationList = <VariableDeclarationList>node.initializer;
-                    if (variableDeclarationList.declarations.length > 0) {
-                        const declaration = variableDeclarationList.declarations[0];
-                        if (isBindingPattern(declaration.name)) {
-                            // This works whether the declaration is a var, let, or const.
-                            // It will use rhsIterationValue _a[_i] as the initializer.
-                            emitDestructuring(declaration, /*isAssignmentExpressionStatement*/ false, rhsIterationValue);
-                        }
-                        else {
-                            // The following call does not include the initializer, so we have
-                            // to emit it separately.
-                            emitNodeWithCommentsAndWithoutSourcemap(declaration);
-                            write(" = ");
-                            emitNodeWithoutSourceMap(rhsIterationValue);
-                        }
-                    }
-                    else {
-                        // It's an empty declaration list. This can only happen in an error case, if the user wrote
-                        //     for (let of []) {}
-                        emitNodeWithoutSourceMap(createTempVariable(TempFlags.Auto));
-                        write(" = ");
-                        emitNodeWithoutSourceMap(rhsIterationValue);
-                    }
-                }
-                else {
-                    // Initializer is an expression. Emit the expression in the body, so that it's
-                    // evaluated on every iteration.
-                    const assignmentExpression = createBinaryExpression(<Expression>node.initializer, SyntaxKind.EqualsToken, rhsIterationValue, /*startsOnNewLine*/ false);
-                    if (node.initializer.kind === SyntaxKind.ArrayLiteralExpression || node.initializer.kind === SyntaxKind.ObjectLiteralExpression) {
-                        // This is a destructuring pattern, so call emitDestructuring instead of emit. Calling emit will not work, because it will cause
-                        // the BinaryExpression to be passed in instead of the expression statement, which will cause emitDestructuring to crash.
-                        emitDestructuring(assignmentExpression, /*isAssignmentExpressionStatement*/ true, /*value*/ undefined);
-                    }
-                    else {
-                        emitNodeWithCommentsAndWithoutSourcemap(assignmentExpression);
-                    }
-                }
-                emitEnd(node.initializer);
-                write(";");
-
-                if (loop) {
-                    writeLine();
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ false);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ false);
-                }
-
-                writeLine();
-                decreaseIndent();
-                write("}");
-            }
-
-            function emitBreakOrContinueStatement(node: BreakOrContinueStatement) {
-                if (convertedLoopState) {
-                    // check if we can emit break\continue as is
-                    // it is possible if either
-                    //   - break\continue is statement labeled and label is located inside the converted loop
-                    //   - break\continue is non-labeled and located in non-converted loop\switch statement
-                    const jump = node.kind === SyntaxKind.BreakStatement ? Jump.Break : Jump.Continue;
-                    const canUseBreakOrContinue =
-                        (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
-                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
-
-                    if (!canUseBreakOrContinue) {
-                        write ("return ");
-                        // explicit exit from loop -> copy out parameters
-                        copyLoopOutParameters(convertedLoopState, CopyDirection.ToOutParameter, /*emitAsStatements*/ false);
-                        if (!node.label) {
-                            if (node.kind === SyntaxKind.BreakStatement) {
-                                convertedLoopState.nonLocalJumps |= Jump.Break;
-                                write(`"break";`);
-                            }
-                            else {
-                                convertedLoopState.nonLocalJumps |= Jump.Continue;
-                                // note: return value is emitted only to simplify debugging, call to converted loop body does not do any dispatching on it.
-                                write(`"continue";`);
-                            }
-                        }
-                        else {
-                            let labelMarker: string;
-                            if (node.kind === SyntaxKind.BreakStatement) {
-                                labelMarker = `break-${node.label.text}`;
-                                setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
-                            }
-                            else {
-                                labelMarker = `continue-${node.label.text}`;
-                                setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
-                            }
-                            write(`"${labelMarker}";`);
-                        }
-
-                        return;
-                    }
-                }
-
-                emitToken(node.kind === SyntaxKind.BreakStatement ? SyntaxKind.BreakKeyword : SyntaxKind.ContinueKeyword, node.pos);
-                emitOptional(" ", node.label);
-                write(";");
-            }
-
-            function emitReturnStatement(node: ReturnStatement) {
-                if (convertedLoopState) {
-                    convertedLoopState.nonLocalJumps |= Jump.Return;
-                    write("return { value: ");
-                    if (node.expression) {
-                        emit(node.expression);
-                    }
-                    else {
-                        write("void 0");
-                    }
-                    write(" };");
-                    return;
-                }
-
-                emitToken(SyntaxKind.ReturnKeyword, node.pos);
-                emitOptional(" ", node.expression);
-                write(";");
-            }
-
-            function emitWithStatement(node: WithStatement) {
-                write("with (");
-                emit(node.expression);
-                write(")");
-                emitEmbeddedStatement(node.statement);
-            }
-
-            function emitSwitchStatement(node: SwitchStatement) {
-                let endPos = emitToken(SyntaxKind.SwitchKeyword, node.pos);
-                write(" ");
-                emitToken(SyntaxKind.OpenParenToken, endPos);
-                emit(node.expression);
-                endPos = emitToken(SyntaxKind.CloseParenToken, node.expression.end);
-                write(" ");
-
-                let saveAllowedNonLabeledJumps: Jump;
-                if (convertedLoopState) {
-                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
-                    // for switch statement allow only non-labeled break
-                    convertedLoopState.allowedNonLabeledJumps |= Jump.Break;
-                }
-                emitCaseBlock(node.caseBlock, endPos);
-                if (convertedLoopState) {
-                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
-                }
-            }
-
-            function emitCaseBlock(node: CaseBlock, startPos: number): void {
-                emitToken(SyntaxKind.OpenBraceToken, startPos);
-                increaseIndent();
-                emitLines(node.clauses);
-                decreaseIndent();
-                writeLine();
-                emitToken(SyntaxKind.CloseBraceToken, node.clauses.end);
-            }
-
-            function nodeStartPositionsAreOnSameLine(node1: Node, node2: Node) {
-                return getLineOfLocalPositionFromLineMap(currentLineMap, skipTrivia(currentText, node1.pos)) ===
-                    getLineOfLocalPositionFromLineMap(currentLineMap, skipTrivia(currentText, node2.pos));
-            }
-
-            function nodeEndPositionsAreOnSameLine(node1: Node, node2: Node) {
-                return getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
-                    getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
-            }
-
-            function nodeEndIsOnSameLineAsNodeStart(node1: TextRange, node2: TextRange) {
-                return getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
-                    getLineOfLocalPositionFromLineMap(currentLineMap, skipTrivia(currentText, node2.pos));
-            }
-
-            function emitCaseOrDefaultClause(node: CaseOrDefaultClause) {
-                if (node.kind === SyntaxKind.CaseClause) {
-                    write("case ");
-                    emit((<CaseClause>node).expression);
-                    write(":");
-                }
-                else {
-                    write("default:");
-                }
-
-                if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
-                    write(" ");
-                    emit(node.statements[0]);
-                }
-                else {
-                    increaseIndent();
-                    emitLines(node.statements);
-                    decreaseIndent();
-                }
-            }
-
-            function emitThrowStatement(node: ThrowStatement) {
-                write("throw ");
-                emit(node.expression);
-                write(";");
-            }
-
-            function emitTryStatement(node: TryStatement) {
-                write("try ");
-                emit(node.tryBlock);
-                emit(node.catchClause);
-                if (node.finallyBlock) {
-                    writeLine();
-                    write("finally ");
-                    emit(node.finallyBlock);
-                }
-            }
-
-            function emitCatchClause(node: CatchClause) {
-                writeLine();
-                const endPos = emitToken(SyntaxKind.CatchKeyword, node.pos);
-                write(" ");
-                emitToken(SyntaxKind.OpenParenToken, endPos);
-                emit(node.variableDeclaration);
-                emitToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : endPos);
-                write(" ");
-                emitBlock(node.block);
-            }
-
-            function emitDebuggerStatement(node: Node) {
-                emitToken(SyntaxKind.DebuggerKeyword, node.pos);
-                write(";");
-            }
-
-            function emitLabelAndColon(node: LabeledStatement): void {
-                emit(node.label);
-                write(": ");
-            }
-
-            function emitLabeledStatement(node: LabeledStatement) {
-                if (!isIterationStatement(node.statement, /* lookInLabeledStatements */ false) || !shouldConvertLoopBody(<IterationStatement>node.statement)) {
-                    emitLabelAndColon(node);
-                }
-
-                if (convertedLoopState) {
-                    if (!convertedLoopState.labels) {
-                        convertedLoopState.labels = createMap<string>();
-                    }
-                    convertedLoopState.labels[node.label.text] = node.label.text;
-                }
-
-                emit(node.statement);
-
-                if (convertedLoopState) {
-                    convertedLoopState.labels[node.label.text] = undefined;
-                }
-            }
-
-            function getContainingModule(node: Node): ModuleDeclaration {
-                do {
-                    node = node.parent;
-                } while (node && node.kind !== SyntaxKind.ModuleDeclaration);
-                return <ModuleDeclaration>node;
-            }
-
-            function emitContainingModuleName(node: Node) {
-                const container = getContainingModule(node);
-                write(container ? getGeneratedNameForNode(container) : "exports");
-            }
-
-            function emitModuleMemberName(node: Declaration) {
-                emitStart(node.name);
-                if (getCombinedNodeFlags(node) & NodeFlags.Export) {
-                    const container = getContainingModule(node);
-                    if (container) {
-                        write(getGeneratedNameForNode(container));
-                        write(".");
-                    }
-                    else if (modulekind !== ModuleKind.ES6 && modulekind !== ModuleKind.System) {
-                        write("exports.");
-                    }
-                }
-                emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                emitEnd(node.name);
-            }
-
-            function createVoidZero(): Expression {
-                const zero = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
-                zero.text = "0";
-                const result = <VoidExpression>createSynthesizedNode(SyntaxKind.VoidExpression);
-                result.expression = zero;
-                return result;
-            }
-
-            function emitEs6ExportDefaultCompat(node: Node) {
-                if (node.parent.kind === SyntaxKind.SourceFile) {
-                    Debug.assert(!!(node.flags & NodeFlags.Default) || node.kind === SyntaxKind.ExportAssignment);
-                    // only allow export default at a source file level
-                    if (modulekind === ModuleKind.CommonJS || modulekind === ModuleKind.AMD || modulekind === ModuleKind.UMD) {
-                        if (!isEs6Module) {
-                            if (languageVersion !== ScriptTarget.ES3) {
-                                // default value of configurable, enumerable, writable are `false`.
-                                write('Object.defineProperty(exports, "__esModule", { value: true });');
-                                writeLine();
-                            }
-                            else {
-                                write("exports.__esModule = true;");
-                                writeLine();
-                            }
-                        }
-                    }
-                }
-            }
-
-            function emitExportMemberAssignment(node: FunctionLikeDeclaration | ClassDeclaration) {
-                if (node.flags & NodeFlags.Export) {
-                    writeLine();
-                    emitStart(node);
-
-                    // emit call to exporter only for top level nodes
-                    if (modulekind === ModuleKind.System && node.parent === currentSourceFile) {
-                        // emit export default <smth> as
-                        // export("default", <smth>)
-                        write(`${exportFunctionForFile}("`);
-                        if (node.flags & NodeFlags.Default) {
-                            write("default");
-                        }
-                        else {
-                            emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                        }
-                        write(`", `);
-                        emitDeclarationName(node);
-                        write(")");
-                    }
-                    else {
-                        if (node.flags & NodeFlags.Default) {
-                            emitEs6ExportDefaultCompat(node);
-                            if (languageVersion === ScriptTarget.ES3) {
-                                write('exports["default"]');
-                            }
-                            else {
-                                write("exports.default");
-                            }
-                        }
-                        else {
-                            emitModuleMemberName(node);
-                        }
-                        write(" = ");
-                        emitDeclarationName(node);
-                    }
-                    emitEnd(node);
-                    write(";");
-                }
-            }
-
-            function emitExportMemberAssignments(name: Identifier) {
-                if (modulekind === ModuleKind.System) {
-                    return;
-                }
-
-                if (!exportEquals && exportSpecifiers && name.text in exportSpecifiers) {
-                    for (const specifier of exportSpecifiers[name.text]) {
-                        writeLine();
-                        emitStart(specifier.name);
-                        emitContainingModuleName(specifier);
-                        write(".");
-                        emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                        emitEnd(specifier.name);
-                        write(" = ");
-                        emitExpressionIdentifier(name);
-                        write(";");
-                    }
-                }
-            }
-
-            function emitExportSpecifierInSystemModule(specifier: ExportSpecifier): void {
-                Debug.assert(modulekind === ModuleKind.System);
-
-                if (!resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name) && !resolver.isValueAliasDeclaration(specifier) ) {
-                    return;
-                }
-
-                writeLine();
-                emitStart(specifier.name);
-                write(`${exportFunctionForFile}("`);
-                emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                write(`", `);
-                emitExpressionIdentifier(specifier.propertyName || specifier.name);
-                write(")");
-                emitEnd(specifier.name);
-                write(";");
-            }
-
-            /**
-             * Emit an assignment to a given identifier, 'name', with a given expression, 'value'.
-             * @param name an identifier as a left-hand-side operand of the assignment
-             * @param value an expression as a right-hand-side operand of the assignment
-             * @param shouldEmitCommaBeforeAssignment a boolean indicating whether to prefix an assignment with comma
-             */
-            function emitAssignment(name: Identifier, value: Expression, shouldEmitCommaBeforeAssignment: boolean, nodeForSourceMap: Node) {
-                if (shouldEmitCommaBeforeAssignment) {
-                    write(", ");
-                }
-
-                const exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(name);
-
-                if (exportChanged) {
-                    write(`${exportFunctionForFile}("`);
-                    emitNodeWithCommentsAndWithoutSourcemap(name);
-                    write(`", `);
-                }
-
-                const isVariableDeclarationOrBindingElement =
-                    name.parent && (name.parent.kind === SyntaxKind.VariableDeclaration || name.parent.kind === SyntaxKind.BindingElement);
-
-                // If this is first var declaration, we need to start at var/let/const keyword instead
-                // otherwise use nodeForSourceMap as the start position
-                emitStart(isFirstVariableDeclaration(nodeForSourceMap) ? nodeForSourceMap.parent : nodeForSourceMap);
-                withTemporaryNoSourceMap(() => {
-                    if (isVariableDeclarationOrBindingElement) {
-                        emitModuleMemberName(<Declaration>name.parent);
-                    }
-                    else {
-                        emit(name);
-                    }
-
-                    write(" = ");
-                    emit(value);
-                });
-                emitEnd(nodeForSourceMap, /*stopOverridingSpan*/true);
-
-                if (exportChanged) {
-                    write(")");
-                }
-            }
-
-            /**
-             * Create temporary variable, emit an assignment of the variable the given expression
-             * @param expression an expression to assign to the newly created temporary variable
-             * @param canDefineTempVariablesInPlace a boolean indicating whether you can define the temporary variable at an assignment location
-             * @param shouldEmitCommaBeforeAssignment a boolean indicating whether an assignment should prefix with comma
-             */
-            function emitTempVariableAssignment(expression: Expression, canDefineTempVariablesInPlace: boolean, shouldEmitCommaBeforeAssignment: boolean, sourceMapNode?: Node): Identifier {
-                const identifier = createTempVariable(TempFlags.Auto);
-                if (!canDefineTempVariablesInPlace) {
-                    recordTempDeclaration(identifier);
-                }
-                emitAssignment(identifier, expression, shouldEmitCommaBeforeAssignment, sourceMapNode || expression.parent);
-                return identifier;
-            }
-
-            function isFirstVariableDeclaration(root: Node) {
-                return root.kind === SyntaxKind.VariableDeclaration &&
-                    root.parent.kind === SyntaxKind.VariableDeclarationList &&
-                    (<VariableDeclarationList>root.parent).declarations[0] === root;
-            }
-
-            function emitDestructuring(root: BinaryExpression | VariableDeclaration | ParameterDeclaration, isAssignmentExpressionStatement: boolean, value?: Expression) {
-                let emitCount = 0;
-
-                // An exported declaration is actually emitted as an assignment (to a property on the module object), so
-                // temporary variables in an exported declaration need to have real declarations elsewhere
-                // Also temporary variables should be explicitly allocated for source level declarations when module target is system
-                // because actual variable declarations are hoisted
-                let canDefineTempVariablesInPlace = false;
-                if (root.kind === SyntaxKind.VariableDeclaration) {
-                    const isExported = getCombinedNodeFlags(root) & NodeFlags.Export;
-                    const isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
-                    canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
-                }
-                else if (root.kind === SyntaxKind.Parameter) {
-                    canDefineTempVariablesInPlace = true;
-                }
-
-                if (root.kind === SyntaxKind.BinaryExpression) {
-                    emitAssignmentExpression(<BinaryExpression>root);
-                }
-                else {
-                    Debug.assert(!isAssignmentExpressionStatement);
-                    // If first variable declaration of variable statement correct the start location
-                    if (isFirstVariableDeclaration(root)) {
-                        // Use emit location of "var " as next emit start entry
-                        sourceMap.changeEmitSourcePos();
-                    }
-                    emitBindingElement(<BindingElement>root, value);
-                }
-
-
-                /**
-                 * Ensures that there exists a declared identifier whose value holds the given expression.
-                 * This function is useful to ensure that the expression's value can be read from in subsequent expressions.
-                 * Unless 'reuseIdentifierExpressions' is false, 'expr' will be returned if it is just an identifier.
-                 *
-                 * @param expr the expression whose value needs to be bound.
-                 * @param reuseIdentifierExpressions true if identifier expressions can simply be returned;
-                 *                                   false if it is necessary to always emit an identifier.
-                 */
-                function ensureIdentifier(expr: Expression, reuseIdentifierExpressions: boolean, sourceMapNode: Node): Expression {
-                    if (expr.kind === SyntaxKind.Identifier && reuseIdentifierExpressions) {
-                        return expr;
-                    }
-
-                    const identifier = emitTempVariableAssignment(expr, canDefineTempVariablesInPlace, emitCount > 0, sourceMapNode);
-                    emitCount++;
-                    return identifier;
-                }
-
-                function createDefaultValueCheck(value: Expression, defaultValue: Expression, sourceMapNode: Node): Expression {
-                    // The value expression will be evaluated twice, so for anything but a simple identifier
-                    // we need to generate a temporary variable
-                    // If the temporary variable needs to be emitted use the source Map node for assignment of that statement
-                    value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, sourceMapNode);
-                    // Return the expression 'value === void 0 ? defaultValue : value'
-                    const equals = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression);
-                    equals.left = value;
-                    equals.operatorToken = createSynthesizedNode(SyntaxKind.EqualsEqualsEqualsToken);
-                    equals.right = createVoidZero();
-                    return createConditionalExpression(equals, defaultValue, value);
-                }
-
-                function createConditionalExpression(condition: Expression, whenTrue: Expression, whenFalse: Expression) {
-                    const cond = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
-                    cond.condition = condition;
-                    cond.questionToken = createSynthesizedNode(SyntaxKind.QuestionToken);
-                    cond.whenTrue = whenTrue;
-                    cond.colonToken = createSynthesizedNode(SyntaxKind.ColonToken);
-                    cond.whenFalse = whenFalse;
-                    return cond;
-                }
-
-                function createNumericLiteral(value: number) {
-                    const node = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
-                    node.text = "" + value;
-                    return node;
-                }
-
-                function createPropertyAccessForDestructuringProperty(object: Expression, propName: PropertyName): Expression {
-                    let index: Expression;
-                    const nameIsComputed = propName.kind === SyntaxKind.ComputedPropertyName;
-                    if (nameIsComputed) {
-                        // TODO to handle when we look into sourcemaps for computed properties, for now use propName
-                        index = ensureIdentifier((<ComputedPropertyName>propName).expression, /*reuseIdentifierExpressions*/ false, propName);
-                    }
-                    else {
-                        // We create a synthetic copy of the identifier in order to avoid the rewriting that might
-                        // otherwise occur when the identifier is emitted.
-                        index = <Identifier | LiteralExpression>createSynthesizedNode(propName.kind);
-                        // We need to unescape identifier here because when parsing an identifier prefixing with "__"
-                        // the parser need to append "_" in order to escape colliding with magic identifiers such as "__proto__"
-                        // Therefore, in order to correctly emit identifiers that are written in original TypeScript file,
-                        // we will unescapeIdentifier to remove additional underscore (if no underscore is added, the function will return original input string)
-                        (<Identifier | LiteralExpression>index).text = unescapeIdentifier((<Identifier | LiteralExpression>propName).text);
-                    }
-
-                    return !nameIsComputed && index.kind === SyntaxKind.Identifier
-                        ? createPropertyAccessExpression(object, <Identifier>index)
-                        : createElementAccessExpression(object, index);
-                }
-
-                function createSliceCall(value: Expression, sliceIndex: number): CallExpression {
-                    const call = <CallExpression>createSynthesizedNode(SyntaxKind.CallExpression);
-                    const sliceIdentifier = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-                    sliceIdentifier.text = "slice";
-                    call.expression = createPropertyAccessExpression(value, sliceIdentifier);
-                    call.arguments = <NodeArray<LiteralExpression>>createSynthesizedNodeArray();
-                    call.arguments[0] = createNumericLiteral(sliceIndex);
-                    return call;
-                }
-
-                function emitObjectLiteralAssignment(target: ObjectLiteralExpression, value: Expression, sourceMapNode: Node) {
-                    const properties = target.properties;
-                    if (properties.length !== 1) {
-                        // For anything but a single element destructuring we need to generate a temporary
-                        // to ensure value is evaluated exactly once.
-                        // When doing so we want to highlight the passed in source map node since thats the one needing this temp assignment
-                        value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, sourceMapNode);
-                    }
-                    for (const p of properties) {
-                        if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                            const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
-                            const target = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
-                            // Assignment for target = value.propName should highlight whole property, hence use p as source map node
-                            emitDestructuringAssignment(target, createPropertyAccessForDestructuringProperty(value, propName), p);
-                        }
-                    }
-                }
-
-                function emitArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, sourceMapNode: Node) {
-                    const elements = target.elements;
-                    if (elements.length !== 1) {
-                        // For anything but a single element destructuring we need to generate a temporary
-                        // to ensure value is evaluated exactly once.
-                        // When doing so we want to highlight the passed in source map node since thats the one needing this temp assignment
-                        value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, sourceMapNode);
-                    }
-                    for (let i = 0; i < elements.length; i++) {
-                        const e = elements[i];
-                        if (e.kind !== SyntaxKind.OmittedExpression) {
-                            // Assignment for target = value.propName should highlight whole property, hence use e as source map node
-                            if (e.kind !== SyntaxKind.SpreadElementExpression) {
-                                emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)), e);
-                            }
-                            else if (i === elements.length - 1) {
-                                emitDestructuringAssignment((<SpreadElementExpression>e).expression, createSliceCall(value, i), e);
-                            }
-                        }
-                    }
-                }
-
-                function emitDestructuringAssignment(target: Expression | ShorthandPropertyAssignment, value: Expression, sourceMapNode: Node) {
-                    // When emitting target = value use source map node to highlight, including any temporary assignments needed for this
-                    if (target.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                        if ((<ShorthandPropertyAssignment>target).objectAssignmentInitializer) {
-                            value = createDefaultValueCheck(value, (<ShorthandPropertyAssignment>target).objectAssignmentInitializer, sourceMapNode);
-                        }
-                        target = (<ShorthandPropertyAssignment>target).name;
-                    }
-                    else if (target.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>target).operatorToken.kind === SyntaxKind.EqualsToken) {
-                        value = createDefaultValueCheck(value, (<BinaryExpression>target).right, sourceMapNode);
-                        target = (<BinaryExpression>target).left;
-                    }
-                    if (target.kind === SyntaxKind.ObjectLiteralExpression) {
-                        emitObjectLiteralAssignment(<ObjectLiteralExpression>target, value, sourceMapNode);
-                    }
-                    else if (target.kind === SyntaxKind.ArrayLiteralExpression) {
-                        emitArrayLiteralAssignment(<ArrayLiteralExpression>target, value, sourceMapNode);
-                    }
-                    else {
-                        emitAssignment(<Identifier>target, value, /*shouldEmitCommaBeforeAssignment*/ emitCount > 0, sourceMapNode);
-                        emitCount++;
-                    }
-                }
-
-                function emitAssignmentExpression(root: BinaryExpression) {
-                    const target = root.left;
-                    let value = root.right;
-
-                    if (isEmptyObjectLiteralOrArrayLiteral(target)) {
-                        emit(value);
-                    }
-                    else if (isAssignmentExpressionStatement) {
-                        // Source map node for root.left = root.right is root
-                        // but if root is synthetic, which could be in below case, use the target which is { a }
-                        // for ({a} of {a: string}) {
-                        // }
-                        emitDestructuringAssignment(target, value, nodeIsSynthesized(root) ? target : root);
-                    }
-                    else {
-                        if (root.parent.kind !== SyntaxKind.ParenthesizedExpression) {
-                            write("(");
-                        }
-                        // Temporary assignment needed to emit root should highlight whole binary expression
-                        value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, root);
-                        // Source map node for root.left = root.right is root
-                        emitDestructuringAssignment(target, value, root);
-                        write(", ");
-                        emit(value);
-                        if (root.parent.kind !== SyntaxKind.ParenthesizedExpression) {
-                            write(")");
-                        }
-                    }
-                }
-
-                function emitBindingElement(target: BindingElement | VariableDeclaration, value: Expression) {
-                    // Any temporary assignments needed to emit target = value should point to target
-                    if (target.initializer) {
-                        // Combine value and initializer
-                        value = value ? createDefaultValueCheck(value, target.initializer, target) : target.initializer;
-                    }
-                    else if (!value) {
-                        // Use 'void 0' in absence of value and initializer
-                        value = createVoidZero();
-                    }
-                    if (isBindingPattern(target.name)) {
-                        const pattern = <BindingPattern>target.name;
-                        const elements = pattern.elements;
-                        const numElements = elements.length;
-
-                        if (numElements !== 1) {
-                            // For anything other than a single-element destructuring we need to generate a temporary
-                            // to ensure value is evaluated exactly once. Additionally, if we have zero elements
-                            // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
-                            // so in that case, we'll intentionally create that temporary.
-                            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target);
-                        }
-
-                        for (let i = 0; i < numElements; i++) {
-                            const element = elements[i];
-                            if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
-                                // Rewrite element to a declaration with an initializer that fetches property
-                                const propName = element.propertyName || <Identifier>element.name;
-                                emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
-                            }
-                            else if (element.kind !== SyntaxKind.OmittedExpression) {
-                                if (!element.dotDotDotToken) {
-                                    // Rewrite element to a declaration that accesses array element at index i
-                                    emitBindingElement(element, createElementAccessExpression(value, createNumericLiteral(i)));
-                                }
-                                else if (i === numElements - 1) {
-                                    emitBindingElement(element, createSliceCall(value, i));
-                                }
-                            }
-                        }
-                    }
-                    else {
-                        emitAssignment(<Identifier>target.name, value, /*shouldEmitCommaBeforeAssignment*/ emitCount > 0, target);
-                        emitCount++;
-                    }
-                }
-            }
-
-            function emitVariableDeclaration(node: VariableDeclaration) {
-                if (isBindingPattern(node.name)) {
-                    const isExported = getCombinedNodeFlags(node) & NodeFlags.Export;
-                    if (languageVersion >= ScriptTarget.ES6 && (!isExported || modulekind === ModuleKind.ES6)) {
-                        // emit ES6 destructuring only if target module is ES6 or variable is not exported
-                        // exported variables in CJS/AMD are prefixed with 'exports.' so result javascript { exports.toString } = 1; is illegal
-
-                        const isTopLevelDeclarationInSystemModule =
-                            modulekind === ModuleKind.System &&
-                            shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/true);
-
-                        if (isTopLevelDeclarationInSystemModule) {
-                            // In System modules top level variables are hoisted
-                            // so variable declarations with destructuring are turned into destructuring assignments.
-                            // As a result, they will need parentheses to disambiguate object binding assignments from blocks.
-                            write("(");
-                        }
-
-                        emit(node.name);
-                        emitOptional(" = ", node.initializer);
-
-                        if (isTopLevelDeclarationInSystemModule) {
-                            write(")");
-                        }
-                    }
-                    else {
-                        emitDestructuring(node, /*isAssignmentExpressionStatement*/ false);
-                    }
-                }
-                else {
-                    let initializer = node.initializer;
-                    if (!initializer &&
-                        languageVersion < ScriptTarget.ES6 &&
-                        // for names - binding patterns that lack initializer there is no point to emit explicit initializer
-                        // since downlevel codegen for destructuring will fail in the absence of initializer so all binding elements will say uninitialized
-                        node.name.kind === SyntaxKind.Identifier) {
-
-                        const container = getEnclosingBlockScopeContainer(node);
-                        const flags = resolver.getNodeCheckFlags(node);
-
-                        // nested let bindings might need to be initialized explicitly to preserve ES6 semantic
-                        // { let x = 1; }
-                        // { let x; } // x here should be undefined. not 1
-                        // NOTES:
-                        // Top level bindings never collide with anything and thus don't require explicit initialization.
-                        // As for nested let bindings there are two cases:
-                        // - nested let bindings that were not renamed definitely should be initialized explicitly
-                        //   { let x = 1; }
-                        //   { let x; if (some-condition) { x = 1}; if (x) { /*1*/ } }
-                        //   Without explicit initialization code in /*1*/ can be executed even if some-condition is evaluated to false
-                        // - renaming introduces fresh name that should not collide with any existing names, however renamed bindings sometimes also should be
-                        //   explicitly initialized. One particular case: non-captured binding declared inside loop body (but not in loop initializer)
-                        //   let x;
-                        //   for (;;) {
-                        //       let x;
-                        //   }
-                        //   in downlevel codegen inner 'x' will be renamed so it won't collide with outer 'x' however it will should be reset on every iteration
-                        //   as if it was declared anew.
-                        //   * Why non-captured binding - because if loop contains block scoped binding captured in some function then loop body will be rewritten
-                        //   to have a fresh scope on every iteration so everything will just work.
-                        //   * Why loop initializer is excluded - since we've introduced a fresh name it already will be undefined.
-                        const isCapturedInFunction = flags & NodeCheckFlags.CapturedBlockScopedBinding;
-                        const isDeclaredInLoop = flags & NodeCheckFlags.BlockScopedBindingInLoop;
-
-                        const emittedAsTopLevel =
-                            isBlockScopedContainerTopLevel(container) ||
-                            (isCapturedInFunction && isDeclaredInLoop && container.kind === SyntaxKind.Block && isIterationStatement(container.parent, /*lookInLabeledStatements*/ false));
-
-                        const emittedAsNestedLetDeclaration =
-                            getCombinedNodeFlags(node) & NodeFlags.Let &&
-                            !emittedAsTopLevel;
-
-                        const emitExplicitInitializer =
-                            emittedAsNestedLetDeclaration &&
-                            container.kind !== SyntaxKind.ForInStatement &&
-                            container.kind !== SyntaxKind.ForOfStatement &&
-                            (
-                                !resolver.isDeclarationWithCollidingName(node) ||
-                                (isDeclaredInLoop && !isCapturedInFunction && !isIterationStatement(container, /*lookInLabeledStatements*/ false))
-                            );
-                        if (emitExplicitInitializer) {
-                            initializer = createVoidZero();
-                        }
-                    }
-
-                    const exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.name);
-
-                    if (exportChanged) {
-                        write(`${exportFunctionForFile}("`);
-                        emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                        write(`", `);
-                    }
-
-                    emitModuleMemberName(node);
-                    emitOptional(" = ", initializer);
-
-                    if (exportChanged) {
-                        write(")");
-                    }
-                }
-            }
-
-            function emitExportVariableAssignments(node: VariableDeclaration | BindingElement) {
-                if (node.kind === SyntaxKind.OmittedExpression) {
-                    return;
-                }
-                const name = node.name;
-                if (name.kind === SyntaxKind.Identifier) {
-                    emitExportMemberAssignments(<Identifier>name);
-                }
-                else if (isBindingPattern(name)) {
-                    forEach((<BindingPattern>name).elements, emitExportVariableAssignments);
-                }
-            }
-
-            function isES6ExportedDeclaration(node: Node) {
-                return !!(node.flags & NodeFlags.Export) &&
-                    modulekind === ModuleKind.ES6 &&
-                    node.parent.kind === SyntaxKind.SourceFile;
-            }
-
-            function emitVariableStatement(node: VariableStatement) {
-                let startIsEmitted = false;
-
-                if (node.flags & NodeFlags.Export) {
-                    if (isES6ExportedDeclaration(node)) {
-                        // Exported ES6 module member
-                        write("export ");
-                        startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
-                    }
-                }
-                else {
-                    startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
-                }
-
-                if (startIsEmitted) {
-                    emitCommaList(node.declarationList.declarations);
-                    write(";");
-                }
-                else {
-                    const atLeastOneItem = emitVariableDeclarationListSkippingUninitializedEntries(node.declarationList);
-                    if (atLeastOneItem) {
-                        write(";");
-                    }
-                }
-                if (modulekind !== ModuleKind.ES6 && node.parent === currentSourceFile) {
-                    forEach(node.declarationList.declarations, emitExportVariableAssignments);
-                }
-            }
-
-            function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node: VariableStatement) {
-                // If we're not exporting the variables, there's nothing special here.
-                // Always emit comments for these nodes.
-                if (!(node.flags & NodeFlags.Export)) {
-                    return true;
-                }
-
-                // If we are exporting, but it's a top-level ES6 module exports,
-                // we'll emit the declaration list verbatim, so emit comments too.
-                if (isES6ExportedDeclaration(node)) {
-                    return true;
-                }
-
-                // Otherwise, only emit if we have at least one initializer present.
-                for (const declaration of node.declarationList.declarations) {
-                    if (declaration.initializer) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            function emitParameter(node: ParameterDeclaration) {
-                if (languageVersion < ScriptTarget.ES6) {
-                    if (isBindingPattern(node.name)) {
-                        const name = createTempVariable(TempFlags.Auto);
-                        if (!tempParameters) {
-                            tempParameters = [];
-                        }
-                        tempParameters.push(name);
-                        emit(name);
-                    }
-                    else {
-                        emit(node.name);
-                    }
-                }
-                else {
-                    if (node.dotDotDotToken) {
-                        write("...");
-                    }
-                    emit(node.name);
-                    emitOptional(" = ", node.initializer);
-                }
-            }
-
-            function emitDefaultValueAssignments(node: FunctionLikeDeclaration) {
-                if (languageVersion < ScriptTarget.ES6) {
-                    let tempIndex = 0;
-                    forEach(node.parameters, parameter => {
-                        // A rest parameter cannot have a binding pattern or an initializer,
-                        // so let's just ignore it.
-                        if (parameter.dotDotDotToken) {
-                            return;
-                        }
-
-                        const { name: paramName, initializer } = parameter;
-                        if (isBindingPattern(paramName)) {
-                            // In cases where a binding pattern is simply '[]' or '{}',
-                            // we usually don't want to emit a var declaration; however, in the presence
-                            // of an initializer, we must emit that expression to preserve side effects.
-                            const hasBindingElements = paramName.elements.length > 0;
-                            if (hasBindingElements || initializer) {
-                                writeLine();
-                                write("var ");
-
-                                if (hasBindingElements) {
-                                    emitDestructuring(parameter, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex]);
-                                }
-                                else {
-                                    emit(tempParameters[tempIndex]);
-                                    write(" = ");
-                                    emit(initializer);
-                                }
-
-                                write(";");
-                            }
-                            // Regardless of whether we will emit a var declaration for the binding pattern, we generate the temporary
-                            // variable for the parameter (see: emitParameter)
-                            tempIndex++;
-                        }
-                        else if (initializer) {
-                            writeLine();
-                            emitStart(parameter);
-                            write("if (");
-                            emitNodeWithoutSourceMap(paramName);
-                            write(" === void 0)");
-                            emitEnd(parameter);
-                            write(" { ");
-                            emitStart(parameter);
-                            emitNodeWithCommentsAndWithoutSourcemap(paramName);
-                            write(" = ");
-                            emitNodeWithCommentsAndWithoutSourcemap(initializer);
-                            emitEnd(parameter);
-                            write("; }");
-                        }
-                    });
-                }
-            }
-
-            function emitRestParameter(node: FunctionLikeDeclaration) {
-                if (languageVersion < ScriptTarget.ES6 && hasDeclaredRestParameter(node)) {
-                    const restParam = node.parameters[node.parameters.length - 1];
-
-                    // A rest parameter cannot have a binding pattern, so let's just ignore it if it does.
-                    if (isBindingPattern(restParam.name)) {
-                        return;
-                    }
-
-                    const skipThisCount = node.parameters.length && (<Identifier>node.parameters[0].name).originalKeywordKind === SyntaxKind.ThisKeyword ? 1 : 0;
-                    const restIndex = node.parameters.length - 1 - skipThisCount;
-                    const tempName = createTempVariable(TempFlags._i).text;
-                    writeLine();
-                    emitLeadingComments(restParam);
-                    emitStart(restParam);
-                    write("var ");
-                    emitNodeWithCommentsAndWithoutSourcemap(restParam.name);
-                    write(" = [];");
-                    emitEnd(restParam);
-                    emitTrailingComments(restParam);
-                    writeLine();
-                    write("for (");
-                    emitStart(restParam);
-                    write("var " + tempName + " = " + restIndex + ";");
-                    emitEnd(restParam);
-                    write(" ");
-                    emitStart(restParam);
-                    write(tempName + " < arguments.length;");
-                    emitEnd(restParam);
-                    write(" ");
-                    emitStart(restParam);
-                    write(tempName + "++");
-                    emitEnd(restParam);
-                    write(") {");
-                    increaseIndent();
-                    writeLine();
-                    emitStart(restParam);
-                    emitNodeWithCommentsAndWithoutSourcemap(restParam.name);
-                    write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
-                    emitEnd(restParam);
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-            }
-
-            function emitAccessor(node: AccessorDeclaration) {
-                write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
-                emit(node.name);
-                emitSignatureAndBody(node);
-            }
-
-            function shouldEmitAsArrowFunction(node: FunctionLikeDeclaration): boolean {
-                return node.kind === SyntaxKind.ArrowFunction && languageVersion >= ScriptTarget.ES6;
-            }
-
-            function emitDeclarationName(node: Declaration) {
-                if (node.name) {
-                    emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                }
-                else {
-                    write(getGeneratedNameForNode(node));
-                }
-            }
-
-            function shouldEmitFunctionName(node: FunctionLikeDeclaration) {
-                if (node.kind === SyntaxKind.FunctionExpression) {
-                    // Emit name if one is present
-                    return !!node.name;
-                }
-                if (node.kind === SyntaxKind.FunctionDeclaration) {
-                    // Emit name if one is present, or emit generated name in down-level case (for export default case)
-                    return !!node.name || modulekind !== ModuleKind.ES6;
-                }
-            }
-
-            function emitFunctionDeclaration(node: FunctionLikeDeclaration) {
-                if (nodeIsMissing(node.body)) {
-                    return emitCommentsOnNotEmittedNode(node);
-                }
-
-                // TODO (yuisu) : we should not have special cases to condition emitting comments
-                // but have one place to fix check for these conditions.
-                const { kind, parent } = node;
-                if (kind !== SyntaxKind.MethodDeclaration &&
-                    kind !== SyntaxKind.MethodSignature &&
-                    parent &&
-                    parent.kind !== SyntaxKind.PropertyAssignment &&
-                    parent.kind !== SyntaxKind.CallExpression &&
-                    parent.kind !== SyntaxKind.ArrayLiteralExpression) {
-                    // 1. Methods will emit comments at their assignment declaration sites.
-                    //
-                    // 2. If the function is a property of object literal, emitting leading-comments
-                    //    is done by emitNodeWithoutSourceMap which then call this function.
-                    //    In particular, we would like to avoid emit comments twice in following case:
-                    //
-                    //          var obj = {
-                    //              id:
-                    //                  /*comment*/ () => void
-                    //          }
-                    //
-                    // 3. If the function is an argument in call expression, emitting of comments will be
-                    //    taken care of in emit list of arguments inside of 'emitCallExpression'.
-                    //
-                    // 4. If the function is in an array literal, 'emitLinePreservingList' will take care
-                    //    of leading comments.
-                    emitLeadingComments(node);
-                }
-
-                emitStart(node);
-                // For targeting below es6, emit functions-like declaration including arrow function using function keyword.
-                // When targeting ES6, emit arrow function natively in ES6 by omitting function keyword and using fat arrow instead
-                if (!shouldEmitAsArrowFunction(node)) {
-                    if (isES6ExportedDeclaration(node)) {
-                        write("export ");
-                        if (node.flags & NodeFlags.Default) {
-                            write("default ");
-                        }
-                    }
-
-                    write("function");
-                    if (languageVersion >= ScriptTarget.ES6 && node.asteriskToken) {
-                        write("*");
-                    }
-                    write(" ");
-                }
-
-                if (shouldEmitFunctionName(node)) {
-                    emitDeclarationName(node);
-                }
-
-                emitSignatureAndBody(node);
-                if (modulekind !== ModuleKind.ES6 && kind === SyntaxKind.FunctionDeclaration && parent === currentSourceFile && node.name) {
-                    emitExportMemberAssignments((<FunctionDeclaration>node).name);
-                }
-
-                emitEnd(node);
-                if (kind !== SyntaxKind.MethodDeclaration &&
-                    kind !== SyntaxKind.MethodSignature &&
-                    kind !== SyntaxKind.ArrowFunction) {
-                    emitTrailingComments(node);
-                }
-            }
-
-            function emitCaptureThisForNodeIfNecessary(node: Node): void {
-                if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureThis) {
-                    writeLine();
-                    emitStart(node);
-                    write("var _this = this;");
-                    emitEnd(node);
-                }
-            }
-
-            function emitSignatureParameters(node: FunctionLikeDeclaration) {
-                increaseIndent();
-                write("(");
-                if (node) {
-                    const parameters = node.parameters;
-                    const skipCount = node.parameters.length && (<Identifier>node.parameters[0].name).originalKeywordKind === SyntaxKind.ThisKeyword ? 1 : 0;
-                    const omitCount = languageVersion < ScriptTarget.ES6 && hasDeclaredRestParameter(node) ? 1 : 0;
-                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, /*multiLine*/ false, /*trailingComma*/ false);
-                }
-                write(")");
-                decreaseIndent();
-            }
-
-            function emitSignatureParametersForArrow(node: FunctionLikeDeclaration) {
-                // Check whether the parameter list needs parentheses and preserve no-parenthesis
-                if (node.parameters.length === 1 && node.pos === node.parameters[0].pos) {
-                    emit(node.parameters[0]);
-                    return;
-                }
-
-                emitSignatureParameters(node);
-            }
-
-            function emitAsyncFunctionBodyForES6(node: FunctionLikeDeclaration) {
-                const promiseConstructor = getEntityNameFromTypeNode(node.type);
-                const isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
-                const hasLexicalArguments = (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureArguments) !== 0;
-
-                // An async function is emit as an outer function that calls an inner
-                // generator function. To preserve lexical bindings, we pass the current
-                // `this` and `arguments` objects to `__awaiter`. The generator function
-                // passed to `__awaiter` is executed inside of the callback to the
-                // promise constructor.
-                //
-                // The emit for an async arrow without a lexical `arguments` binding might be:
-                //
-                //  // input
-                //  let a = async (b) => { await b; }
-                //
-                //  // output
-                //  let a = (b) => __awaiter(this, void 0, void 0, function* () {
-                //      yield b;
-                //  });
-                //
-                // The emit for an async arrow with a lexical `arguments` binding might be:
-                //
-                //  // input
-                //  let a = async (b) => { await arguments[0]; }
-                //
-                //  // output
-                //  let a = (b) => __awaiter(this, arguments, void 0, function* (arguments) {
-                //      yield arguments[0];
-                //  });
-                //
-                // The emit for an async function expression without a lexical `arguments` binding
-                // might be:
-                //
-                //  // input
-                //  let a = async function (b) {
-                //      await b;
-                //  }
-                //
-                //  // output
-                //  let a = function (b) {
-                //      return __awaiter(this, void 0, void 0, function* () {
-                //          yield b;
-                //      });
-                //  }
-                //
-                // The emit for an async function expression with a lexical `arguments` binding
-                // might be:
-                //
-                //  // input
-                //  let a = async function (b) {
-                //      await arguments[0];
-                //  }
-                //
-                //  // output
-                //  let a = function (b) {
-                //      return __awaiter(this, arguments, void 0, function* (_arguments) {
-                //          yield _arguments[0];
-                //      });
-                //  }
-                //
-                // The emit for an async function expression with a lexical `arguments` binding
-                // and a return type annotation might be:
-                //
-                //  // input
-                //  let a = async function (b): MyPromise<any> {
-                //      await arguments[0];
-                //  }
-                //
-                //  // output
-                //  let a = function (b) {
-                //      return __awaiter(this, arguments, MyPromise, function* (_arguments) {
-                //          yield _arguments[0];
-                //      });
-                //  }
-                //
-
-                // If this is not an async arrow, emit the opening brace of the function body
-                // and the start of the return statement.
-                if (!isArrowFunction) {
-                    write(" {");
-                    increaseIndent();
-                    writeLine();
-
-                    if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuperBinding) {
-                        writeLines(`
-const _super = (function (geti, seti) {
-    const cache = Object.create(null);
-    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
-})(name => super[name], (name, value) => super[name] = value);`);
-                        writeLine();
-                    }
-                    else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) {
-                        write(`const _super = name => super[name];`);
-                        writeLine();
-                    }
-
-                    write("return");
-                }
-
-                write(" __awaiter(this");
-                if (hasLexicalArguments) {
-                    write(", arguments, ");
-                }
-                else {
-                    write(", void 0, ");
-                }
-
-                if (languageVersion >= ScriptTarget.ES6 || !promiseConstructor) {
-                    write("void 0");
-                }
-                else {
-                    emitEntityNameAsExpression(promiseConstructor, /*useFallback*/ false);
-                }
-
-                // Emit the call to __awaiter.
-                write(", function* ()");
-
-                // Emit the signature and body for the inner generator function.
-                emitFunctionBody(node);
-                write(")");
-
-                // If this is not an async arrow, emit the closing brace of the outer function body.
-                if (!isArrowFunction) {
-                    write(";");
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-            }
-
-            function emitFunctionBody(node: FunctionLikeDeclaration) {
-                if (!node.body) {
-                    // There can be no body when there are parse errors.  Just emit an empty block
-                    // in that case.
-                    write(" { }");
-                }
-                else {
-                    if (node.body.kind === SyntaxKind.Block) {
-                        emitBlockFunctionBody(node, <Block>node.body);
-                    }
-                    else {
-                        emitExpressionFunctionBody(node, <Expression>node.body);
-                    }
-                }
-            }
-
-            function emitSignatureAndBody(node: FunctionLikeDeclaration) {
-                const saveConvertedLoopState = convertedLoopState;
-                const saveTempFlags = tempFlags;
-                const saveTempVariables = tempVariables;
-                const saveTempParameters = tempParameters;
-
-                convertedLoopState = undefined;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-
-                // When targeting ES6, emit arrow function natively in ES6
-                if (shouldEmitAsArrowFunction(node)) {
-                    emitSignatureParametersForArrow(node);
-                    write(" =>");
-                }
-                else {
-                    emitSignatureParameters(node);
-                }
-
-                const isAsync = isAsyncFunctionLike(node);
-                if (isAsync) {
-                    emitAsyncFunctionBodyForES6(node);
-                }
-                else {
-                    emitFunctionBody(node);
-                }
-
-                if (!isES6ExportedDeclaration(node)) {
-                    emitExportMemberAssignment(node);
-                }
-
-                Debug.assert(convertedLoopState === undefined);
-                convertedLoopState = saveConvertedLoopState;
-
-                tempFlags = saveTempFlags;
-                tempVariables = saveTempVariables;
-                tempParameters = saveTempParameters;
-            }
-
-            // Returns true if any preamble code was emitted.
-            function emitFunctionBodyPreamble(node: FunctionLikeDeclaration): void {
-                emitCaptureThisForNodeIfNecessary(node);
-                emitDefaultValueAssignments(node);
-                emitRestParameter(node);
-            }
-
-            function emitExpressionFunctionBody(node: FunctionLikeDeclaration, body: Expression) {
-                if (languageVersion < ScriptTarget.ES6 || node.flags & NodeFlags.Async) {
-                    emitDownLevelExpressionFunctionBody(node, body);
-                    return;
-                }
-
-                // For es6 and higher we can emit the expression as is.  However, in the case
-                // where the expression might end up looking like a block when emitted, we'll
-                // also wrap it in parentheses first.  For example if you have: a => <foo>{}
-                // then we need to generate: a => ({})
-                write(" ");
-
-                // Unwrap all type assertions.
-                let current = body;
-                while (current.kind === SyntaxKind.TypeAssertionExpression) {
-                    current = (<TypeAssertion>current).expression;
-                }
-
-                emitParenthesizedIf(body, current.kind === SyntaxKind.ObjectLiteralExpression);
-            }
-
-            function emitDownLevelExpressionFunctionBody(node: FunctionLikeDeclaration, body: Expression) {
-                write(" {");
-                increaseIndent();
-                const outPos = writer.getTextPos();
-                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
-                emitFunctionBodyPreamble(node);
-                const preambleEmitted = writer.getTextPos() !== outPos;
-                decreaseIndent();
-
-                // If we didn't have to emit any preamble code, then attempt to keep the arrow
-                // function on one line.
-                if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
-                    write(" ");
-                    emitStart(body);
-                    write("return ");
-                    emit(body);
-                    emitEnd(body);
-                    write(";");
-                    emitTempDeclarations(/*newLine*/ false);
-                    write(" ");
-                }
-                else {
-                    increaseIndent();
-                    writeLine();
-                    emitLeadingComments(node.body);
-                    emitStart(body);
-                    write("return ");
-                    emit(body);
-                    emitEnd(body);
-                    write(";");
-                    emitTrailingComments(node.body);
-
-                    emitTempDeclarations(/*newLine*/ true);
-                    decreaseIndent();
-                    writeLine();
-                }
-
-                emitStart(node.body);
-                write("}");
-                emitEnd(node.body);
-            }
-
-            function emitBlockFunctionBody(node: FunctionLikeDeclaration, body: Block) {
-                write(" {");
-                const initialTextPos = writer.getTextPos();
-
-                increaseIndent();
-                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
-
-                // Emit all the directive prologues (like "use strict").  These have to come before
-                // any other preamble code we write (like parameter initializers).
-                const startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
-                emitFunctionBodyPreamble(node);
-                decreaseIndent();
-
-                const preambleEmitted = writer.getTextPos() !== initialTextPos;
-
-                if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
-                    for (const statement of body.statements) {
-                        write(" ");
-                        emit(statement);
-                    }
-                    emitTempDeclarations(/*newLine*/ false);
-                    write(" ");
-                    emitLeadingCommentsOfPosition(body.statements.end);
-                }
-                else {
-                    increaseIndent();
-                    emitLinesStartingAt(body.statements, startIndex);
-                    emitTempDeclarations(/*newLine*/ true);
-
-                    writeLine();
-                    emitLeadingCommentsOfPosition(body.statements.end);
-                    decreaseIndent();
-                }
-
-                emitToken(SyntaxKind.CloseBraceToken, body.statements.end);
-            }
-
-            /**
-             * Return the statement at a given index if it is a super-call statement
-             * @param ctor a constructor declaration
-             * @param index an index to constructor's body to check
-             */
-            function getSuperCallAtGivenIndex(ctor: ConstructorDeclaration, index: number): ExpressionStatement {
-                if (!ctor.body) {
-                    return undefined;
-                }
-                const statements = ctor.body.statements;
-
-                if (!statements || index >= statements.length) {
-                    return undefined;
-                }
-
-                const statement = statements[index];
-                if (statement.kind === SyntaxKind.ExpressionStatement) {
-                    return isSuperCallExpression((<ExpressionStatement>statement).expression) ? <ExpressionStatement>statement : undefined;
-                }
-            }
-
-            function emitParameterPropertyAssignments(node: ConstructorDeclaration) {
-                forEach(node.parameters, param => {
-                    if (param.flags & NodeFlags.ParameterPropertyModifier) {
-                        writeLine();
-                        emitStart(param);
-                        emitStart(param.name);
-                        write("this.");
-                        emitNodeWithoutSourceMap(param.name);
-                        emitEnd(param.name);
-                        write(" = ");
-                        emit(param.name);
-                        write(";");
-                        emitEnd(param);
-                    }
-                });
-            }
-
-            function emitMemberAccessForPropertyName(memberName: DeclarationName) {
-                // This does not emit source map because it is emitted by caller as caller
-                // is aware how the property name changes to the property access
-                // eg. public x = 10; becomes this.x and static x = 10 becomes className.x
-                if (memberName.kind === SyntaxKind.StringLiteral || memberName.kind === SyntaxKind.NumericLiteral) {
-                    write("[");
-                    emitNodeWithCommentsAndWithoutSourcemap(memberName);
-                    write("]");
-                }
-                else if (memberName.kind === SyntaxKind.ComputedPropertyName) {
-                    emitComputedPropertyName(<ComputedPropertyName>memberName);
-                }
-                else {
-                    write(".");
-                    emitNodeWithCommentsAndWithoutSourcemap(memberName);
-                }
-            }
-
-            function getInitializedProperties(node: ClassLikeDeclaration, isStatic: boolean) {
-                const properties: PropertyDeclaration[] = [];
-                for (const member of node.members) {
-                    if (member.kind === SyntaxKind.PropertyDeclaration && isStatic === ((member.flags & NodeFlags.Static) !== 0) && (<PropertyDeclaration>member).initializer) {
-                        properties.push(<PropertyDeclaration>member);
-                    }
-                }
-
-                return properties;
-            }
-
-            function emitPropertyDeclarations(node: ClassLikeDeclaration, properties: PropertyDeclaration[]) {
-                for (const property of properties) {
-                    emitPropertyDeclaration(node, property);
-                }
-            }
-
-            function emitPropertyDeclaration(node: ClassLikeDeclaration, property: PropertyDeclaration, receiver?: string, isExpression?: boolean) {
-                writeLine();
-                emitLeadingComments(property);
-                emitStart(property);
-                emitStart(property.name);
-                if (receiver) {
-                    write(receiver);
-                }
-                else {
-                    if (property.flags & NodeFlags.Static) {
-                        emitDeclarationName(node);
-                    }
-                    else {
-                        write("this");
-                    }
-                }
-                emitMemberAccessForPropertyName(property.name);
-                emitEnd(property.name);
-                write(" = ");
-                emit(property.initializer);
-                if (!isExpression) {
-                    write(";");
-                }
-
-                emitEnd(property);
-                emitTrailingComments(property);
-            }
-
-            function emitMemberFunctionsForES5AndLower(node: ClassLikeDeclaration) {
-                forEach(node.members, member => {
-                    if (member.kind === SyntaxKind.SemicolonClassElement) {
-                        writeLine();
-                        write(";");
-                    }
-                    else if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) {
-                        if (!(<MethodDeclaration>member).body) {
-                            return emitCommentsOnNotEmittedNode(member);
-                        }
-
-                        writeLine();
-                        emitLeadingComments(member);
-                        emitStart(member);
-                        emitStart((<MethodDeclaration>member).name);
-                        emitClassMemberPrefix(node, member);
-                        emitMemberAccessForPropertyName((<MethodDeclaration>member).name);
-                        emitEnd((<MethodDeclaration>member).name);
-                        write(" = ");
-                        emitFunctionDeclaration(<MethodDeclaration>member);
-                        emitEnd(member);
-                        write(";");
-                        emitTrailingComments(member);
-                    }
-                    else if (member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
-                        const accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
-                        if (member === accessors.firstAccessor) {
-                            writeLine();
-                            emitStart(member);
-                            write("Object.defineProperty(");
-                            emitStart((<AccessorDeclaration>member).name);
-                            emitClassMemberPrefix(node, member);
-                            write(", ");
-                            emitExpressionForPropertyName((<AccessorDeclaration>member).name);
-                            emitEnd((<AccessorDeclaration>member).name);
-                            write(", {");
-                            increaseIndent();
-                            if (accessors.getAccessor) {
-                                writeLine();
-                                emitLeadingComments(accessors.getAccessor);
-                                write("get: ");
-                                emitStart(accessors.getAccessor);
-                                write("function ");
-                                emitSignatureAndBody(accessors.getAccessor);
-                                emitEnd(accessors.getAccessor);
-                                emitTrailingComments(accessors.getAccessor);
-                                write(",");
-                            }
-                            if (accessors.setAccessor) {
-                                writeLine();
-                                emitLeadingComments(accessors.setAccessor);
-                                write("set: ");
-                                emitStart(accessors.setAccessor);
-                                write("function ");
-                                emitSignatureAndBody(accessors.setAccessor);
-                                emitEnd(accessors.setAccessor);
-                                emitTrailingComments(accessors.setAccessor);
-                                write(",");
-                            }
-                            writeLine();
-                            write("enumerable: true,");
-                            writeLine();
-                            write("configurable: true");
-                            decreaseIndent();
-                            writeLine();
-                            write("});");
-                            emitEnd(member);
-                        }
-                    }
-                });
-            }
-
-            function emitMemberFunctionsForES6AndHigher(node: ClassLikeDeclaration) {
-                for (const member of node.members) {
-                    if ((member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) && !(<MethodDeclaration>member).body) {
-                        emitCommentsOnNotEmittedNode(member);
-                    }
-                    else if (member.kind === SyntaxKind.MethodDeclaration ||
-                        member.kind === SyntaxKind.GetAccessor ||
-                        member.kind === SyntaxKind.SetAccessor) {
-                        writeLine();
-                        emitLeadingComments(member);
-                        emitStart(member);
-                        if (member.flags & NodeFlags.Static) {
-                            write("static ");
-                        }
-
-                        if (member.kind === SyntaxKind.GetAccessor) {
-                            write("get ");
-                        }
-                        else if (member.kind === SyntaxKind.SetAccessor) {
-                            write("set ");
-                        }
-                        if ((<MethodDeclaration>member).asteriskToken) {
-                            write("*");
-                        }
-                        emit((<MethodDeclaration>member).name);
-                        emitSignatureAndBody(<MethodDeclaration>member);
-                        emitEnd(member);
-                        emitTrailingComments(member);
-                    }
-                    else if (member.kind === SyntaxKind.SemicolonClassElement) {
-                        writeLine();
-                        write(";");
-                    }
-                }
-            }
-
-            function emitConstructor(node: ClassLikeDeclaration, baseTypeElement: ExpressionWithTypeArguments) {
-                const saveConvertedLoopState = convertedLoopState;
-                const saveTempFlags = tempFlags;
-                const saveTempVariables = tempVariables;
-                const saveTempParameters = tempParameters;
-
-                convertedLoopState = undefined;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-
-                emitConstructorWorker(node, baseTypeElement);
-
-                Debug.assert(convertedLoopState === undefined);
-                convertedLoopState = saveConvertedLoopState;
-
-                tempFlags = saveTempFlags;
-                tempVariables = saveTempVariables;
-                tempParameters = saveTempParameters;
-            }
-
-            function emitConstructorWorker(node: ClassLikeDeclaration, baseTypeElement: ExpressionWithTypeArguments) {
-                // Check if we have property assignment inside class declaration.
-                // If there is property assignment, we need to emit constructor whether users define it or not
-                // If there is no property assignment, we can omit constructor if users do not define it
-                let hasInstancePropertyWithInitializer = false;
-
-                // Emit the constructor overload pinned comments
-                forEach(node.members, member => {
-                    if (member.kind === SyntaxKind.Constructor && !(<ConstructorDeclaration>member).body) {
-                        emitCommentsOnNotEmittedNode(member);
-                    }
-                    // Check if there is any non-static property assignment
-                    if (member.kind === SyntaxKind.PropertyDeclaration && (<PropertyDeclaration>member).initializer && (member.flags & NodeFlags.Static) === 0) {
-                        hasInstancePropertyWithInitializer = true;
-                    }
-                });
-
-                const ctor = getFirstConstructorWithBody(node);
-
-                // For target ES6 and above, if there is no user-defined constructor and there is no property assignment
-                // do not emit constructor in class declaration.
-                if (languageVersion >= ScriptTarget.ES6 && !ctor && !hasInstancePropertyWithInitializer) {
-                    return;
-                }
-
-                if (ctor) {
-                    emitLeadingComments(ctor);
-                }
-                emitStart(ctor || node);
-
-                if (languageVersion < ScriptTarget.ES6) {
-                    write("function ");
-                    emitDeclarationName(node);
-                    emitSignatureParameters(ctor);
-                }
-                else {
-                    write("constructor");
-                    if (ctor) {
-                        emitSignatureParameters(ctor);
-                    }
-                    else {
-                        // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
-                        // If constructor is empty, then
-                        //     If ClassHeritag_eopt is present and protoParent is not null, then
-                        //          Let constructor be the result of parsing the source text
-                        //              constructor(...args) { super (...args);}
-                        //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-                        //      Else,
-                        //           Let constructor be the result of parsing the source text
-                        //               constructor( ){ }
-                        //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-                        //
-                        // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
-                        // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
-                        // Instead, we'll avoid using a rest parameter and spread into the super call as
-                        // 'super(...arguments)' instead of 'super(...args)', as you can see below.
-                        write("()");
-                    }
-                }
-
-                let startIndex = 0;
-
-                write(" {");
-                increaseIndent();
-                if (ctor) {
-                    // Emit all the directive prologues (like "use strict").  These have to come before
-                    // any other preamble code we write (like parameter initializers).
-                    startIndex = emitDirectivePrologues(ctor.body.statements, /*startWithNewLine*/ true);
-                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
-                }
-                emitCaptureThisForNodeIfNecessary(node);
-                let superCall: ExpressionStatement;
-                if (ctor) {
-                    emitDefaultValueAssignments(ctor);
-                    emitRestParameter(ctor);
-
-                    if (baseTypeElement) {
-                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
-                        if (superCall) {
-                            writeLine();
-                            emit(superCall);
-                        }
-                    }
-
-                    emitParameterPropertyAssignments(ctor);
-                }
-                else {
-                    if (baseTypeElement) {
-                        writeLine();
-                        emitStart(baseTypeElement);
-                        if (languageVersion < ScriptTarget.ES6) {
-                            write("_super.apply(this, arguments);");
-                        }
-                        else {
-                            // See comment above on using '...arguments' instead of '...args'.
-                            write("super(...arguments);");
-                        }
-                        emitEnd(baseTypeElement);
-                    }
-                }
-                emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ false));
-                if (ctor) {
-                    let statements: Node[] = (<Block>ctor.body).statements;
-                    if (superCall) {
-                        statements = statements.slice(1);
-                    }
-                    emitLinesStartingAt(statements, startIndex);
-                }
-                emitTempDeclarations(/*newLine*/ true);
-                writeLine();
-                if (ctor) {
-                    emitLeadingCommentsOfPosition((<Block>ctor.body).statements.end);
-                }
-                decreaseIndent();
-                emitToken(SyntaxKind.CloseBraceToken, ctor ? (<Block>ctor.body).statements.end : node.members.end);
-                emitEnd(<Node>ctor || node);
-                if (ctor) {
-                    emitTrailingComments(ctor);
-                }
-            }
-
-            function emitClassExpression(node: ClassExpression) {
-                return emitClassLikeDeclaration(node);
-            }
-
-            function emitClassDeclaration(node: ClassDeclaration) {
-                return emitClassLikeDeclaration(node);
-            }
-
-            function emitClassLikeDeclaration(node: ClassLikeDeclaration) {
-                if (languageVersion < ScriptTarget.ES6) {
-                    emitClassLikeDeclarationBelowES6(node);
-                }
-                else {
-                    emitClassLikeDeclarationForES6AndHigher(node);
-                }
-                if (modulekind !== ModuleKind.ES6 && node.parent === currentSourceFile && node.name) {
-                    emitExportMemberAssignments(node.name);
-                }
-            }
-
-            function emitClassLikeDeclarationForES6AndHigher(node: ClassLikeDeclaration) {
-                let decoratedClassAlias: string;
-                const isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
-                const isDecorated = nodeIsDecorated(node);
-                const rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
-                if (node.kind === SyntaxKind.ClassDeclaration) {
-                    if (rewriteAsClassExpression) {
-                        // When we emit an ES6 class that has a class decorator, we must tailor the
-                        // emit to certain specific cases.
-                        //
-                        // In the simplest case, we emit the class declaration as a let declaration, and
-                        // evaluate decorators after the close of the class body:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C = class C {
-                        //  class C {                       | }
-                        //  }                               | C = __decorate([dec], C);
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | export let C = class C {
-                        //  export class C {                | }
-                        //  }                               | C = __decorate([dec], C);
-                        //  ---------------------------------------------------------------------
-                        //  [Example 1]
-                        //
-                        // If a class declaration contains a reference to itself *inside* of the class body,
-                        // this introduces two bindings to the class: One outside of the class body, and one
-                        // inside of the class body. If we apply decorators as in [Example 1] above, there
-                        // is the possibility that the decorator `dec` will return a new value for the
-                        // constructor, which would result in the binding inside of the class no longer
-                        // pointing to the same reference as the binding outside of the class.
-                        //
-                        // As a result, we must instead rewrite all references to the class *inside* of the
-                        // class body to instead point to a local temporary alias for the class:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C_1 = class C {
-                        //  class C {                       |   static x() { return C_1.y; }
-                        //    static x() { return C.y; }    | }
-                        //    static y = 1;                 | let C = C_1;
-                        //  }                               | C.y = 1;
-                        //                                  | C = C_1 = __decorate([dec], C);
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C_1 = class C {
-                        //  export class C {                |   static x() { return C_1.y; }
-                        //    static x() { return C.y; }    | }
-                        //    static y = 1;                 | export let C = C_1;
-                        //  }                               | C.y = 1;
-                        //                                  | C = C_1 = __decorate([dec], C);
-                        //  ---------------------------------------------------------------------
-                        //  [Example 2]
-                        //
-                        // If a class declaration is the default export of a module, we instead emit
-                        // the export after the decorated declaration:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let default_1 = class {
-                        //  export default class {          | }
-                        //  }                               | default_1 = __decorate([dec], default_1);
-                        //                                  | export default default_1;
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C = class C {
-                        //  export default class {          | }
-                        //  }                               | C = __decorate([dec], C);
-                        //                                  | export default C;
-                        //  ---------------------------------------------------------------------
-                        //  [Example 3]
-                        //
-                        // If the class declaration is the default export and a reference to itself
-                        // inside of the class body, we must emit both an alias for the class *and*
-                        // move the export after the declaration:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C_1 = class C {
-                        //  export default class C {        |   static x() { return C_1.y; }
-                        //    static x() { return C.y; }    | };
-                        //    static y = 1;                 | let C = C_1;
-                        //  }                               | C.y = 1;
-                        //                                  | C = C_1 = __decorate([dec], C);
-                        //                                  | export default C;
-                        //  ---------------------------------------------------------------------
-                        //  [Example 4]
-                        //
-
-                        // NOTE: we reuse the same rewriting logic for cases when targeting ES6 and module kind is System.
-                        // Because of hoisting top level class declaration need to be emitted as class expressions.
-                        // Double bind case is only required if node is decorated.
-                        if (isDecorated && resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithBodyScopedClassBinding) {
-                            decoratedClassAlias = unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
-                            decoratedClassAliases[getNodeId(node)] = decoratedClassAlias;
-                        }
-
-                        if (isES6ExportedDeclaration(node) && !(node.flags & NodeFlags.Default) && decoratedClassAlias === undefined) {
-                            write("export ");
-                        }
-
-                        if (decoratedClassAlias !== undefined) {
-                            write(`let ${decoratedClassAlias}`);
-                        }
-                        else {
-                            if (!isHoistedDeclarationInSystemModule) {
-                                write("let ");
-                            }
-                            emitDeclarationName(node);
-                        }
-                        write(" = ");
-                    }
-                    else if (isES6ExportedDeclaration(node)) {
-                        write("export ");
-                        if (node.flags & NodeFlags.Default) {
-                            write("default ");
-                        }
-                    }
-                }
-
-                // If the class has static properties, and it's a class expression, then we'll need
-                // to specialize the emit a bit.  for a class expression of the form:
-                //
-                //      (class C { static a = 1; static b = 2; ... })
-                //
-                // We'll emit:
-                //
-                //    ((C_1 = class C {
-                //            // Normal class body
-                //        },
-                //        C_1.a = 1,
-                //        C_1.b = 2,
-                //        C_1));
-                //    var C_1;
-                //
-                // This keeps the expression as an expression, while ensuring that the static parts
-                // of it have been initialized by the time it is used.
-                const staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-                const isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === SyntaxKind.ClassExpression;
-                let generatedName: string;
-
-                if (isClassExpressionWithStaticProperties) {
-                    generatedName = node.name ? getGeneratedNameForNode(node.name) : makeUniqueName("classExpression");
-                    const synthesizedNode = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-                    synthesizedNode.text = generatedName;
-                    recordTempDeclaration(synthesizedNode);
-                    write("(");
-                    increaseIndent();
-                    emit(synthesizedNode);
-                    write(" = ");
-                }
-
-                write("class");
-
-                // emit name if
-                // - node has a name
-                // - this is default export with static initializers
-                if (node.name || (node.flags & NodeFlags.Default && (staticProperties.length > 0 || modulekind !== ModuleKind.ES6) && !rewriteAsClassExpression)) {
-                    write(" ");
-                    emitDeclarationName(node);
-                }
-
-                const baseTypeNode = getClassExtendsHeritageClauseElement(node);
-                if (baseTypeNode) {
-                    write(" extends ");
-                    emit(baseTypeNode.expression);
-                }
-
-                write(" {");
-                increaseIndent();
-                writeLine();
-                emitConstructor(node, baseTypeNode);
-                emitMemberFunctionsForES6AndHigher(node);
-                decreaseIndent();
-                writeLine();
-                emitToken(SyntaxKind.CloseBraceToken, node.members.end);
-
-                if (rewriteAsClassExpression) {
-                    if (decoratedClassAlias !== undefined) {
-                        write(";");
-                        writeLine();
-                        if (isES6ExportedDeclaration(node) && !(node.flags & NodeFlags.Default)) {
-                            write("export ");
-                        }
-                        write("let ");
-                        emitDeclarationName(node);
-                        write(` = ${decoratedClassAlias}`);
-                    }
-                    decoratedClassAliases[getNodeId(node)] = undefined;
-                    write(";");
-                }
-
-                // Emit static property assignment. Because classDeclaration is lexically evaluated,
-                // it is safe to emit static property assignment after classDeclaration
-                // From ES6 specification:
-                //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-                //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-
-                if (isClassExpressionWithStaticProperties) {
-                    for (const property of staticProperties) {
-                        write(",");
-                        writeLine();
-                        emitPropertyDeclaration(node, property, /*receiver*/ generatedName, /*isExpression*/ true);
-                    }
-                    write(",");
-                    writeLine();
-                    write(generatedName);
-                    decreaseIndent();
-                    write(")");
-                }
-                else {
-                    writeLine();
-                    emitPropertyDeclarations(node, staticProperties);
-                    emitDecoratorsOfClass(node, decoratedClassAlias);
-                }
-
-                if (!(node.flags & NodeFlags.Export)) {
-                    return;
-                }
-                if (modulekind !== ModuleKind.ES6) {
-                    emitExportMemberAssignment(node as ClassDeclaration);
-                }
-                else {
-                    // If this is an exported class, but not on the top level (i.e. on an internal
-                    // module), export it
-                    if (node.flags & NodeFlags.Default) {
-                        // if this is a top level default export of decorated class, write the export after the declaration.
-                        if (isDecorated) {
-                            writeLine();
-                            write("export default ");
-                            emitDeclarationName(node);
-                            write(";");
-                        }
-                    }
-                    else if (node.parent.kind !== SyntaxKind.SourceFile) {
-                        writeLine();
-                        emitStart(node);
-                        emitModuleMemberName(node);
-                        write(" = ");
-                        emitDeclarationName(node);
-                        emitEnd(node);
-                        write(";");
-                    }
-                }
-            }
-
-            function emitClassLikeDeclarationBelowES6(node: ClassLikeDeclaration) {
-                const isES6ExportedClass = isES6ExportedDeclaration(node);
-                if (node.kind === SyntaxKind.ClassDeclaration) {
-                    if (isES6ExportedClass && !(node.flags & NodeFlags.Default)) {
-                        write("export ");
-                    }
-                    // source file level classes in system modules are hoisted so 'var's for them are already defined
-                    if (!shouldHoistDeclarationInSystemJsModule(node)) {
-                        write("var ");
-                    }
-                    emitDeclarationName(node);
-                    write(" = ");
-                }
-
-                write("(function (");
-                const baseTypeNode = getClassExtendsHeritageClauseElement(node);
-                if (baseTypeNode) {
-                    write("_super");
-                }
-                write(") {");
-                const saveTempFlags = tempFlags;
-                const saveTempVariables = tempVariables;
-                const saveTempParameters = tempParameters;
-                const saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
-                const saveConvertedLoopState = convertedLoopState;
-
-                convertedLoopState = undefined;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-                computedPropertyNamesToGeneratedNames = undefined;
-                increaseIndent();
-                if (baseTypeNode) {
-                    writeLine();
-                    emitStart(baseTypeNode);
-                    write("__extends(");
-                    emitDeclarationName(node);
-                    write(", _super);");
-                    emitEnd(baseTypeNode);
-                }
-                writeLine();
-                emitConstructor(node, baseTypeNode);
-                emitMemberFunctionsForES5AndLower(node);
-                emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true));
-                writeLine();
-                emitDecoratorsOfClass(node, /*decoratedClassAlias*/ undefined);
-                writeLine();
-                emitToken(SyntaxKind.CloseBraceToken, node.members.end, () => {
-                    write("return ");
-                    emitDeclarationName(node);
-                });
-                write(";");
-                emitTempDeclarations(/*newLine*/ true);
-
-                Debug.assert(convertedLoopState === undefined);
-                convertedLoopState = saveConvertedLoopState;
-
-                tempFlags = saveTempFlags;
-                tempVariables = saveTempVariables;
-                tempParameters = saveTempParameters;
-                computedPropertyNamesToGeneratedNames = saveComputedPropertyNamesToGeneratedNames;
-                decreaseIndent();
-                writeLine();
-                emitToken(SyntaxKind.CloseBraceToken, node.members.end);
-                emitStart(node);
-                write("(");
-                if (baseTypeNode) {
-                    emit(baseTypeNode.expression);
-                }
-                write("))");
-                if (node.kind === SyntaxKind.ClassDeclaration) {
-                    write(";");
-                }
-                emitEnd(node);
-
-                if (node.kind === SyntaxKind.ClassDeclaration && !isES6ExportedClass) {
-                    emitExportMemberAssignment(<ClassDeclaration>node);
-                }
-                else if (isES6ExportedClass && (node.flags & NodeFlags.Default)) {
-                    writeLine();
-                    write("export default ");
-                    emitDeclarationName(node);
-                    write(";");
-                }
-            }
-
-            function emitClassMemberPrefix(node: ClassLikeDeclaration, member: Node) {
-                emitDeclarationName(node);
-                if (!(member.flags & NodeFlags.Static)) {
-                    write(".prototype");
-                }
-            }
-
-            function emitDecoratorsOfClass(node: ClassLikeDeclaration, decoratedClassAlias: string) {
-                emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, NodeFlags.Static);
-                emitDecoratorsOfConstructor(node, decoratedClassAlias);
-            }
-
-            function emitDecoratorsOfConstructor(node: ClassLikeDeclaration, decoratedClassAlias: string) {
-                const decorators = node.decorators;
-                const constructor = getFirstConstructorWithBody(node);
-                const firstParameterDecorator = constructor && forEach(constructor.parameters, parameter => parameter.decorators);
-
-                // skip decoration of the constructor if neither it nor its parameters are decorated
-                if (!decorators && !firstParameterDecorator) {
-                    return;
-                }
-
-                // Emit the call to __decorate. Given the class:
-                //
-                //   @dec
-                //   class C {
-                //   }
-                //
-                // The emit for the class is:
-                //
-                //   C = __decorate([dec], C);
-                //
-
-                writeLine();
-                emitStart(node.decorators || firstParameterDecorator);
-                emitDeclarationName(node);
-                if (decoratedClassAlias !== undefined) {
-                    write(` = ${decoratedClassAlias}`);
-                }
-
-                write(" = __decorate([");
-                increaseIndent();
-                writeLine();
-
-                const decoratorCount = decorators ? decorators.length : 0;
-                let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true,
-                    decorator => emit(decorator.expression));
-                if (firstParameterDecorator) {
-                    argumentsWritten += emitDecoratorsOfParameters(constructor, /*leadingComma*/ argumentsWritten > 0);
-                }
-                emitSerializedTypeMetadata(node, /*leadingComma*/ argumentsWritten >= 0);
-
-                decreaseIndent();
-                writeLine();
-                write("], ");
-                emitDeclarationName(node);
-                write(")");
-                emitEnd(node.decorators || firstParameterDecorator);
-                write(";");
-                writeLine();
-            }
-
-            function emitDecoratorsOfMembers(node: ClassLikeDeclaration, staticFlag: NodeFlags) {
-                for (const member of node.members) {
-                    // only emit members in the correct group
-                    if ((member.flags & NodeFlags.Static) !== staticFlag) {
-                        continue;
-                    }
-
-                    // skip members that cannot be decorated (such as the constructor)
-                    if (!nodeCanBeDecorated(member)) {
-                        continue;
-                    }
-
-                    // skip an accessor declaration if it is not the first accessor
-                    let decorators: NodeArray<Decorator>;
-                    let functionLikeMember: FunctionLikeDeclaration;
-                    if (isAccessor(member)) {
-                        const accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
-                        if (member !== accessors.firstAccessor) {
-                            continue;
-                        }
-
-                        // get the decorators from the first accessor with decorators
-                        decorators = accessors.firstAccessor.decorators;
-                        if (!decorators && accessors.secondAccessor) {
-                            decorators = accessors.secondAccessor.decorators;
-                        }
-
-                        // we only decorate parameters of the set accessor
-                        functionLikeMember = accessors.setAccessor;
-                    }
-                    else {
-                        decorators = member.decorators;
-
-                        // we only decorate the parameters here if this is a method
-                        if (member.kind === SyntaxKind.MethodDeclaration) {
-                            functionLikeMember = <MethodDeclaration>member;
-                        }
-                    }
-                    const firstParameterDecorator = functionLikeMember && forEach(functionLikeMember.parameters, parameter => parameter.decorators);
-
-                    // skip a member if it or any of its parameters are not decorated
-                    if (!decorators && !firstParameterDecorator) {
-                        continue;
-                    }
-
-                    // Emit the call to __decorate. Given the following:
-                    //
-                    //   class C {
-                    //     @dec method(@dec2 x) {}
-                    //     @dec get accessor() {}
-                    //     @dec prop;
-                    //   }
-                    //
-                    // The emit for a method is:
-                    //
-                    //   __decorate([
-                    //       dec,
-                    //       __param(0, dec2),
-                    //       __metadata("design:type", Function),
-                    //       __metadata("design:paramtypes", [Object]),
-                    //       __metadata("design:returntype", void 0)
-                    //   ], C.prototype, "method", undefined);
-                    //
-                    // The emit for an accessor is:
-                    //
-                    //   __decorate([
-                    //       dec
-                    //   ], C.prototype, "accessor", undefined);
-                    //
-                    // The emit for a property is:
-                    //
-                    //   __decorate([
-                    //       dec
-                    //   ], C.prototype, "prop");
-                    //
-
-                    writeLine();
-                    emitStart(decorators || firstParameterDecorator);
-                    write("__decorate([");
-                    increaseIndent();
-                    writeLine();
-
-                    const decoratorCount = decorators ? decorators.length : 0;
-                    let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true,
-                        decorator => emit(decorator.expression));
-
-                    if (firstParameterDecorator) {
-                        argumentsWritten += emitDecoratorsOfParameters(functionLikeMember, argumentsWritten > 0);
-                    }
-                    emitSerializedTypeMetadata(member, argumentsWritten > 0);
-
-                    decreaseIndent();
-                    writeLine();
-                    write("], ");
-                    emitClassMemberPrefix(node, member);
-                    write(", ");
-                    emitExpressionForPropertyName(member.name);
-
-                    if (languageVersion > ScriptTarget.ES3) {
-                        if (member.kind !== SyntaxKind.PropertyDeclaration) {
-                            // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly.
-                            // We have this extra argument here so that we can inject an explicit property descriptor at a later date.
-                            write(", null");
-                        }
-                        else {
-                            // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
-                            // should not invoke `Object.getOwnPropertyDescriptor`.
-                            write(", void 0");
-                        }
-                    }
-
-                    write(")");
-                    emitEnd(decorators || firstParameterDecorator);
-                    write(";");
-                    writeLine();
-                }
-            }
-
-            function emitDecoratorsOfParameters(node: FunctionLikeDeclaration, leadingComma: boolean): number {
-                let argumentsWritten = 0;
-                if (node) {
-                    let parameterIndex = 0;
-                    for (const parameter of node.parameters) {
-                        if (nodeIsDecorated(parameter)) {
-                            const decorators = parameter.decorators;
-                            argumentsWritten += emitList(decorators, 0, decorators.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ leadingComma, /*noTrailingNewLine*/ true, decorator => {
-                                write(`__param(${parameterIndex}, `);
-                                emit(decorator.expression);
-                                write(")");
-                            });
-                            leadingComma = true;
-                        }
-                        parameterIndex++;
-                    }
-                }
-                return argumentsWritten;
-            }
-
-            function shouldEmitTypeMetadata(node: Declaration): boolean {
-                // This method determines whether to emit the "design:type" metadata based on the node's kind.
-                // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
-                // compiler option is set.
-                switch (node.kind) {
-                    case SyntaxKind.MethodDeclaration:
-                    case SyntaxKind.GetAccessor:
-                    case SyntaxKind.SetAccessor:
-                    case SyntaxKind.PropertyDeclaration:
-                        return true;
-                }
-
-                return false;
-            }
-
-            function shouldEmitReturnTypeMetadata(node: Declaration): boolean {
-                // This method determines whether to emit the "design:returntype" metadata based on the node's kind.
-                // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
-                // compiler option is set.
-                switch (node.kind) {
-                    case SyntaxKind.MethodDeclaration:
-                        return true;
-                }
-                return false;
-            }
-
-            function shouldEmitParamTypesMetadata(node: Declaration): boolean {
-                // This method determines whether to emit the "design:paramtypes" metadata based on the node's kind.
-                // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
-                // compiler option is set.
-                switch (node.kind) {
-                    case SyntaxKind.ClassDeclaration:
-                    case SyntaxKind.MethodDeclaration:
-                    case SyntaxKind.SetAccessor:
-                        return true;
-                }
-                return false;
-            }
-
-            /** Serializes the type of a declaration to an appropriate JS constructor value. Used by the __metadata decorator for a class member. */
-            function emitSerializedTypeOfNode(node: Node) {
-                // serialization of the type of a declaration uses the following rules:
-                //
-                // * The serialized type of a ClassDeclaration is "Function"
-                // * The serialized type of a ParameterDeclaration is the serialized type of its type annotation.
-                // * The serialized type of a PropertyDeclaration is the serialized type of its type annotation.
-                // * The serialized type of an AccessorDeclaration is the serialized type of the return type annotation of its getter or parameter type annotation of its setter.
-                // * The serialized type of any other FunctionLikeDeclaration is "Function".
-                // * The serialized type of any other node is "void 0".
-                //
-                // For rules on serializing type annotations, see `serializeTypeNode`.
-                switch (node.kind) {
-                    case SyntaxKind.ClassDeclaration:
-                        write("Function");
-                        return;
-
-                    case SyntaxKind.PropertyDeclaration:
-                        emitSerializedTypeNode((<PropertyDeclaration>node).type);
-                        return;
-
-                    case SyntaxKind.Parameter:
-                        emitSerializedTypeNode((<ParameterDeclaration>node).type);
-                        return;
-
-                    case SyntaxKind.GetAccessor:
-                        emitSerializedTypeNode((<AccessorDeclaration>node).type);
-                        return;
-
-                    case SyntaxKind.SetAccessor:
-                        emitSerializedTypeNode(getSetAccessorTypeAnnotationNode(<AccessorDeclaration>node));
-                        return;
-
-                }
-
-                if (isFunctionLike(node)) {
-                    write("Function");
-                    return;
-                }
-
-                write("void 0");
-            }
-
-            function emitSerializedTypeNode(node: TypeNode) {
-                if (node) {
-                    switch (node.kind) {
-                        case SyntaxKind.VoidKeyword:
-                            write("void 0");
-                            return;
-
-                        case SyntaxKind.ParenthesizedType:
-                            emitSerializedTypeNode((<ParenthesizedTypeNode>node).type);
-                            return;
-
-                        case SyntaxKind.FunctionType:
-                        case SyntaxKind.ConstructorType:
-                            write("Function");
-                            return;
-
-                        case SyntaxKind.ArrayType:
-                        case SyntaxKind.TupleType:
-                            write("Array");
-                            return;
-
-                        case SyntaxKind.TypePredicate:
-                        case SyntaxKind.BooleanKeyword:
-                            write("Boolean");
-                            return;
-
-                        case SyntaxKind.StringKeyword:
-                        case SyntaxKind.LiteralType:
-                            write("String");
-                            return;
-
-                        case SyntaxKind.NumberKeyword:
-                            write("Number");
-                            return;
-
-                        case SyntaxKind.SymbolKeyword:
-                            write("Symbol");
-                            return;
-
-                        case SyntaxKind.TypeReference:
-                            emitSerializedTypeReferenceNode(<TypeReferenceNode>node);
-                            return;
-
-                        case SyntaxKind.TypeQuery:
-                        case SyntaxKind.TypeLiteral:
-                        case SyntaxKind.UnionType:
-                        case SyntaxKind.IntersectionType:
-                        case SyntaxKind.AnyKeyword:
-                        case SyntaxKind.ThisType:
-                            break;
-
-                        default:
-                            Debug.fail("Cannot serialize unexpected type node.");
-                            break;
-                    }
-                }
-                write("Object");
-            }
-
-            /** Serializes a TypeReferenceNode to an appropriate JS constructor value. Used by the __metadata decorator. */
-            function emitSerializedTypeReferenceNode(node: TypeReferenceNode) {
-                let location: Node = node.parent;
-                while (isDeclaration(location) || isTypeNode(location)) {
-                    location = location.parent;
-                }
-
-                // Clone the type name and parent it to a location outside of the current declaration.
-                const typeName = cloneEntityName(node.typeName, location);
-                const result = resolver.getTypeReferenceSerializationKind(typeName);
-                switch (result) {
-                    case TypeReferenceSerializationKind.Unknown:
-                        let temp = createAndRecordTempVariable(TempFlags.Auto);
-                        write("(typeof (");
-                        emitNodeWithoutSourceMap(temp);
-                        write(" = ");
-                        emitEntityNameAsExpression(typeName, /*useFallback*/ true);
-                        write(") === 'function' && ");
-                        emitNodeWithoutSourceMap(temp);
-                        write(") || Object");
-                        break;
-
-                    case TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
-                        emitEntityNameAsExpression(typeName, /*useFallback*/ false);
-                        break;
-
-                    case TypeReferenceSerializationKind.VoidType:
-                        write("void 0");
-                        break;
-
-                    case TypeReferenceSerializationKind.BooleanType:
-                        write("Boolean");
-                        break;
-
-                    case TypeReferenceSerializationKind.NumberLikeType:
-                        write("Number");
-                        break;
-
-                    case TypeReferenceSerializationKind.StringLikeType:
-                        write("String");
-                        break;
-
-                    case TypeReferenceSerializationKind.ArrayLikeType:
-                        write("Array");
-                        break;
-
-                    case TypeReferenceSerializationKind.ESSymbolType:
-                        if (languageVersion < ScriptTarget.ES6) {
-                            write("typeof Symbol === 'function' ? Symbol : Object");
-                        }
-                        else {
-                            write("Symbol");
-                        }
-                        break;
-
-                    case TypeReferenceSerializationKind.TypeWithCallSignature:
-                        write("Function");
-                        break;
-
-                    case TypeReferenceSerializationKind.ObjectType:
-                        write("Object");
-                        break;
-                }
-            }
-
-            /** Serializes the parameter types of a function or the constructor of a class. Used by the __metadata decorator for a method or set accessor. */
-            function emitSerializedParameterTypesOfNode(node: Node) {
-                // serialization of parameter types uses the following rules:
-                //
-                // * If the declaration is a class, the parameters of the first constructor with a body are used.
-                // * If the declaration is function-like and has a body, the parameters of the function are used.
-                //
-                // For the rules on serializing the type of each parameter declaration, see `serializeTypeOfDeclaration`.
-                if (node) {
-                    let valueDeclaration: FunctionLikeDeclaration;
-                    if (node.kind === SyntaxKind.ClassDeclaration) {
-                        valueDeclaration = getFirstConstructorWithBody(<ClassDeclaration>node);
-                    }
-                    else if (isFunctionLike(node) && nodeIsPresent((<FunctionLikeDeclaration>node).body)) {
-                        valueDeclaration = <FunctionLikeDeclaration>node;
-                    }
-
-                    if (valueDeclaration) {
-                        const parameters = valueDeclaration.parameters;
-                        const skipThisCount = parameters.length && (<Identifier>parameters[0].name).originalKeywordKind === SyntaxKind.ThisKeyword ? 1 : 0;
-                        const parameterCount = parameters.length;
-                        if (parameterCount > skipThisCount) {
-                            for (let i = skipThisCount; i < parameterCount; i++) {
-                                if (i > skipThisCount) {
-                                    write(", ");
-                                }
-
-                                if (parameters[i].dotDotDotToken) {
-                                    let parameterType = parameters[i].type;
-                                    if (parameterType && parameterType.kind === SyntaxKind.ArrayType) {
-                                        parameterType = (<ArrayTypeNode>parameterType).elementType;
-                                    }
-                                    else if (parameterType && parameterType.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>parameterType).typeArguments && (<TypeReferenceNode>parameterType).typeArguments.length === 1) {
-                                        parameterType = (<TypeReferenceNode>parameterType).typeArguments[0];
-                                    }
-                                    else {
-                                        parameterType = undefined;
-                                    }
-
-                                    emitSerializedTypeNode(parameterType);
-                                }
-                                else {
-                                    emitSerializedTypeOfNode(parameters[i]);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            /** Serializes the return type of function. Used by the __metadata decorator for a method. */
-            function emitSerializedReturnTypeOfNode(node: Node) {
-                if (node && isFunctionLike(node)) {
-                    if ((<FunctionLikeDeclaration>node).type) {
-                        emitSerializedTypeNode((<FunctionLikeDeclaration>node).type);
-                        return;
-                    }
-                    else if (isAsyncFunctionLike(<FunctionLikeDeclaration>node)) {
-                        write("Promise");
-                        return;
-                    }
-                }
-
-                write("void 0");
-            }
-
-
-            function emitSerializedTypeMetadata(node: Declaration, writeComma: boolean): number {
-                // This method emits the serialized type metadata for a decorator target.
-                // The caller should have already tested whether the node has decorators.
-                let argumentsWritten = 0;
-                if (compilerOptions.emitDecoratorMetadata) {
-                    if (shouldEmitTypeMetadata(node)) {
-                        if (writeComma) {
-                            write(", ");
-                        }
-                        writeLine();
-                        write("__metadata('design:type', ");
-                        emitSerializedTypeOfNode(node);
-                        write(")");
-                        argumentsWritten++;
-                    }
-                    if (shouldEmitParamTypesMetadata(node)) {
-                        if (writeComma || argumentsWritten) {
-                            write(", ");
-                        }
-                        writeLine();
-                        write("__metadata('design:paramtypes', [");
-                        emitSerializedParameterTypesOfNode(node);
-                        write("])");
-                        argumentsWritten++;
-                    }
-                    if (shouldEmitReturnTypeMetadata(node)) {
-                        if (writeComma || argumentsWritten) {
-                            write(", ");
-                        }
-
-                        writeLine();
-                        write("__metadata('design:returntype', ");
-                        emitSerializedReturnTypeOfNode(node);
-                        write(")");
-                        argumentsWritten++;
-                    }
-                }
-
-                return argumentsWritten;
-            }
-
-            function emitInterfaceDeclaration(node: InterfaceDeclaration) {
-                emitCommentsOnNotEmittedNode(node);
-            }
-
-            function shouldEmitEnumDeclaration(node: EnumDeclaration) {
-                const isConstEnum = isConst(node);
-                return !isConstEnum || compilerOptions.preserveConstEnums || compilerOptions.isolatedModules;
-            }
-
-            function emitEnumDeclaration(node: EnumDeclaration) {
-                // const enums are completely erased during compilation.
-                if (!shouldEmitEnumDeclaration(node)) {
-                    return;
-                }
-
-                if (!shouldHoistDeclarationInSystemJsModule(node)) {
-                    // do not emit var if variable was already hoisted
-
-                    const isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & NodeFlags.Export) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, SyntaxKind.EnumDeclaration))) {
-                        emitStart(node);
-                        if (isES6ExportedEnum) {
-                            write("export ");
-                        }
-                        write("var ");
-                        emit(node.name);
-                        emitEnd(node);
-                        write(";");
-                    }
-                }
-                writeLine();
-                emitStart(node);
-                write("(function (");
-                emitStart(node.name);
-                write(getGeneratedNameForNode(node));
-                emitEnd(node.name);
-                write(") {");
-                increaseIndent();
-                emitLines(node.members);
-                decreaseIndent();
-                writeLine();
-                emitToken(SyntaxKind.CloseBraceToken, node.members.end);
-                write(")(");
-                emitModuleMemberName(node);
-                write(" || (");
-                emitModuleMemberName(node);
-                write(" = {}));");
-                emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & NodeFlags.Export && !shouldHoistDeclarationInSystemJsModule(node)) {
-                    // do not emit var if variable was already hoisted
-                    writeLine();
-                    emitStart(node);
-                    write("var ");
-                    emit(node.name);
-                    write(" = ");
-                    emitModuleMemberName(node);
-                    emitEnd(node);
-                    write(";");
-                }
-                if (modulekind !== ModuleKind.ES6 && node.parent === currentSourceFile) {
-                    if (modulekind === ModuleKind.System && (node.flags & NodeFlags.Export)) {
-                        // write the call to exporter for enum
-                        writeLine();
-                        write(`${exportFunctionForFile}("`);
-                        emitDeclarationName(node);
-                        write(`", `);
-                        emitDeclarationName(node);
-                        write(");");
-                    }
-                    emitExportMemberAssignments(node.name);
-                }
-            }
-
-            function emitEnumMember(node: EnumMember) {
-                const enumParent = <EnumDeclaration>node.parent;
-                emitStart(node);
-                write(getGeneratedNameForNode(enumParent));
-                write("[");
-                write(getGeneratedNameForNode(enumParent));
-                write("[");
-                emitExpressionForPropertyName(node.name);
-                write("] = ");
-                writeEnumMemberDeclarationValue(node);
-                write("] = ");
-                emitExpressionForPropertyName(node.name);
-                emitEnd(node);
-                write(";");
-            }
-
-            function writeEnumMemberDeclarationValue(member: EnumMember) {
-                const value = resolver.getConstantValue(member);
-                if (value !== undefined) {
-                    write(value.toString());
-                    return;
-                }
-                else if (member.initializer) {
-                    emit(member.initializer);
-                }
-                else {
-                    write("undefined");
-                }
-            }
-
-            function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration: ModuleDeclaration): ModuleDeclaration {
-                if (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
-                    const recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(<ModuleDeclaration>moduleDeclaration.body);
-                    return recursiveInnerModule || <ModuleDeclaration>moduleDeclaration.body;
-                }
-            }
-
-            function shouldEmitModuleDeclaration(node: ModuleDeclaration) {
-                return isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
-            }
-
-            function isModuleMergedWithES6Class(node: ModuleDeclaration) {
-                return languageVersion === ScriptTarget.ES6 && !!(resolver.getNodeCheckFlags(node) & NodeCheckFlags.LexicalModuleMergesWithClass);
-            }
-
-            function isFirstDeclarationOfKind(node: Declaration, declarations: Declaration[], kind: SyntaxKind) {
-                return !forEach(declarations, declaration => declaration.kind === kind && declaration.pos < node.pos);
-            }
-
-            function emitModuleDeclaration(node: ModuleDeclaration) {
-                // Emit only if this module is non-ambient.
-                const shouldEmit = shouldEmitModuleDeclaration(node);
-
-                if (!shouldEmit) {
-                    return emitCommentsOnNotEmittedNode(node);
-                }
-                const hoistedInDeclarationScope = shouldHoistDeclarationInSystemJsModule(node);
-                const emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
-
-                if (emitVarForModule) {
-                    const isES6ExportedNamespace = isES6ExportedDeclaration(node);
-                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, SyntaxKind.ModuleDeclaration)) {
-                        emitStart(node);
-                        if (isES6ExportedNamespace) {
-                            write("export ");
-                        }
-                        write("var ");
-                        emit(node.name);
-                        write(";");
-                        emitEnd(node);
-                        writeLine();
-                    }
-                }
-
-                emitStart(node);
-                write("(function (");
-                emitStart(node.name);
-                write(getGeneratedNameForNode(node));
-                emitEnd(node.name);
-                write(") ");
-                Debug.assert(node.body !== undefined); // node.body must exist, as this is a non-ambient module
-                if (node.body.kind === SyntaxKind.ModuleBlock) {
-                    const saveConvertedLoopState = convertedLoopState;
-                    const saveTempFlags = tempFlags;
-                    const saveTempVariables = tempVariables;
-                    convertedLoopState = undefined;
-                    tempFlags = 0;
-                    tempVariables = undefined;
-
-                    emit(node.body);
-
-                    Debug.assert(convertedLoopState === undefined);
-                    convertedLoopState = saveConvertedLoopState;
-
-                    tempFlags = saveTempFlags;
-                    tempVariables = saveTempVariables;
-                }
-                else {
-                    write("{");
-                    increaseIndent();
-                    emitCaptureThisForNodeIfNecessary(node);
-                    writeLine();
-                    emit(node.body);
-                    decreaseIndent();
-                    writeLine();
-                    const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
-                    emitToken(SyntaxKind.CloseBraceToken, moduleBlock.statements.end);
-                }
-                write(")(");
-                // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & NodeFlags.Export) && !isES6ExportedDeclaration(node)) {
-                    emit(node.name);
-                    write(" = ");
-                }
-                emitModuleMemberName(node);
-                write(" || (");
-                emitModuleMemberName(node);
-                write(" = {}));");
-                emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.name.kind === SyntaxKind.Identifier && node.parent === currentSourceFile) {
-                    if (modulekind === ModuleKind.System && (node.flags & NodeFlags.Export)) {
-                        writeLine();
-                        write(`${exportFunctionForFile}("`);
-                        emitDeclarationName(node);
-                        write(`", `);
-                        emitDeclarationName(node);
-                        write(");");
-                    }
-                    emitExportMemberAssignments(<Identifier>node.name);
-                }
-            }
-
-            /*
-             * Some bundlers (SystemJS builder) sometimes want to rename dependencies.
-             * Here we check if alternative name was provided for a given moduleName and return it if possible.
-             */
-            function tryRenameExternalModule(moduleName: LiteralExpression): string {
-                if (renamedDependencies && moduleName.text in renamedDependencies) {
-                    return `"${renamedDependencies[moduleName.text]}"`;
-                }
-                return undefined;
-            }
-
-            function emitRequire(moduleName: Expression) {
-                if (moduleName.kind === SyntaxKind.StringLiteral) {
-                    write("require(");
-                    const text = tryRenameExternalModule(<LiteralExpression>moduleName);
-                    if (text) {
-                        write(text);
-                    }
-                    else {
-                        emitStart(moduleName);
-                        emitLiteral(<LiteralExpression>moduleName);
-                        emitEnd(moduleName);
-                    }
-                    emitToken(SyntaxKind.CloseParenToken, moduleName.end);
-                }
-                else {
-                    write("require()");
-                }
-            }
-
-            function getNamespaceDeclarationNode(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration) {
-                if (node.kind === SyntaxKind.ImportEqualsDeclaration) {
-                    return <ImportEqualsDeclaration>node;
-                }
-                const importClause = (<ImportDeclaration>node).importClause;
-                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === SyntaxKind.NamespaceImport) {
-                    return <NamespaceImport>importClause.namedBindings;
-                }
-            }
-
-            function isDefaultImport(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration) {
-                return node.kind === SyntaxKind.ImportDeclaration && (<ImportDeclaration>node).importClause && !!(<ImportDeclaration>node).importClause.name;
-            }
-
-            function emitExportImportAssignments(node: Node) {
-                if (isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
-                    emitExportMemberAssignments(<Identifier>(<Declaration>node).name);
-                }
-                forEachChild(node, emitExportImportAssignments);
-            }
-
-            function emitImportDeclaration(node: ImportDeclaration) {
-                if (modulekind !== ModuleKind.ES6) {
-                    return emitExternalImportDeclaration(node);
-                }
-
-                // ES6 import
-                if (node.importClause) {
-                    const shouldEmitDefaultBindings = resolver.isReferencedAliasDeclaration(node.importClause);
-                    const shouldEmitNamedBindings = node.importClause.namedBindings && resolver.isReferencedAliasDeclaration(node.importClause.namedBindings, /* checkChildren */ true);
-                    if (shouldEmitDefaultBindings || shouldEmitNamedBindings) {
-                        write("import ");
-                        emitStart(node.importClause);
-                        if (shouldEmitDefaultBindings) {
-                            emit(node.importClause.name);
-                            if (shouldEmitNamedBindings) {
-                                write(", ");
-                            }
-                        }
-                        if (shouldEmitNamedBindings) {
-                            emitLeadingComments(node.importClause.namedBindings);
-                            emitStart(node.importClause.namedBindings);
-                            if (node.importClause.namedBindings.kind === SyntaxKind.NamespaceImport) {
-                                write("* as ");
-                                emit((<NamespaceImport>node.importClause.namedBindings).name);
-                            }
-                            else {
-                                write("{ ");
-                                emitExportOrImportSpecifierList((<NamedImports>node.importClause.namedBindings).elements, resolver.isReferencedAliasDeclaration);
-                                write(" }");
-                            }
-                            emitEnd(node.importClause.namedBindings);
-                            emitTrailingComments(node.importClause.namedBindings);
-                        }
-
-                        emitEnd(node.importClause);
-                        write(" from ");
-                        emit(node.moduleSpecifier);
-                        write(";");
-                    }
-                }
-                else {
-                    write("import ");
-                    emit(node.moduleSpecifier);
-                    write(";");
-                }
-            }
-
-            function emitExternalImportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration) {
-                if (contains(externalImports, node)) {
-                    const isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && (node.flags & NodeFlags.Export) !== 0;
-                    const namespaceDeclaration = getNamespaceDeclarationNode(node);
-                    const varOrConst = (languageVersion <= ScriptTarget.ES5) ? "var " : "const ";
-
-                    if (modulekind !== ModuleKind.AMD) {
-                        emitLeadingComments(node);
-                        emitStart(node);
-                        if (namespaceDeclaration && !isDefaultImport(node)) {
-                            // import x = require("foo")
-                            // import * as x from "foo"
-                            if (!isExportedImport) {
-                                write(varOrConst);
-                            };
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                        }
-                        else {
-                            // import "foo"
-                            // import x from "foo"
-                            // import { x, y } from "foo"
-                            // import d, * as x from "foo"
-                            // import d, { x, y } from "foo"
-                            const isNakedImport = node.kind === SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
-                            if (!isNakedImport) {
-                                write(varOrConst);
-                                write(getGeneratedNameForNode(<ImportDeclaration>node));
-                                write(" = ");
-                            }
-                        }
-                        emitRequire(getExternalModuleName(node));
-                        if (namespaceDeclaration && isDefaultImport(node)) {
-                            // import d, * as x from "foo"
-                            write(", ");
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                            write(getGeneratedNameForNode(<ImportDeclaration>node));
-                        }
-                        write(";");
-                        emitEnd(node);
-                        emitExportImportAssignments(node);
-                        emitTrailingComments(node);
-                    }
-                    else {
-                        if (isExportedImport) {
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                            emit(namespaceDeclaration.name);
-                            write(";");
-                        }
-                        else if (namespaceDeclaration && isDefaultImport(node)) {
-                            // import d, * as x from "foo"
-                            write(varOrConst);
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                            write(getGeneratedNameForNode(<ImportDeclaration>node));
-                            write(";");
-                        }
-                        emitExportImportAssignments(node);
-                    }
-                }
-            }
-
-            function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
-                if (isExternalModuleImportEqualsDeclaration(node)) {
-                    emitExternalImportDeclaration(node);
-                    return;
-                }
-                // preserve old compiler's behavior: emit 'var' for import declaration (even if we do not consider them referenced) when
-                // - current file is not external module
-                // - import declaration is top level and target is value imported by entity name
-                if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
-                    emitLeadingComments(node);
-                    emitStart(node);
-
-                    // variable declaration for import-equals declaration can be hoisted in system modules
-                    // in this case 'var' should be omitted and emit should contain only initialization
-                    const variableDeclarationIsHoisted = shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ true);
-
-                    // is it top level export import v = a.b.c in system module?
-                    // if yes - it needs to be rewritten as exporter('v', v = a.b.c)
-                    const isExported = isSourceFileLevelDeclarationInSystemJsModule(node, /*isExported*/ true);
-
-                    if (!variableDeclarationIsHoisted) {
-                        Debug.assert(!isExported);
-
-                        if (isES6ExportedDeclaration(node)) {
-                            write("export ");
-                            write("var ");
-                        }
-                        else if (!(node.flags & NodeFlags.Export)) {
-                            write("var ");
-                        }
-                    }
-
-
-                    if (isExported) {
-                        write(`${exportFunctionForFile}("`);
-                        emitNodeWithoutSourceMap(node.name);
-                        write(`", `);
-                    }
-
-                    emitModuleMemberName(node);
-                    write(" = ");
-                    emit(node.moduleReference);
-
-                    if (isExported) {
-                        write(")");
-                    }
-
-                    write(";");
-                    emitEnd(node);
-                    emitExportImportAssignments(node);
-                    emitTrailingComments(node);
-                }
-            }
-
-            function emitExportDeclaration(node: ExportDeclaration) {
-                Debug.assert(modulekind !== ModuleKind.System);
-
-                if (modulekind !== ModuleKind.ES6) {
-                    if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
-                        emitStart(node);
-                        const generatedName = getGeneratedNameForNode(node);
-                        if (node.exportClause) {
-                            // export { x, y, ... } from "foo"
-                            if (modulekind !== ModuleKind.AMD) {
-                                write("var ");
-                                write(generatedName);
-                                write(" = ");
-                                emitRequire(getExternalModuleName(node));
-                                write(";");
-                            }
-                            for (const specifier of node.exportClause.elements) {
-                                if (resolver.isValueAliasDeclaration(specifier)) {
-                                    writeLine();
-                                    emitStart(specifier);
-                                    emitContainingModuleName(specifier);
-                                    write(".");
-                                    emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                                    write(" = ");
-                                    write(generatedName);
-                                    write(".");
-                                    emitNodeWithCommentsAndWithoutSourcemap(specifier.propertyName || specifier.name);
-                                    write(";");
-                                    emitEnd(specifier);
-                                }
-                            }
-                        }
-                        else {
-                            // export * from "foo"
-                            if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
-                                writeLine();
-                                write("__export(");
-                                if (modulekind !== ModuleKind.AMD) {
-                                    emitRequire(getExternalModuleName(node));
-                                }
-                                else {
-                                    write(generatedName);
-                                }
-                                write(");");
-                            }
-                        }
-                        emitEnd(node);
-                    }
-                }
-                else {
-                    if (!node.exportClause || resolver.isValueAliasDeclaration(node)) {
-                        write("export ");
-                        if (node.exportClause) {
-                            // export { x, y, ... }
-                            write("{ ");
-                            emitExportOrImportSpecifierList(node.exportClause.elements, resolver.isValueAliasDeclaration);
-                            write(" }");
-                        }
-                        else {
-                            write("*");
-                        }
-                        if (node.moduleSpecifier) {
-                            write(" from ");
-                            emit(node.moduleSpecifier);
-                        }
-                        write(";");
-                    }
-                }
-            }
-
-            function emitExportOrImportSpecifierList(specifiers: ImportOrExportSpecifier[], shouldEmit: (node: Node) => boolean) {
-                Debug.assert(modulekind === ModuleKind.ES6);
-
-                let needsComma = false;
-                for (const specifier of specifiers) {
-                    if (shouldEmit(specifier)) {
-                        if (needsComma) {
-                            write(", ");
-                        }
-                        if (specifier.propertyName) {
-                            emit(specifier.propertyName);
-                            write(" as ");
-                        }
-                        emit(specifier.name);
-                        needsComma = true;
-                    }
-                }
-            }
-
-            function emitExportAssignment(node: ExportAssignment) {
-                if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                    if (modulekind === ModuleKind.ES6) {
-                        writeLine();
-                        emitStart(node);
-                        write("export default ");
-                        const expression = node.expression;
-                        emit(expression);
-                        if (expression.kind !== SyntaxKind.FunctionDeclaration &&
-                            expression.kind !== SyntaxKind.ClassDeclaration) {
-                            write(";");
-                        }
-                        emitEnd(node);
-                    }
-                    else {
-                        writeLine();
-                        emitStart(node);
-                        if (modulekind === ModuleKind.System) {
-                            write(`${exportFunctionForFile}("default",`);
-                            emit(node.expression);
-                            write(")");
-                        }
-                        else {
-                            emitEs6ExportDefaultCompat(node);
-                            emitContainingModuleName(node);
-                            if (languageVersion === ScriptTarget.ES3) {
-                                write('["default"] = ');
-                            }
-                            else {
-                                write(".default = ");
-                            }
-                            emit(node.expression);
-                        }
-                        write(";");
-                        emitEnd(node);
-                    }
-                }
-            }
-
-            function collectExternalModuleInfo(sourceFile: SourceFile) {
-                externalImports = [];
-                exportSpecifiers = createMap<ExportSpecifier[]>();
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                for (const node of sourceFile.statements) {
-                    switch (node.kind) {
-                        case SyntaxKind.ImportDeclaration:
-                            if (!(<ImportDeclaration>node).importClause ||
-                                resolver.isReferencedAliasDeclaration((<ImportDeclaration>node).importClause, /*checkChildren*/ true)) {
-                                // import "mod"
-                                // import x from "mod" where x is referenced
-                                // import * as x from "mod" where x is referenced
-                                // import { x, y } from "mod" where at least one import is referenced
-                                externalImports.push(<ImportDeclaration>node);
-                            }
-                            break;
-                        case SyntaxKind.ImportEqualsDeclaration:
-                            if ((<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference && resolver.isReferencedAliasDeclaration(node)) {
-                                // import x = require("mod") where x is referenced
-                                externalImports.push(<ImportEqualsDeclaration>node);
-                            }
-                            break;
-                        case SyntaxKind.ExportDeclaration:
-                            if ((<ExportDeclaration>node).moduleSpecifier) {
-                                if (!(<ExportDeclaration>node).exportClause) {
-                                    // export * from "mod"
-                                    if (resolver.moduleExportsSomeValue((<ExportDeclaration>node).moduleSpecifier)) {
-                                        externalImports.push(<ExportDeclaration>node);
-                                        hasExportStarsToExportValues = true;
-                                    }
-                                }
-                                else if (resolver.isValueAliasDeclaration(node)) {
-                                    // export { x, y } from "mod" where at least one export is a value symbol
-                                    externalImports.push(<ExportDeclaration>node);
-                                }
-                            }
-                            else {
-                                // export { x, y }
-                                for (const specifier of (<ExportDeclaration>node).exportClause.elements) {
-                                    const name = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
-                                }
-                            }
-                            break;
-                        case SyntaxKind.ExportAssignment:
-                            if ((<ExportAssignment>node).isExportEquals && !exportEquals) {
-                                // export = x
-                                exportEquals = <ExportAssignment>node;
-                            }
-                            break;
-                    }
-                }
-            }
-
-            function emitExportStarHelper() {
-                if (hasExportStarsToExportValues) {
-                    writeLine();
-                    write("function __export(m) {");
-                    increaseIndent();
-                    writeLine();
-                    write("for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];");
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-            }
-
-            function getLocalNameForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): string {
-                const namespaceDeclaration = getNamespaceDeclarationNode(node);
-                if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
-                }
-                if (node.kind === SyntaxKind.ImportDeclaration && (<ImportDeclaration>node).importClause) {
-                    return getGeneratedNameForNode(node);
-                }
-                if (node.kind === SyntaxKind.ExportDeclaration && (<ExportDeclaration>node).moduleSpecifier) {
-                    return getGeneratedNameForNode(node);
-                }
-            }
-
-            function getExternalModuleNameText(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration, emitRelativePathAsModuleName: boolean): string {
-                if (emitRelativePathAsModuleName) {
-                    const name = getExternalModuleNameFromDeclaration(host, resolver, importNode);
-                    if (name) {
-                        return `"${name}"`;
-                    }
-                }
-                const moduleName = getExternalModuleName(importNode);
-                if (moduleName.kind === SyntaxKind.StringLiteral) {
-                    return tryRenameExternalModule(<LiteralExpression>moduleName) || getLiteralText(<LiteralExpression>moduleName);
-                }
-
-                return undefined;
-            }
-
-            function emitVariableDeclarationsForImports(): void {
-                if (externalImports.length === 0) {
-                    return;
-                }
-
-                writeLine();
-                let started = false;
-                for (const importNode of externalImports) {
-                    // do not create variable declaration for exports and imports that lack import clause
-                    const skipNode =
-                        importNode.kind === SyntaxKind.ExportDeclaration ||
-                        (importNode.kind === SyntaxKind.ImportDeclaration && !(<ImportDeclaration>importNode).importClause);
-
-                    if (skipNode) {
-                        continue;
-                    }
-
-                    if (!started) {
-                        write("var ");
-                        started = true;
-                    }
-                    else {
-                        write(", ");
-                    }
-
-                    write(getLocalNameForExternalImport(importNode));
-                }
-
-                if (started) {
-                    write(";");
-                }
-            }
-
-            function emitLocalStorageForExportedNamesIfNecessary(exportedDeclarations: (Identifier | Declaration)[]): string {
-                // when resolving exports local exported entries/indirect exported entries in the module
-                // should always win over entries with similar names that were added via star exports
-                // to support this we store names of local/indirect exported entries in a set.
-                // this set is used to filter names brought by star exports.
-                if (!hasExportStarsToExportValues) {
-                    // local names set is needed only in presence of star exports
-                    return undefined;
-                }
-
-                // local names set should only be added if we have anything exported
-                if (!exportedDeclarations && !someProperties(exportSpecifiers)) {
-                    // no exported declarations (export var ...) or export specifiers (export {x})
-                    // check if we have any non star export declarations.
-                    let hasExportDeclarationWithExportClause = false;
-                    for (const externalImport of externalImports) {
-                        if (externalImport.kind === SyntaxKind.ExportDeclaration && (<ExportDeclaration>externalImport).exportClause) {
-                            hasExportDeclarationWithExportClause = true;
-                            break;
-                        }
-                    }
-
-                    if (!hasExportDeclarationWithExportClause) {
-                        // we still need to emit exportStar helper
-                        return emitExportStarFunction(/*localNames*/ undefined);
-                    }
-                }
-
-                const exportedNamesStorageRef = makeUniqueName("exportedNames");
-
-                writeLine();
-                write(`var ${exportedNamesStorageRef} = {`);
-                increaseIndent();
-
-                let started = false;
-                if (exportedDeclarations) {
-                    for (let i = 0; i < exportedDeclarations.length; i++) {
-                        // write name of exported declaration, i.e 'export var x...'
-                        writeExportedName(exportedDeclarations[i]);
-                    }
-                }
-
-                if (exportSpecifiers) {
-                    for (const n in exportSpecifiers) {
-                        for (const specifier of exportSpecifiers[n]) {
-                            // write name of export specified, i.e. 'export {x}'
-                            writeExportedName(specifier.name);
-                        }
-                    }
-                }
-
-                for (const externalImport of externalImports) {
-                    if (externalImport.kind !== SyntaxKind.ExportDeclaration) {
-                        continue;
-                    }
-
-                    const exportDecl = <ExportDeclaration>externalImport;
-                    if (!exportDecl.exportClause) {
-                        // export * from ...
-                        continue;
-                    }
-
-                    for (const element of exportDecl.exportClause.elements) {
-                        // write name of indirectly exported entry, i.e. 'export {x} from ...'
-                        writeExportedName(element.name || element.propertyName);
-                    }
-                }
-
-                decreaseIndent();
-                writeLine();
-                write("};");
-
-                return emitExportStarFunction(exportedNamesStorageRef);
-
-                function emitExportStarFunction(localNames: string): string {
-                    const exportStarFunction = makeUniqueName("exportStar");
-
-                    writeLine();
-
-                    // define an export star helper function
-                    write(`function ${exportStarFunction}(m) {`);
-                    increaseIndent();
-                    writeLine();
-                    write(`var exports = {};`);
-                    writeLine();
-                    write(`for(var n in m) {`);
-                    increaseIndent();
-                    writeLine();
-                    write(`if (n !== "default"`);
-                    if (localNames) {
-                        write(`&& !${localNames}.hasOwnProperty(n)`);
-                    }
-                    write(`) exports[n] = m[n];`);
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                    writeLine();
-                    write(`${exportFunctionForFile}(exports);`);
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-
-                    return exportStarFunction;
-                }
-
-                function writeExportedName(node: Identifier | Declaration): void {
-                    // do not record default exports
-                    // they are local to module and never overwritten (explicitly skipped) by star export
-                    if (node.kind !== SyntaxKind.Identifier && node.flags & NodeFlags.Default) {
-                        return;
-                    }
-
-                    if (started) {
-                        write(",");
-                    }
-                    else {
-                        started = true;
-                    }
-
-                    writeLine();
-                    write("'");
-                    if (node.kind === SyntaxKind.Identifier) {
-                        emitNodeWithCommentsAndWithoutSourcemap(node);
-                    }
-                    else {
-                        emitDeclarationName(<Declaration>node);
-                    }
-
-                    write("': true");
-                }
-            }
-
-            function processTopLevelVariableAndFunctionDeclarations(node: SourceFile): (Identifier | Declaration)[] {
-                // per ES6 spec:
-                // 15.2.1.16.4 ModuleDeclarationInstantiation() Concrete Method
-                // - var declarations are initialized to undefined - 14.a.ii
-                // - function/generator declarations are instantiated - 16.a.iv
-                // this means that after module is instantiated but before its evaluation
-                // exported functions are already accessible at import sites
-                // in theory we should hoist only exported functions and its dependencies
-                // in practice to simplify things we'll hoist all source level functions and variable declaration
-                // including variables declarations for module and class declarations
-                let hoistedVars: (Identifier | ClassDeclaration | ModuleDeclaration | EnumDeclaration)[];
-                let hoistedFunctionDeclarations: FunctionDeclaration[];
-                let exportedDeclarations: (Identifier | Declaration)[];
-
-                visit(node);
-
-                if (hoistedVars) {
-                    writeLine();
-                    write("var ");
-                    const seen = createMap<string>();
-                    for (let i = 0; i < hoistedVars.length; i++) {
-                        const local = hoistedVars[i];
-                        const name = local.kind === SyntaxKind.Identifier
-                            ? <Identifier>local
-                            : <Identifier>(<ClassDeclaration | ModuleDeclaration | EnumDeclaration>local).name;
-
-                        if (name) {
-                            // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            const text = unescapeIdentifier(name.text);
-                            if (text in seen) {
-                                continue;
-                            }
-                            else {
-                                seen[text] = text;
-                            }
-                        }
-
-                        if (i !== 0) {
-                            write(", ");
-                        }
-
-                        if (local.kind === SyntaxKind.ClassDeclaration || local.kind === SyntaxKind.ModuleDeclaration || local.kind === SyntaxKind.EnumDeclaration) {
-                            emitDeclarationName(<ClassDeclaration | ModuleDeclaration | EnumDeclaration>local);
-                        }
-                        else {
-                            emit(local);
-                        }
-
-                        const flags = getCombinedNodeFlags(local.kind === SyntaxKind.Identifier ? local.parent : local);
-                        if (flags & NodeFlags.Export) {
-                            if (!exportedDeclarations) {
-                                exportedDeclarations = [];
-                            }
-                            exportedDeclarations.push(local);
-                        }
-                    }
-                    write(";");
-                }
-
-                if (hoistedFunctionDeclarations) {
-                    for (const f of hoistedFunctionDeclarations) {
-                        writeLine();
-                        emit(f);
-
-                        if (f.flags & NodeFlags.Export) {
-                            if (!exportedDeclarations) {
-                                exportedDeclarations = [];
-                            }
-                            exportedDeclarations.push(f);
-                        }
-                    }
-                }
-
-                return exportedDeclarations;
-
-                function visit(node: Node): void {
-                    if (node.flags & NodeFlags.Ambient) {
-                        return;
-                    }
-
-                    if (node.kind === SyntaxKind.FunctionDeclaration) {
-                        if (!hoistedFunctionDeclarations) {
-                            hoistedFunctionDeclarations = [];
-                        }
-
-                        hoistedFunctionDeclarations.push(<FunctionDeclaration>node);
-                        return;
-                    }
-
-                    if (node.kind === SyntaxKind.ClassDeclaration) {
-                        if (!hoistedVars) {
-                            hoistedVars = [];
-                        }
-
-                        hoistedVars.push(<ClassDeclaration>node);
-                        return;
-                    }
-
-                    if (node.kind === SyntaxKind.EnumDeclaration) {
-                        if (shouldEmitEnumDeclaration(<EnumDeclaration>node)) {
-                            if (!hoistedVars) {
-                                hoistedVars = [];
-                            }
-
-                            hoistedVars.push(<ModuleDeclaration>node);
-                        }
-
-                        return;
-                    }
-
-                    if (node.kind === SyntaxKind.ModuleDeclaration) {
-                        if (shouldEmitModuleDeclaration(<ModuleDeclaration>node)) {
-                            if (!hoistedVars) {
-                                hoistedVars = [];
-                            }
-
-                            hoistedVars.push(<ModuleDeclaration>node);
-                        }
-                        return;
-                    }
-
-                    if (node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement) {
-                        if (shouldHoistVariable(<VariableDeclaration | BindingElement>node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            const name = (<VariableDeclaration | BindingElement>node).name;
-                            if (name.kind === SyntaxKind.Identifier) {
-                                if (!hoistedVars) {
-                                    hoistedVars = [];
-                                }
-
-                                hoistedVars.push(<Identifier>name);
-                            }
-                            else {
-                                forEachChild(name, visit);
-                            }
-                        }
-                        return;
-                    }
-
-                    if (isInternalModuleImportEqualsDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
-                        if (!hoistedVars) {
-                            hoistedVars = [];
-                        }
-
-                        hoistedVars.push(node.name);
-                        return;
-                    }
-
-                    if (isBindingPattern(node)) {
-                        forEach((<BindingPattern>node).elements, visit);
-                        return;
-                    }
-
-                    if (!isDeclaration(node)) {
-                        forEachChild(node, visit);
-                    }
-                }
-            }
-
-            function shouldHoistVariable(node: VariableDeclaration | VariableDeclarationList | BindingElement, checkIfSourceFileLevelDecl: boolean): boolean {
-                if (checkIfSourceFileLevelDecl && !shouldHoistDeclarationInSystemJsModule(node)) {
-                    return false;
-                }
-                // hoist variable if
-                // - it is not block scoped
-                // - it is top level block scoped
-                // if block scoped variables are nested in some another block then
-                // no other functions can use them except ones that are defined at least in the same block
-                return (getCombinedNodeFlags(node) & NodeFlags.BlockScoped) === 0 ||
-                    getEnclosingBlockScopeContainer(node).kind === SyntaxKind.SourceFile;
-            }
-
-            function isCurrentFileSystemExternalModule() {
-                return modulekind === ModuleKind.System && isCurrentFileExternalModule;
-            }
-
-            function emitSystemModuleBody(node: SourceFile, dependencyGroups: DependencyGroup[], startIndex: number): void {
-                // shape of the body in system modules:
-                // function (exports) {
-                //     <list of local aliases for imports>
-                //     <hoisted function declarations>
-                //     <hoisted variable declarations>
-                //     return {
-                //         setters: [
-                //             <list of setter function for imports>
-                //         ],
-                //         execute: function() {
-                //             <module statements>
-                //         }
-                //     }
-                //     <temp declarations>
-                // }
-                // I.e:
-                // import {x} from 'file1'
-                // var y = 1;
-                // export function foo() { return y + x(); }
-                // console.log(y);
-                // will be transformed to
-                // function(exports) {
-                //     var file1; // local alias
-                //     var y;
-                //     function foo() { return y + file1.x(); }
-                //     exports("foo", foo);
-                //     return {
-                //         setters: [
-                //             function(v) { file1 = v }
-                //         ],
-                //         execute(): function() {
-                //             y = 1;
-                //             console.log(y);
-                //         }
-                //     };
-                // }
-                emitVariableDeclarationsForImports();
-                writeLine();
-                const exportedDeclarations = processTopLevelVariableAndFunctionDeclarations(node);
-                const exportStarFunction = emitLocalStorageForExportedNamesIfNecessary(exportedDeclarations);
-                writeLine();
-                write("return {");
-                increaseIndent();
-                writeLine();
-                emitSetters(exportStarFunction, dependencyGroups);
-                writeLine();
-                emitExecute(node, startIndex);
-                decreaseIndent();
-                writeLine();
-                write("}"); // return
-                emitTempDeclarations(/*newLine*/ true);
-            }
-
-            function emitSetters(exportStarFunction: string, dependencyGroups: DependencyGroup[]) {
-                write("setters:[");
-
-                for (let i = 0; i < dependencyGroups.length; i++) {
-                    if (i !== 0) {
-                        write(",");
-                    }
-
-                    writeLine();
-                    increaseIndent();
-
-                    const group = dependencyGroups[i];
-
-                    // derive a unique name for parameter from the first named entry in the group
-                    const parameterName = makeUniqueName(forEach(group, getLocalNameForExternalImport) || "");
-                    write(`function (${parameterName}) {`);
-                    increaseIndent();
-
-                    for (const entry of group) {
-                        const importVariableName = getLocalNameForExternalImport(entry) || "";
-
-                        switch (entry.kind) {
-                            case SyntaxKind.ImportDeclaration:
-                                if (!(<ImportDeclaration>entry).importClause) {
-                                    // 'import "..."' case
-                                    // module is imported only for side-effects, no emit required
-                                    break;
-                                }
-                            // fall-through
-                            case SyntaxKind.ImportEqualsDeclaration:
-                                Debug.assert(importVariableName !== "");
-
-                                writeLine();
-                                // save import into the local
-                                write(`${importVariableName} = ${parameterName};`);
-                                writeLine();
-                                break;
-                            case SyntaxKind.ExportDeclaration:
-                                Debug.assert(importVariableName !== "");
-
-                                if ((<ExportDeclaration>entry).exportClause) {
-                                    // export {a, b as c} from 'foo'
-                                    // emit as:
-                                    // exports_({
-                                    //    "a": _["a"],
-                                    //    "c": _["b"]
-                                    // });
-                                    writeLine();
-                                    write(`${exportFunctionForFile}({`);
-                                    writeLine();
-                                    increaseIndent();
-                                    for (let i = 0, len = (<ExportDeclaration>entry).exportClause.elements.length; i < len; i++) {
-                                        if (i !== 0) {
-                                            write(",");
-                                            writeLine();
-                                        }
-
-                                        const e = (<ExportDeclaration>entry).exportClause.elements[i];
-                                        write(`"`);
-                                        emitNodeWithCommentsAndWithoutSourcemap(e.name);
-                                        write(`": ${parameterName}["`);
-                                        emitNodeWithCommentsAndWithoutSourcemap(e.propertyName || e.name);
-                                        write(`"]`);
-                                    }
-                                    decreaseIndent();
-                                    writeLine();
-                                    write("});");
-                                }
-                                else {
-                                    // collectExternalModuleInfo prefilters star exports to keep only ones that export values
-                                    // this means that check 'resolver.moduleExportsSomeValue' is redundant and can be omitted here
-                                    writeLine();
-                                    // export * from 'foo'
-                                    // emit as:
-                                    // exportStar(_foo);
-                                    write(`${exportStarFunction}(${parameterName});`);
-                                }
-
-                                writeLine();
-                                break;
-                        }
-
-                    }
-
-                    decreaseIndent();
-
-                    write("}");
-                    decreaseIndent();
-                }
-                write("],");
-            }
-
-            function emitExecute(node: SourceFile, startIndex: number) {
-                write("execute: function() {");
-                increaseIndent();
-                writeLine();
-                for (let i = startIndex; i < node.statements.length; i++) {
-                    const statement = node.statements[i];
-                    switch (statement.kind) {
-                        // - function declarations are not emitted because they were already hoisted
-                        // - import declarations are not emitted since they are already handled in setters
-                        // - export declarations with module specifiers are not emitted since they were already written in setters
-                        // - export declarations without module specifiers are emitted preserving the order
-                        case SyntaxKind.FunctionDeclaration:
-                        case SyntaxKind.ImportDeclaration:
-                            continue;
-                        case SyntaxKind.ExportDeclaration:
-                            if (!(<ExportDeclaration>statement).moduleSpecifier) {
-                                for (const element of (<ExportDeclaration>statement).exportClause.elements) {
-                                    // write call to exporter function for every export specifier in exports list
-                                    emitExportSpecifierInSystemModule(element);
-                                }
-                            }
-                            continue;
-                        case SyntaxKind.ImportEqualsDeclaration:
-                            if (!isInternalModuleImportEqualsDeclaration(statement)) {
-                                // - import equals declarations that import external modules are not emitted
-                                continue;
-                            }
-                            // fall-though for import declarations that import internal modules
-                        default:
-                            writeLine();
-                            emit(statement);
-                    }
-                }
-                decreaseIndent();
-                writeLine();
-                write("}"); // execute
-            }
-
-            function writeModuleName(node: SourceFile, emitRelativePathAsModuleName?: boolean): void {
-                let moduleName = node.moduleName;
-                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
-                    write(`"${moduleName}", `);
-                }
-            }
-
-            function emitSystemModule(node: SourceFile,  emitRelativePathAsModuleName?: boolean): void {
-                collectExternalModuleInfo(node);
-                // System modules has the following shape
-                // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
-                // 'exports' here is a function 'exports<T>(name: string, value: T): T' that is used to publish exported values.
-                // 'exports' returns its 'value' argument so in most cases expressions
-                // that mutate exported values can be rewritten as:
-                // expr -> exports('name', expr).
-                // The only exception in this rule is postfix unary operators,
-                // see comment to 'emitPostfixUnaryExpression' for more details
-                Debug.assert(!exportFunctionForFile);
-                // make sure that  name of 'exports' function does not conflict with existing identifiers
-                exportFunctionForFile = makeUniqueName("exports");
-                contextObjectForFile = makeUniqueName("context");
-                writeLine();
-                write("System.register(");
-                writeModuleName(node, emitRelativePathAsModuleName);
-                write("[");
-
-                const groupIndices = createMap<number>();
-                const dependencyGroups: DependencyGroup[] = [];
-
-                for (let i = 0; i < externalImports.length; i++) {
-                    const text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
-                    if (text === undefined) {
-                        continue;
-                    }
-
-                    // text should be quoted string
-                    // for deduplication purposes in key remove leading and trailing quotes so 'a' and "a" will be considered the same
-                    const key = text.substr(1, text.length - 2);
-
-                    if (key in groupIndices) {
-                        // deduplicate/group entries in dependency list by the dependency name
-                        const groupIndex = groupIndices[key];
-                        dependencyGroups[groupIndex].push(externalImports[i]);
-                        continue;
-                    }
-                    else {
-                        groupIndices[key] = dependencyGroups.length;
-                        dependencyGroups.push([externalImports[i]]);
-                    }
-
-                    if (i !== 0) {
-                        write(", ");
-                    }
-
-                    write(text);
-                }
-                write(`], function(${exportFunctionForFile}, ${contextObjectForFile}) {`);
-                writeLine();
-                increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                writeLine();
-                write(`var __moduleName = ${contextObjectForFile} && ${contextObjectForFile}.id;`);
-                writeLine();
-                emitEmitHelpers(node);
-                emitCaptureThisForNodeIfNecessary(node);
-                emitSystemModuleBody(node, dependencyGroups, startIndex);
-                decreaseIndent();
-                writeLine();
-                write("});");
-            }
-
-            interface AMDDependencyNames {
-                aliasedModuleNames: string[];
-                unaliasedModuleNames: string[];
-                importAliasNames: string[];
-            }
-
-            function getAMDDependencyNames(node: SourceFile, includeNonAmdDependencies: boolean, emitRelativePathAsModuleName?: boolean): AMDDependencyNames {
-                // names of modules with corresponding parameter in the factory function
-                const aliasedModuleNames: string[] = [];
-                // names of modules with no corresponding parameters in factory function
-                const unaliasedModuleNames: string[] = [];
-                const importAliasNames: string[] = [];     // names of the parameters in the factory function; these
-                // parameters need to match the indexes of the corresponding
-                // module names in aliasedModuleNames.
-
-                // Fill in amd-dependency tags
-                for (const amdDependency of node.amdDependencies) {
-                    if (amdDependency.name) {
-                        aliasedModuleNames.push('"' + amdDependency.path + '"');
-                        importAliasNames.push(amdDependency.name);
-                    }
-                    else {
-                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
-                    }
-                }
-
-                for (const importNode of externalImports) {
-                    // Find the name of the external module
-                    const externalModuleName = getExternalModuleNameText(importNode, emitRelativePathAsModuleName);
-
-                    // Find the name of the module alias, if there is one
-                    const importAliasName = getLocalNameForExternalImport(importNode);
-                    if (includeNonAmdDependencies && importAliasName) {
-                        aliasedModuleNames.push(externalModuleName);
-                        importAliasNames.push(importAliasName);
-                    }
-                    else {
-                        unaliasedModuleNames.push(externalModuleName);
-                    }
-                }
-
-                return { aliasedModuleNames, unaliasedModuleNames, importAliasNames };
-            }
-
-            function emitAMDDependencies(node: SourceFile, includeNonAmdDependencies: boolean, emitRelativePathAsModuleName?: boolean) {
-                // An AMD define function has the following shape:
-                //     define(id?, dependencies?, factory);
-                //
-                // This has the shape of
-                //     define(name, ["module1", "module2"], function (module1Alias) {
-                // The location of the alias in the parameter list in the factory function needs to
-                // match the position of the module name in the dependency list.
-                //
-                // To ensure this is true in cases of modules with no aliases, e.g.:
-                // `import "module"` or `<amd-dependency path= "a.css" />`
-                // we need to add modules without alias names to the end of the dependencies list
-
-                const dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
-                emitAMDDependencyList(dependencyNames);
-                write(", ");
-                emitAMDFactoryHeader(dependencyNames);
-            }
-
-            function emitAMDDependencyList({ aliasedModuleNames, unaliasedModuleNames }: AMDDependencyNames) {
-                write('["require", "exports"');
-                if (aliasedModuleNames.length) {
-                    write(", ");
-                    write(aliasedModuleNames.join(", "));
-                }
-                if (unaliasedModuleNames.length) {
-                    write(", ");
-                    write(unaliasedModuleNames.join(", "));
-                }
-                write("]");
-            }
-
-            function emitAMDFactoryHeader({ importAliasNames }: AMDDependencyNames) {
-                write("function (require, exports");
-                if (importAliasNames.length) {
-                    write(", ");
-                    write(importAliasNames.join(", "));
-                }
-                write(") {");
-            }
-
-            function emitAMDModule(node: SourceFile, emitRelativePathAsModuleName?: boolean) {
-                emitEmitHelpers(node);
-                collectExternalModuleInfo(node);
-
-                writeLine();
-                write("define(");
-                writeModuleName(node, emitRelativePathAsModuleName);
-                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
-                increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/!compilerOptions.noImplicitUseStrict);
-                emitExportStarHelper();
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitExportEquals(/*emitAsReturn*/ true);
-                emitTempDeclarations(/*newLine*/ true);
-                decreaseIndent();
-                writeLine();
-                write("});");
-            }
-
-            function emitCommonJSModule(node: SourceFile) {
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                emitEmitHelpers(node);
-                collectExternalModuleInfo(node);
-                emitExportStarHelper();
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitExportEquals(/*emitAsReturn*/ false);
-                emitTempDeclarations(/*newLine*/ true);
-            }
-
-            function emitUMDModule(node: SourceFile) {
-                emitEmitHelpers(node);
-                collectExternalModuleInfo(node);
-
-                const dependencyNames = getAMDDependencyNames(node, /*includeNonAmdDependencies*/ false);
-
-                // Module is detected first to support Browserify users that load into a browser with an AMD loader
-                writeLines(`(function (factory) {
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        var v = factory(require, exports); if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === 'function' && define.amd) {
-        define(`);
-                emitAMDDependencyList(dependencyNames);
-                write(", factory);");
-                writeLines(`    }
-})(`);
-                emitAMDFactoryHeader(dependencyNames);
-                increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                emitExportStarHelper();
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitExportEquals(/*emitAsReturn*/ true);
-                emitTempDeclarations(/*newLine*/ true);
-                decreaseIndent();
-                writeLine();
-                write("});");
-            }
-
-            function emitES6Module(node: SourceFile) {
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
-                emitEmitHelpers(node);
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
-                // Emit exportDefault if it exists will happen as part
-                // or normal statement emit.
-            }
-
-            function emitExportEquals(emitAsReturn: boolean) {
-                if (exportEquals && resolver.isValueAliasDeclaration(exportEquals)) {
-                    writeLine();
-                    emitStart(exportEquals);
-                    write(emitAsReturn ? "return " : "module.exports = ");
-                    emit((<ExportAssignment>exportEquals).expression);
-                    write(";");
-                    emitEnd(exportEquals);
-                }
-            }
-
-            function emitJsxElement(node: JsxElement | JsxSelfClosingElement) {
-                switch (compilerOptions.jsx) {
-                    case JsxEmit.React:
-                        jsxEmitReact(node);
-                        break;
-                    case JsxEmit.Preserve:
-                    // Fall back to preserve if None was specified (we'll error earlier)
-                    default:
-                        jsxEmitPreserve(node);
-                        break;
-                }
-            }
-
-            function trimReactWhitespaceAndApplyEntities(node: JsxText): string {
-                let result: string = undefined;
-                const text = getTextOfNode(node, /*includeTrivia*/ true);
-                let firstNonWhitespace = 0;
-                let lastNonWhitespace = -1;
-
-                // JSX trims whitespace at the end and beginning of lines, except that the
-                // start/end of a tag is considered a start/end of a line only if that line is
-                // on the same line as the closing tag. See examples in tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
-                for (let i = 0; i < text.length; i++) {
-                    const c = text.charCodeAt(i);
-                    if (isLineBreak(c)) {
-                        if (firstNonWhitespace !== -1 && (lastNonWhitespace - firstNonWhitespace + 1 > 0)) {
-                            const part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
-                            result = (result ? result + `" + ' ' + "` : "") + escapeString(part);
-                        }
-                        firstNonWhitespace = -1;
-                    }
-                    else if (!isWhiteSpaceSingleLine(c)) {
-                        lastNonWhitespace = i;
-                        if (firstNonWhitespace === -1) {
-                            firstNonWhitespace = i;
-                        }
-                    }
-                }
-
-                if (firstNonWhitespace !== -1) {
-                    const part = text.substr(firstNonWhitespace);
-                    result = (result ? result + "\" + ' ' + \"" : "") + escapeString(part);
-                }
-
-                if (result) {
-                    // Replace entities like &nbsp;
-                    result = result.replace(/&(\w+);/g, function(s: any, m: string) {
-                        if (entities[m] !== undefined) {
-                            const ch = String.fromCharCode(entities[m]);
-                            // &quot; needs to be escaped
-                            return ch === '"' ? "\\\"" : ch;
-                        }
-                        else {
-                            return s;
-                        }
-                    });
-                }
-
-                return result;
-            }
-
-            function isJsxChildEmittable(child: JsxChild): boolean  {
-                if (child.kind === SyntaxKind.JsxExpression) {
-                    // Don't emit empty expressions
-                    return !!(<JsxExpression>child).expression;
-
-                }
-                else if (child.kind === SyntaxKind.JsxText) {
-                    // Don't emit empty strings
-                    return !!getTextToEmit(<JsxText>child);
-                }
-
-                return true;
-            };
-
-            function getTextToEmit(node: JsxText): string {
-                switch (compilerOptions.jsx) {
-                    case JsxEmit.React:
-                        let text = trimReactWhitespaceAndApplyEntities(node);
-                        if (text === undefined || text.length === 0) {
-                            return undefined;
-                        }
-                        else {
-                            return text;
-                        }
-                    case JsxEmit.Preserve:
-                    default:
-                        return getTextOfNode(node, /*includeTrivia*/ true);
-                }
-            }
-
-            function emitJsxText(node: JsxText) {
-                switch (compilerOptions.jsx) {
-                    case JsxEmit.React:
-                        write('"');
-                        write(trimReactWhitespaceAndApplyEntities(node));
-                        write('"');
-                        break;
-
-                    case JsxEmit.Preserve:
-                    default: // Emit JSX-preserve as default when no --jsx flag is specified
-                        writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
-                        break;
-                }
-            }
-
-            function emitJsxExpression(node: JsxExpression) {
-                if (node.expression) {
-                    switch (compilerOptions.jsx) {
-                        case JsxEmit.Preserve:
-                        default:
-                            write("{");
-                            emit(node.expression);
-                            write("}");
-                            break;
-                        case JsxEmit.React:
-                            emit(node.expression);
-                            break;
-                    }
-                }
-            }
-
-            function isUseStrictPrologue(node: ExpressionStatement): boolean {
-                return (node.expression as StringLiteral).text === "use strict";
-            }
-
-            function ensureUseStrictPrologue(startWithNewLine: boolean, writeUseStrict: boolean) {
-                if (writeUseStrict) {
-                    if (startWithNewLine) {
-                        writeLine();
-                    }
-                    write("\"use strict\";");
-                }
-            }
-
-            function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean, ensureUseStrict?: boolean): number {
-                let foundUseStrict = false;
-                for (let i = 0; i < statements.length; i++) {
-                    if (isPrologueDirective(statements[i])) {
-                        if (isUseStrictPrologue(statements[i] as ExpressionStatement)) {
-                            foundUseStrict = true;
-                        }
-                        if (startWithNewLine || i > 0) {
-                            writeLine();
-                        }
-                        emit(statements[i]);
-                    }
-                    else {
-                        ensureUseStrictPrologue(startWithNewLine || i > 0, !foundUseStrict && ensureUseStrict);
-                        // return index of the first non prologue directive
-                        return i;
-                    }
-                }
-                ensureUseStrictPrologue(startWithNewLine, !foundUseStrict && ensureUseStrict);
-                return statements.length;
-            }
-
-            function writeLines(text: string): void {
-                const lines = text.split(/\r\n|\r|\n/g);
-                for (let i = 0; i < lines.length; i++) {
-                    const line = lines[i];
-                    if (line.length) {
-                        writeLine();
-                        write(line);
-                    }
-                }
-            }
-
-            function emitEmitHelpers(node: SourceFile): void {
-                // Only emit helpers if the user did not say otherwise.
-                if (!compilerOptions.noEmitHelpers) {
-                    // Only Emit __extends function when target ES5.
-                    // For target ES6 and above, we can emit classDeclaration as is.
-                    if (languageVersion < ScriptTarget.ES6 && !extendsEmitted && node.flags & NodeFlags.HasClassExtends) {
-                        writeLines(extendsHelper);
-                        extendsEmitted = true;
-                    }
-
-                    if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasJsxSpreadAttribute)) {
-                        writeLines(assignHelper);
-                        assignEmitted = true;
-                    }
-
-                    if (!decorateEmitted && node.flags & NodeFlags.HasDecorators) {
-                        writeLines(decorateHelper);
-                        if (compilerOptions.emitDecoratorMetadata) {
-                            writeLines(metadataHelper);
-                        }
-                        decorateEmitted = true;
-                    }
-
-                    if (!paramEmitted && node.flags & NodeFlags.HasParamDecorators) {
-                        writeLines(paramHelper);
-                        paramEmitted = true;
-                    }
-
-                    if (!awaiterEmitted && node.flags & NodeFlags.HasAsyncFunctions) {
-                        writeLines(awaiterHelper);
-                        awaiterEmitted = true;
-                    }
-                }
-            }
-
-            function emitSourceFileNode(node: SourceFile) {
-                // Start new file on new line
-                writeLine();
-                emitShebang();
-                emitDetachedCommentsAndUpdateCommentsInfo(node);
-
-                if (isExternalModule(node) || compilerOptions.isolatedModules) {
-                    if (isOwnFileEmit || (!isExternalModule(node) && compilerOptions.isolatedModules)) {
-                        const emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ModuleKind.CommonJS];
-                        emitModule(node);
-                    }
-                    else {
-                        bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/true);
-                    }
-                }
-                else {
-                    // emit prologue directives prior to __extends
-                    const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
-                    externalImports = undefined;
-                    exportSpecifiers = undefined;
-                    exportEquals = undefined;
-                    hasExportStarsToExportValues = false;
-                    emitEmitHelpers(node);
-                    emitCaptureThisForNodeIfNecessary(node);
-                    emitLinesStartingAt(node.statements, startIndex);
-                    emitTempDeclarations(/*newLine*/ true);
-                }
-
-                emitLeadingComments(node.endOfFileToken);
-            }
-
-            function emit(node: Node): void {
-                emitNodeConsideringCommentsOption(node, emitNodeWithSourceMap);
-            }
-
-            function emitNodeWithCommentsAndWithoutSourcemap(node: Node): void {
-                emitNodeConsideringCommentsOption(node, emitNodeWithoutSourceMap);
-            }
-
-            function emitNodeConsideringCommentsOption(node: Node, emitNodeConsideringSourcemap: (node: Node) => void): void {
-                if (node) {
-                    if (node.flags & NodeFlags.Ambient) {
-                        return emitCommentsOnNotEmittedNode(node);
-                    }
-
-                    if (isSpecializedCommentHandling(node)) {
-                        // This is the node that will handle its own comments and sourcemap
-                        return emitNodeWithoutSourceMap(node);
-                    }
-
-                    const emitComments = shouldEmitLeadingAndTrailingComments(node);
-                    if (emitComments) {
-                        emitLeadingComments(node);
-                    }
-
-                    emitNodeConsideringSourcemap(node);
-
-                    if (emitComments) {
-                        emitTrailingComments(node);
-                    }
-                }
-            }
-
-            function emitNodeWithSourceMap(node: Node): void {
-                if (node) {
-                    emitStart(node);
-                    emitNodeWithoutSourceMap(node);
-                    emitEnd(node);
-                }
-            }
-
-            function emitNodeWithoutSourceMap(node: Node): void {
-                if (node) {
-                    emitJavaScriptWorker(node);
-                }
-            }
-
-            function changeSourceMapEmit(writer: SourceMapWriter) {
-                sourceMap = writer;
-                emitStart = writer.emitStart;
-                emitEnd = writer.emitEnd;
-                emitPos = writer.emitPos;
-                setSourceFile = writer.setSourceFile;
-            }
-
-            function withTemporaryNoSourceMap(callback: () => void) {
-                const prevSourceMap = sourceMap;
-                setSourceMapWriterEmit(getNullSourceMapWriter());
-                callback();
-                setSourceMapWriterEmit(prevSourceMap);
-            }
-
-            function isSpecializedCommentHandling(node: Node): boolean {
-                switch (node.kind) {
-                    // All of these entities are emitted in a specialized fashion.  As such, we allow
-                    // the specialized methods for each to handle the comments on the nodes.
-                    case SyntaxKind.InterfaceDeclaration:
-                    case SyntaxKind.FunctionDeclaration:
-                    case SyntaxKind.ImportDeclaration:
-                    case SyntaxKind.ImportEqualsDeclaration:
-                    case SyntaxKind.TypeAliasDeclaration:
-                    case SyntaxKind.ExportAssignment:
-                        return true;
-                }
-            }
-
-            function shouldEmitLeadingAndTrailingComments(node: Node) {
-                switch (node.kind) {
-                    case SyntaxKind.VariableStatement:
-                        return shouldEmitLeadingAndTrailingCommentsForVariableStatement(<VariableStatement>node);
-
-                    case SyntaxKind.ModuleDeclaration:
-                        // Only emit the leading/trailing comments for a module if we're actually
-                        // emitting the module as well.
-                        return shouldEmitModuleDeclaration(<ModuleDeclaration>node);
-
-                    case SyntaxKind.EnumDeclaration:
-                        // Only emit the leading/trailing comments for an enum if we're actually
-                        // emitting the module as well.
-                        return shouldEmitEnumDeclaration(<EnumDeclaration>node);
-                }
-
-                // If the node is emitted in specialized fashion, dont emit comments as this node will handle
-                // emitting comments when emitting itself
-                Debug.assert(!isSpecializedCommentHandling(node));
-
-                // If this is the expression body of an arrow function that we're down-leveling,
-                // then we don't want to emit comments when we emit the body.  It will have already
-                // been taken care of when we emitted the 'return' statement for the function
-                // expression body.
-                if (node.kind !== SyntaxKind.Block &&
-                    node.parent &&
-                    node.parent.kind === SyntaxKind.ArrowFunction &&
-                    (<ArrowFunction>node.parent).body === node &&
-                    languageVersion <= ScriptTarget.ES5) {
-
-                    return false;
-                }
-
-                // Emit comments for everything else.
-                return true;
-            }
-
-            function emitJavaScriptWorker(node: Node) {
-                // Check if the node can be emitted regardless of the ScriptTarget
-                switch (node.kind) {
-                    case SyntaxKind.Identifier:
-                        return emitIdentifier(<Identifier>node);
-                    case SyntaxKind.Parameter:
-                        return emitParameter(<ParameterDeclaration>node);
-                    case SyntaxKind.MethodDeclaration:
-                    case SyntaxKind.MethodSignature:
-                        return emitMethod(<MethodDeclaration>node);
-                    case SyntaxKind.GetAccessor:
-                    case SyntaxKind.SetAccessor:
-                        return emitAccessor(<AccessorDeclaration>node);
-                    case SyntaxKind.ThisKeyword:
-                        return emitThis(node);
-                    case SyntaxKind.SuperKeyword:
-                        return emitSuper(node);
-                    case SyntaxKind.NullKeyword:
-                        return write("null");
-                    case SyntaxKind.TrueKeyword:
-                        return write("true");
-                    case SyntaxKind.FalseKeyword:
-                        return write("false");
-                    case SyntaxKind.NumericLiteral:
-                    case SyntaxKind.StringLiteral:
-                    case SyntaxKind.RegularExpressionLiteral:
-                    case SyntaxKind.NoSubstitutionTemplateLiteral:
-                    case SyntaxKind.TemplateHead:
-                    case SyntaxKind.TemplateMiddle:
-                    case SyntaxKind.TemplateTail:
-                        return emitLiteral(<LiteralExpression>node);
-                    case SyntaxKind.TemplateExpression:
-                        return emitTemplateExpression(<TemplateExpression>node);
-                    case SyntaxKind.TemplateSpan:
-                        return emitTemplateSpan(<TemplateSpan>node);
-                    case SyntaxKind.JsxElement:
-                    case SyntaxKind.JsxSelfClosingElement:
-                        return emitJsxElement(<JsxElement | JsxSelfClosingElement>node);
-                    case SyntaxKind.JsxText:
-                        return emitJsxText(<JsxText>node);
-                    case SyntaxKind.JsxExpression:
-                        return emitJsxExpression(<JsxExpression>node);
-                    case SyntaxKind.QualifiedName:
-                        return emitQualifiedName(<QualifiedName>node);
-                    case SyntaxKind.ObjectBindingPattern:
-                        return emitObjectBindingPattern(<BindingPattern>node);
-                    case SyntaxKind.ArrayBindingPattern:
-                        return emitArrayBindingPattern(<BindingPattern>node);
-                    case SyntaxKind.BindingElement:
-                        return emitBindingElement(<BindingElement>node);
-                    case SyntaxKind.ArrayLiteralExpression:
-                        return emitArrayLiteral(<ArrayLiteralExpression>node);
-                    case SyntaxKind.ObjectLiteralExpression:
-                        return emitObjectLiteral(<ObjectLiteralExpression>node);
-                    case SyntaxKind.PropertyAssignment:
-                        return emitPropertyAssignment(<PropertyDeclaration>node);
-                    case SyntaxKind.ShorthandPropertyAssignment:
-                        return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
-                    case SyntaxKind.ComputedPropertyName:
-                        return emitComputedPropertyName(<ComputedPropertyName>node);
-                    case SyntaxKind.PropertyAccessExpression:
-                        return emitPropertyAccess(<PropertyAccessExpression>node);
-                    case SyntaxKind.ElementAccessExpression:
-                        return emitIndexedAccess(<ElementAccessExpression>node);
-                    case SyntaxKind.CallExpression:
-                        return emitCallExpression(<CallExpression>node);
-                    case SyntaxKind.NewExpression:
-                        return emitNewExpression(<NewExpression>node);
-                    case SyntaxKind.TaggedTemplateExpression:
-                        return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
-                    case SyntaxKind.TypeAssertionExpression:
-                    case SyntaxKind.AsExpression:
-                    case SyntaxKind.NonNullExpression:
-                        return emit((<AssertionExpression | NonNullExpression>node).expression);
-                    case SyntaxKind.ParenthesizedExpression:
-                        return emitParenExpression(<ParenthesizedExpression>node);
-                    case SyntaxKind.FunctionDeclaration:
-                    case SyntaxKind.FunctionExpression:
-                    case SyntaxKind.ArrowFunction:
-                        return emitFunctionDeclaration(<FunctionLikeDeclaration>node);
-                    case SyntaxKind.DeleteExpression:
-                        return emitDeleteExpression(<DeleteExpression>node);
-                    case SyntaxKind.TypeOfExpression:
-                        return emitTypeOfExpression(<TypeOfExpression>node);
-                    case SyntaxKind.VoidExpression:
-                        return emitVoidExpression(<VoidExpression>node);
-                    case SyntaxKind.AwaitExpression:
-                        return emitAwaitExpression(<AwaitExpression>node);
-                    case SyntaxKind.PrefixUnaryExpression:
-                        return emitPrefixUnaryExpression(<PrefixUnaryExpression>node);
-                    case SyntaxKind.PostfixUnaryExpression:
-                        return emitPostfixUnaryExpression(<PostfixUnaryExpression>node);
-                    case SyntaxKind.BinaryExpression:
-                        return emitBinaryExpression(<BinaryExpression>node);
-                    case SyntaxKind.ConditionalExpression:
-                        return emitConditionalExpression(<ConditionalExpression>node);
-                    case SyntaxKind.SpreadElementExpression:
-                        return emitSpreadElementExpression(<SpreadElementExpression>node);
-                    case SyntaxKind.YieldExpression:
-                        return emitYieldExpression(<YieldExpression>node);
-                    case SyntaxKind.OmittedExpression:
-                        return;
-                    case SyntaxKind.Block:
-                    case SyntaxKind.ModuleBlock:
-                        return emitBlock(<Block>node);
-                    case SyntaxKind.VariableStatement:
-                        return emitVariableStatement(<VariableStatement>node);
-                    case SyntaxKind.EmptyStatement:
-                        return write(";");
-                    case SyntaxKind.ExpressionStatement:
-                        return emitExpressionStatement(<ExpressionStatement>node);
-                    case SyntaxKind.IfStatement:
-                        return emitIfStatement(<IfStatement>node);
-                    case SyntaxKind.DoStatement:
-                        return emitDoStatement(<DoStatement>node);
-                    case SyntaxKind.WhileStatement:
-                        return emitWhileStatement(<WhileStatement>node);
-                    case SyntaxKind.ForStatement:
-                        return emitForStatement(<ForStatement>node);
-                    case SyntaxKind.ForOfStatement:
-                    case SyntaxKind.ForInStatement:
-                        return emitForInOrForOfStatement(<ForInStatement>node);
-                    case SyntaxKind.ContinueStatement:
-                    case SyntaxKind.BreakStatement:
-                        return emitBreakOrContinueStatement(<BreakOrContinueStatement>node);
-                    case SyntaxKind.ReturnStatement:
-                        return emitReturnStatement(<ReturnStatement>node);
-                    case SyntaxKind.WithStatement:
-                        return emitWithStatement(<WithStatement>node);
-                    case SyntaxKind.SwitchStatement:
-                        return emitSwitchStatement(<SwitchStatement>node);
-                    case SyntaxKind.CaseClause:
-                    case SyntaxKind.DefaultClause:
-                        return emitCaseOrDefaultClause(<CaseOrDefaultClause>node);
-                    case SyntaxKind.LabeledStatement:
-                        return emitLabeledStatement(<LabeledStatement>node);
-                    case SyntaxKind.ThrowStatement:
-                        return emitThrowStatement(<ThrowStatement>node);
-                    case SyntaxKind.TryStatement:
-                        return emitTryStatement(<TryStatement>node);
-                    case SyntaxKind.CatchClause:
-                        return emitCatchClause(<CatchClause>node);
-                    case SyntaxKind.DebuggerStatement:
-                        return emitDebuggerStatement(node);
-                    case SyntaxKind.VariableDeclaration:
-                        return emitVariableDeclaration(<VariableDeclaration>node);
-                    case SyntaxKind.ClassExpression:
-                        return emitClassExpression(<ClassExpression>node);
-                    case SyntaxKind.ClassDeclaration:
-                        return emitClassDeclaration(<ClassDeclaration>node);
-                    case SyntaxKind.InterfaceDeclaration:
-                        return emitInterfaceDeclaration(<InterfaceDeclaration>node);
-                    case SyntaxKind.EnumDeclaration:
-                        return emitEnumDeclaration(<EnumDeclaration>node);
-                    case SyntaxKind.EnumMember:
-                        return emitEnumMember(<EnumMember>node);
-                    case SyntaxKind.ModuleDeclaration:
-                        return emitModuleDeclaration(<ModuleDeclaration>node);
-                    case SyntaxKind.ImportDeclaration:
-                        return emitImportDeclaration(<ImportDeclaration>node);
-                    case SyntaxKind.ImportEqualsDeclaration:
-                        return emitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
-                    case SyntaxKind.ExportDeclaration:
-                        return emitExportDeclaration(<ExportDeclaration>node);
-                    case SyntaxKind.ExportAssignment:
-                        return emitExportAssignment(<ExportAssignment>node);
-                    case SyntaxKind.SourceFile:
-                        return emitSourceFileNode(<SourceFile>node);
-                }
-            }
-
-            function hasDetachedComments(pos: number) {
-                return detachedCommentsInfo !== undefined && lastOrUndefined(detachedCommentsInfo).nodePos === pos;
-            }
-
-            function getLeadingCommentsWithoutDetachedComments() {
-                // get the leading comments from detachedPos
-                const leadingComments = getLeadingCommentRanges(currentText,
-                    lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
-                if (detachedCommentsInfo.length - 1) {
-                    detachedCommentsInfo.pop();
-                }
-                else {
-                    detachedCommentsInfo = undefined;
-                }
-
-                return leadingComments;
-            }
-
-            /**
-             * Determine if the given comment is a triple-slash
-             *
-             * @return true if the comment is a triple-slash comment else false
-             **/
-            function isTripleSlashComment(comment: CommentRange) {
-                // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
-                // so that we don't end up computing comment string and doing match for all // comments
-                if (currentText.charCodeAt(comment.pos + 1) === CharacterCodes.slash &&
-                    comment.pos + 2 < comment.end &&
-                    currentText.charCodeAt(comment.pos + 2) === CharacterCodes.slash) {
-                    const textSubStr = currentText.substring(comment.pos, comment.end);
-                    return textSubStr.match(fullTripleSlashReferencePathRegEx) ||
-                        textSubStr.match(fullTripleSlashAMDReferencePathRegEx) ?
-                        true : false;
-                }
-                return false;
-            }
-
-            function getLeadingCommentsToEmit(node: Node) {
-                // Emit the leading comments only if the parent's pos doesn't match because parent should take care of emitting these comments
-                if (node.parent) {
-                    if (node.parent.kind === SyntaxKind.SourceFile || node.pos !== node.parent.pos) {
-                        if (hasDetachedComments(node.pos)) {
-                            // get comments without detached comments
-                            return getLeadingCommentsWithoutDetachedComments();
-                        }
-                        else {
-                            // get the leading comments from the node
-                            return getLeadingCommentRangesOfNodeFromText(node, currentText);
-                        }
-                    }
-                }
-            }
-
-            function getTrailingCommentsToEmit(node: Node) {
-                // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments
-                if (node.parent) {
-                    if (node.parent.kind === SyntaxKind.SourceFile || node.end !== node.parent.end) {
-                        return getTrailingCommentRanges(currentText, node.end);
-                    }
-                }
-            }
-
-            /**
-             * Emit comments associated with node that will not be emitted into JS file
-             */
-            function emitCommentsOnNotEmittedNode(node: Node) {
-                emitLeadingCommentsWorker(node, /*isEmittedNode*/ false);
-            }
-
-            function emitLeadingComments(node: Node) {
-                return emitLeadingCommentsWorker(node, /*isEmittedNode*/ true);
-            }
-
-            function emitLeadingCommentsWorker(node: Node, isEmittedNode: boolean) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-
-                let leadingComments: CommentRange[];
-                if (isEmittedNode) {
-                    leadingComments = getLeadingCommentsToEmit(node);
-                }
-                else {
-                    // If the node will not be emitted in JS, remove all the comments(normal, pinned and ///) associated with the node,
-                    // unless it is a triple slash comment at the top of the file.
-                    // For Example:
-                    //      /// <reference-path ...>
-                    //      declare var x;
-                    //      /// <reference-path ...>
-                    //      interface F {}
-                    //  The first /// will NOT be removed while the second one will be removed even though both node will not be emitted
-                    if (node.pos === 0) {
-                        leadingComments = filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
-                    }
-                }
-
-                emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
-
-                // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
-            }
-
-            function emitTrailingComments(node: Node) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-
-                // Emit the trailing comments only if the parent's end doesn't match
-                const trailingComments = getTrailingCommentsToEmit(node);
-
-                // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
-            }
-
-            /**
-             * Emit trailing comments at the position. The term trailing comment is used here to describe following comment:
-             *      x, /comment1/ y
-             *        ^ => pos; the function will emit "comment1" in the emitJS
-             */
-            function emitTrailingCommentsOfPosition(pos: number) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-
-                const trailingComments = getTrailingCommentRanges(currentText, pos);
-
-                // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
-            }
-
-            function emitLeadingCommentsOfPositionWorker(pos: number) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-
-                let leadingComments: CommentRange[];
-                if (hasDetachedComments(pos)) {
-                    // get comments without detached comments
-                    leadingComments = getLeadingCommentsWithoutDetachedComments();
-                }
-                else {
-                    // get the leading comments from the node
-                    leadingComments = getLeadingCommentRanges(currentText, pos);
-                }
-
-                emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
-
-                // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
-            }
-
-            function emitDetachedCommentsAndUpdateCommentsInfo(node: TextRange) {
-                const currentDetachedCommentInfo = emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
-
-                if (currentDetachedCommentInfo) {
-                    if (detachedCommentsInfo) {
-                        detachedCommentsInfo.push(currentDetachedCommentInfo);
-                    }
-                    else {
-                        detachedCommentsInfo = [currentDetachedCommentInfo];
-                    }
-                }
-            }
-
-            function writeComment(text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) {
-                emitPos(comment.pos);
-                writeCommentRange(text, lineMap, writer, comment, newLine);
-                emitPos(comment.end);
-            }
-
-            function emitShebang() {
-                const shebang = getShebang(currentText);
-                if (shebang) {
-                    write(shebang);
-                    writeLine();
-                }
-            }
-        }
-
-        function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string },
-            sourceFiles: SourceFile[], isBundledEmit: boolean) {
-            // Make sure not to write js File and source map file if any of them cannot be written
+        function emitFile(jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
+            // Make sure not to write js file and source map file if any of them cannot be written
             if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit) {
-                emitJavaScript(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
+                printFile(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
             }
             else {
                 emitSkipped = true;
             }
 
             if (declarationFilePath) {
-                emitSkipped = writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
+                emitSkipped = writeDeclarationFile(declarationFilePath, getOriginalSourceFiles(sourceFiles), isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
 
             if (!emitSkipped && emittedFilesList) {
@@ -8392,5 +242,2696 @@ const _super = (function (geti, seti) {
                 }
             }
         }
+
+        function printFile(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
+            sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
+            nodeIdToGeneratedName = [];
+            autoGeneratedIdToGeneratedName = [];
+            generatedNameSet = createMap<string>();
+            isOwnFileEmit = !isBundledEmit;
+
+            // Emit helpers from all the files
+            if (isBundledEmit && moduleKind) {
+                forEach(sourceFiles, emitEmitHelpers);
+            }
+
+            // Print each transformed source file.
+            forEach(sourceFiles, printSourceFile);
+
+            writeLine();
+
+            const sourceMappingURL = sourceMap.getSourceMappingURL();
+            if (sourceMappingURL) {
+                write(`//# ${"sourceMappingURL"}=${sourceMappingURL}`); // Sometimes tools can sometimes see this line as a source mapping url comment
+            }
+
+            // Write the source map
+            if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
+                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false);
+            }
+
+            // Record source map data for the test harness.
+            if (sourceMapDataList) {
+                sourceMapDataList.push(sourceMap.getSourceMapData());
+            }
+
+            // Write the output file
+            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM);
+
+            // Reset state
+            sourceMap.reset();
+            comments.reset();
+            writer.reset();
+
+            tempFlags = TempFlags.Auto;
+            currentSourceFile = undefined;
+            currentText = undefined;
+            extendsEmitted = false;
+            assignEmitted = false;
+            decorateEmitted = false;
+            paramEmitted = false;
+            awaiterEmitted = false;
+            isOwnFileEmit = false;
+        }
+
+        function printSourceFile(node: SourceFile) {
+            currentSourceFile = node;
+            currentText = node.text;
+            currentFileIdentifiers = node.identifiers;
+            sourceMap.setSourceFile(node);
+            comments.setSourceFile(node);
+            emitNodeWithNotification(node, emitWorker);
+        }
+
+        /**
+         * Emits a node.
+         */
+        function emit(node: Node) {
+            emitNodeWithNotification(node, emitWithComments);
+        }
+
+
+        /**
+         * Emits a node with comments.
+         *
+         * NOTE: Do not call this method directly. It is part of the emit pipeline
+         * and should only be called indirectly from emit.
+         */
+        function emitWithComments(node: Node) {
+            emitNodeWithComments(node, emitWithSourceMap);
+        }
+
+        /**
+         * Emits a node with source maps.
+         *
+         * NOTE: Do not call this method directly. It is part of the emit pipeline
+         * and should only be called indirectly from emitWithComments.
+         */
+        function emitWithSourceMap(node: Node) {
+            emitNodeWithSourceMap(node, emitWorker);
+        }
+
+        function emitIdentifierName(node: Identifier) {
+            if (node) {
+                emitNodeWithNotification(node, emitIdentifierNameWithComments);
+            }
+        }
+
+        function emitIdentifierNameWithComments(node: Identifier) {
+            emitNodeWithComments(node, emitWorker);
+        }
+
+        /**
+         * Emits an expression node.
+         */
+        function emitExpression(node: Expression) {
+            emitNodeWithNotification(node, emitExpressionWithComments);
+        }
+
+        /**
+         * Emits an expression with comments.
+         *
+         * NOTE: Do not call this method directly. It is part of the emitExpression pipeline
+         * and should only be called indirectly from emitExpression.
+         */
+        function emitExpressionWithComments(node: Expression) {
+            emitNodeWithComments(node, emitExpressionWithSourceMap);
+        }
+
+        /**
+         * Emits an expression with source maps.
+         *
+         * NOTE: Do not call this method directly. It is part of the emitExpression pipeline
+         * and should only be called indirectly from emitExpressionWithComments.
+         */
+        function emitExpressionWithSourceMap(node: Expression) {
+            emitNodeWithSourceMap(node, emitExpressionWorker);
+        }
+
+        /**
+         * Emits a node with emit notification if available.
+         */
+        function emitNodeWithNotification(node: Node, emitCallback: (node: Node) => void) {
+            if (node) {
+                if (isEmitNotificationEnabled(node)) {
+                    onEmitNode(node, emitCallback);
+                }
+                else {
+                    emitCallback(node);
+                }
+            }
+        }
+
+        function emitNodeWithSourceMap(node: Node, emitCallback: (node: Node) => void) {
+            if (node) {
+                emitStart(/*range*/ node, /*contextNode*/ node, shouldSkipLeadingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
+                emitCallback(node);
+                emitEnd(/*range*/ node, /*contextNode*/ node, shouldSkipTrailingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
+            }
+        }
+
+        function getSourceMapRange(node: Node) {
+            return node.sourceMapRange || node;
+        }
+
+        /**
+         * Determines whether to skip leading comment emit for a node.
+         *
+         * We do not emit comments for NotEmittedStatement nodes or any node that has
+         * NodeEmitFlags.NoLeadingComments.
+         *
+         * @param node A Node.
+         */
+        function shouldSkipLeadingCommentsForNode(node: Node) {
+            return isNotEmittedStatement(node)
+                || (node.emitFlags & NodeEmitFlags.NoLeadingComments) !== 0;
+        }
+
+        /**
+         * Determines whether to skip source map emit for the start position of a node.
+         *
+         * We do not emit source maps for NotEmittedStatement nodes or any node that
+         * has NodeEmitFlags.NoLeadingSourceMap.
+         *
+         * @param node A Node.
+         */
+        function shouldSkipLeadingSourceMapForNode(node: Node) {
+            return isNotEmittedStatement(node)
+                || (node.emitFlags & NodeEmitFlags.NoLeadingSourceMap) !== 0;
+        }
+
+
+        /**
+         * Determines whether to skip source map emit for the end position of a node.
+         *
+         * We do not emit source maps for NotEmittedStatement nodes or any node that
+         * has NodeEmitFlags.NoTrailingSourceMap.
+         *
+         * @param node A Node.
+         */
+        function shouldSkipTrailingSourceMapForNode(node: Node) {
+            return isNotEmittedStatement(node)
+                || (node.emitFlags & NodeEmitFlags.NoTrailingSourceMap) !== 0;
+        }
+
+        /**
+         * Determines whether to skip source map emit for a node and its children.
+         *
+         * We do not emit source maps for a node that has NodeEmitFlags.NoNestedSourceMaps.
+         */
+        function shouldSkipSourceMapForChildren(node: Node) {
+            return (node.emitFlags & NodeEmitFlags.NoNestedSourceMaps) !== 0;
+        }
+
+        function emitWorker(node: Node): void {
+            if (tryEmitSubstitute(node, emitWorker, /*isExpression*/ false)) {
+                return;
+            }
+
+            const kind = node.kind;
+            switch (kind) {
+                // Pseudo-literals
+                case SyntaxKind.TemplateHead:
+                case SyntaxKind.TemplateMiddle:
+                case SyntaxKind.TemplateTail:
+                    return emitLiteral(<LiteralExpression>node);
+
+                // Identifiers
+                case SyntaxKind.Identifier:
+                    return emitIdentifier(<Identifier>node);
+
+                // Reserved words
+                case SyntaxKind.ConstKeyword:
+                case SyntaxKind.DefaultKeyword:
+                case SyntaxKind.ExportKeyword:
+                case SyntaxKind.VoidKeyword:
+
+                // Strict mode reserved words
+                case SyntaxKind.PrivateKeyword:
+                case SyntaxKind.ProtectedKeyword:
+                case SyntaxKind.PublicKeyword:
+                case SyntaxKind.StaticKeyword:
+
+                // Contextual keywords
+                case SyntaxKind.AbstractKeyword:
+                case SyntaxKind.AnyKeyword:
+                case SyntaxKind.AsyncKeyword:
+                case SyntaxKind.BooleanKeyword:
+                case SyntaxKind.DeclareKeyword:
+                case SyntaxKind.NumberKeyword:
+                case SyntaxKind.ReadonlyKeyword:
+                case SyntaxKind.StringKeyword:
+                case SyntaxKind.SymbolKeyword:
+                case SyntaxKind.GlobalKeyword:
+                    return writeTokenNode(node);
+
+                // Parse tree nodes
+
+                // Names
+                case SyntaxKind.QualifiedName:
+                    return emitQualifiedName(<QualifiedName>node);
+                case SyntaxKind.ComputedPropertyName:
+                    return emitComputedPropertyName(<ComputedPropertyName>node);
+
+                // Signature elements
+                case SyntaxKind.TypeParameter:
+                    return emitTypeParameter(<TypeParameterDeclaration>node);
+                case SyntaxKind.Parameter:
+                    return emitParameter(<ParameterDeclaration>node);
+                case SyntaxKind.Decorator:
+                    return emitDecorator(<Decorator>node);
+
+                // Type members
+                case SyntaxKind.PropertySignature:
+                    return emitPropertySignature(<PropertySignature>node);
+                case SyntaxKind.PropertyDeclaration:
+                    return emitPropertyDeclaration(<PropertyDeclaration>node);
+                case SyntaxKind.MethodSignature:
+                    return emitMethodSignature(<MethodSignature>node);
+                case SyntaxKind.MethodDeclaration:
+                    return emitMethodDeclaration(<MethodDeclaration>node);
+                case SyntaxKind.Constructor:
+                    return emitConstructor(<ConstructorDeclaration>node);
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return emitAccessorDeclaration(<AccessorDeclaration>node);
+                case SyntaxKind.CallSignature:
+                    return emitCallSignature(<CallSignatureDeclaration>node);
+                case SyntaxKind.ConstructSignature:
+                    return emitConstructSignature(<ConstructSignatureDeclaration>node);
+                case SyntaxKind.IndexSignature:
+                    return emitIndexSignature(<IndexSignatureDeclaration>node);
+
+                // Types
+                case SyntaxKind.TypePredicate:
+                    return emitTypePredicate(<TypePredicateNode>node);
+                case SyntaxKind.TypeReference:
+                    return emitTypeReference(<TypeReferenceNode>node);
+                case SyntaxKind.FunctionType:
+                    return emitFunctionType(<FunctionTypeNode>node);
+                case SyntaxKind.ConstructorType:
+                    return emitConstructorType(<ConstructorTypeNode>node);
+                case SyntaxKind.TypeQuery:
+                    return emitTypeQuery(<TypeQueryNode>node);
+                case SyntaxKind.TypeLiteral:
+                    return emitTypeLiteral(<TypeLiteralNode>node);
+                case SyntaxKind.ArrayType:
+                    return emitArrayType(<ArrayTypeNode>node);
+                case SyntaxKind.TupleType:
+                    return emitTupleType(<TupleTypeNode>node);
+                case SyntaxKind.UnionType:
+                    return emitUnionType(<UnionTypeNode>node);
+                case SyntaxKind.IntersectionType:
+                    return emitIntersectionType(<IntersectionTypeNode>node);
+                case SyntaxKind.ParenthesizedType:
+                    return emitParenthesizedType(<ParenthesizedTypeNode>node);
+                case SyntaxKind.ExpressionWithTypeArguments:
+                    return emitExpressionWithTypeArguments(<ExpressionWithTypeArguments>node);
+                case SyntaxKind.ThisType:
+                    return emitThisType(<ThisTypeNode>node);
+                case SyntaxKind.LiteralType:
+                    return emitLiteralType(<LiteralTypeNode>node);
+
+                // Binding patterns
+                case SyntaxKind.ObjectBindingPattern:
+                    return emitObjectBindingPattern(<BindingPattern>node);
+                case SyntaxKind.ArrayBindingPattern:
+                    return emitArrayBindingPattern(<BindingPattern>node);
+                case SyntaxKind.BindingElement:
+                    return emitBindingElement(<BindingElement>node);
+
+                // Misc
+                case SyntaxKind.TemplateSpan:
+                    return emitTemplateSpan(<TemplateSpan>node);
+                case SyntaxKind.SemicolonClassElement:
+                    return emitSemicolonClassElement(<SemicolonClassElement>node);
+
+                // Statements
+                case SyntaxKind.Block:
+                    return emitBlock(<Block>node);
+                case SyntaxKind.VariableStatement:
+                    return emitVariableStatement(<VariableStatement>node);
+                case SyntaxKind.EmptyStatement:
+                    return emitEmptyStatement(<EmptyStatement>node);
+                case SyntaxKind.ExpressionStatement:
+                    return emitExpressionStatement(<ExpressionStatement>node);
+                case SyntaxKind.IfStatement:
+                    return emitIfStatement(<IfStatement>node);
+                case SyntaxKind.DoStatement:
+                    return emitDoStatement(<DoStatement>node);
+                case SyntaxKind.WhileStatement:
+                    return emitWhileStatement(<WhileStatement>node);
+                case SyntaxKind.ForStatement:
+                    return emitForStatement(<ForStatement>node);
+                case SyntaxKind.ForInStatement:
+                    return emitForInStatement(<ForInStatement>node);
+                case SyntaxKind.ForOfStatement:
+                    return emitForOfStatement(<ForOfStatement>node);
+                case SyntaxKind.ContinueStatement:
+                    return emitContinueStatement(<ContinueStatement>node);
+                case SyntaxKind.BreakStatement:
+                    return emitBreakStatement(<BreakStatement>node);
+                case SyntaxKind.ReturnStatement:
+                    return emitReturnStatement(<ReturnStatement>node);
+                case SyntaxKind.WithStatement:
+                    return emitWithStatement(<WithStatement>node);
+                case SyntaxKind.SwitchStatement:
+                    return emitSwitchStatement(<SwitchStatement>node);
+                case SyntaxKind.LabeledStatement:
+                    return emitLabeledStatement(<LabeledStatement>node);
+                case SyntaxKind.ThrowStatement:
+                    return emitThrowStatement(<ThrowStatement>node);
+                case SyntaxKind.TryStatement:
+                    return emitTryStatement(<TryStatement>node);
+                case SyntaxKind.DebuggerStatement:
+                    return emitDebuggerStatement(<DebuggerStatement>node);
+
+                // Declarations
+                case SyntaxKind.VariableDeclaration:
+                    return emitVariableDeclaration(<VariableDeclaration>node);
+                case SyntaxKind.VariableDeclarationList:
+                    return emitVariableDeclarationList(<VariableDeclarationList>node);
+                case SyntaxKind.FunctionDeclaration:
+                    return emitFunctionDeclaration(<FunctionDeclaration>node);
+                case SyntaxKind.ClassDeclaration:
+                    return emitClassDeclaration(<ClassDeclaration>node);
+                case SyntaxKind.InterfaceDeclaration:
+                    return emitInterfaceDeclaration(<InterfaceDeclaration>node);
+                case SyntaxKind.TypeAliasDeclaration:
+                    return emitTypeAliasDeclaration(<TypeAliasDeclaration>node);
+                case SyntaxKind.EnumDeclaration:
+                    return emitEnumDeclaration(<EnumDeclaration>node);
+                case SyntaxKind.ModuleDeclaration:
+                    return emitModuleDeclaration(<ModuleDeclaration>node);
+                case SyntaxKind.ModuleBlock:
+                    return emitModuleBlock(<Block>node);
+                case SyntaxKind.CaseBlock:
+                    return emitCaseBlock(<CaseBlock>node);
+                case SyntaxKind.ImportEqualsDeclaration:
+                    return emitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+                case SyntaxKind.ImportDeclaration:
+                    return emitImportDeclaration(<ImportDeclaration>node);
+                case SyntaxKind.ImportClause:
+                    return emitImportClause(<ImportClause>node);
+                case SyntaxKind.NamespaceImport:
+                    return emitNamespaceImport(<NamespaceImport>node);
+                case SyntaxKind.NamedImports:
+                    return emitNamedImports(<NamedImports>node);
+                case SyntaxKind.ImportSpecifier:
+                    return emitImportSpecifier(<ImportSpecifier>node);
+                case SyntaxKind.ExportAssignment:
+                    return emitExportAssignment(<ExportAssignment>node);
+                case SyntaxKind.ExportDeclaration:
+                    return emitExportDeclaration(<ExportDeclaration>node);
+                case SyntaxKind.NamedExports:
+                    return emitNamedExports(<NamedExports>node);
+                case SyntaxKind.ExportSpecifier:
+                    return emitExportSpecifier(<ExportSpecifier>node);
+                case SyntaxKind.MissingDeclaration:
+                    return;
+
+                // Module references
+                case SyntaxKind.ExternalModuleReference:
+                    return emitExternalModuleReference(<ExternalModuleReference>node);
+
+                // JSX (non-expression)
+                case SyntaxKind.JsxText:
+                    return emitJsxText(<JsxText>node);
+                case SyntaxKind.JsxOpeningElement:
+                    return emitJsxOpeningElement(<JsxOpeningElement>node);
+                case SyntaxKind.JsxClosingElement:
+                    return emitJsxClosingElement(<JsxClosingElement>node);
+                case SyntaxKind.JsxAttribute:
+                    return emitJsxAttribute(<JsxAttribute>node);
+                case SyntaxKind.JsxSpreadAttribute:
+                    return emitJsxSpreadAttribute(<JsxSpreadAttribute>node);
+                case SyntaxKind.JsxExpression:
+                    return emitJsxExpression(<JsxExpression>node);
+
+                // Clauses
+                case SyntaxKind.CaseClause:
+                    return emitCaseClause(<CaseClause>node);
+                case SyntaxKind.DefaultClause:
+                    return emitDefaultClause(<DefaultClause>node);
+                case SyntaxKind.HeritageClause:
+                    return emitHeritageClause(<HeritageClause>node);
+                case SyntaxKind.CatchClause:
+                    return emitCatchClause(<CatchClause>node);
+
+                // Property assignments
+                case SyntaxKind.PropertyAssignment:
+                    return emitPropertyAssignment(<PropertyAssignment>node);
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
+
+                // Enum
+                case SyntaxKind.EnumMember:
+                    return emitEnumMember(<EnumMember>node);
+
+                // Top-level nodes
+                case SyntaxKind.SourceFile:
+                    return emitSourceFile(<SourceFile>node);
+
+                // JSDoc nodes (ignored)
+
+                // Transformation nodes (ignored)
+            }
+
+            if (isExpression(node)) {
+                return emitExpressionWorker(node);
+            }
+        }
+
+        function emitExpressionWorker(node: Node) {
+            if (tryEmitSubstitute(node, emitExpressionWorker, /*isExpression*/ true)) {
+                return;
+            }
+
+            const kind = node.kind;
+            switch (kind) {
+                // Literals
+                case SyntaxKind.NumericLiteral:
+                    return emitNumericLiteral(<NumericLiteral>node);
+
+                case SyntaxKind.StringLiteral:
+                case SyntaxKind.RegularExpressionLiteral:
+                case SyntaxKind.NoSubstitutionTemplateLiteral:
+                    return emitLiteral(<LiteralExpression>node);
+
+                // Identifiers
+                case SyntaxKind.Identifier:
+                    return emitIdentifier(<Identifier>node);
+
+                // Reserved words
+                case SyntaxKind.FalseKeyword:
+                case SyntaxKind.NullKeyword:
+                case SyntaxKind.SuperKeyword:
+                case SyntaxKind.TrueKeyword:
+                case SyntaxKind.ThisKeyword:
+                    return writeTokenNode(node);
+
+                // Expressions
+                case SyntaxKind.ArrayLiteralExpression:
+                    return emitArrayLiteralExpression(<ArrayLiteralExpression>node);
+                case SyntaxKind.ObjectLiteralExpression:
+                    return emitObjectLiteralExpression(<ObjectLiteralExpression>node);
+                case SyntaxKind.PropertyAccessExpression:
+                    return emitPropertyAccessExpression(<PropertyAccessExpression>node);
+                case SyntaxKind.ElementAccessExpression:
+                    return emitElementAccessExpression(<ElementAccessExpression>node);
+                case SyntaxKind.CallExpression:
+                    return emitCallExpression(<CallExpression>node);
+                case SyntaxKind.NewExpression:
+                    return emitNewExpression(<NewExpression>node);
+                case SyntaxKind.TaggedTemplateExpression:
+                    return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
+                case SyntaxKind.TypeAssertionExpression:
+                    return emitTypeAssertionExpression(<TypeAssertion>node);
+                case SyntaxKind.ParenthesizedExpression:
+                    return emitParenthesizedExpression(<ParenthesizedExpression>node);
+                case SyntaxKind.FunctionExpression:
+                    return emitFunctionExpression(<FunctionExpression>node);
+                case SyntaxKind.ArrowFunction:
+                    return emitArrowFunction(<ArrowFunction>node);
+                case SyntaxKind.DeleteExpression:
+                    return emitDeleteExpression(<DeleteExpression>node);
+                case SyntaxKind.TypeOfExpression:
+                    return emitTypeOfExpression(<TypeOfExpression>node);
+                case SyntaxKind.VoidExpression:
+                    return emitVoidExpression(<VoidExpression>node);
+                case SyntaxKind.AwaitExpression:
+                    return emitAwaitExpression(<AwaitExpression>node);
+                case SyntaxKind.PrefixUnaryExpression:
+                    return emitPrefixUnaryExpression(<PrefixUnaryExpression>node);
+                case SyntaxKind.PostfixUnaryExpression:
+                    return emitPostfixUnaryExpression(<PostfixUnaryExpression>node);
+                case SyntaxKind.BinaryExpression:
+                    return emitBinaryExpression(<BinaryExpression>node);
+                case SyntaxKind.ConditionalExpression:
+                    return emitConditionalExpression(<ConditionalExpression>node);
+                case SyntaxKind.TemplateExpression:
+                    return emitTemplateExpression(<TemplateExpression>node);
+                case SyntaxKind.YieldExpression:
+                    return emitYieldExpression(<YieldExpression>node);
+                case SyntaxKind.SpreadElementExpression:
+                    return emitSpreadElementExpression(<SpreadElementExpression>node);
+                case SyntaxKind.ClassExpression:
+                    return emitClassExpression(<ClassExpression>node);
+                case SyntaxKind.OmittedExpression:
+                    return;
+                case SyntaxKind.AsExpression:
+                    return emitAsExpression(<AsExpression>node);
+                case SyntaxKind.NonNullExpression:
+                    return emitNonNullExpression(<NonNullExpression>node);
+
+                // JSX
+                case SyntaxKind.JsxElement:
+                    return emitJsxElement(<JsxElement>node);
+                case SyntaxKind.JsxSelfClosingElement:
+                    return emitJsxSelfClosingElement(<JsxSelfClosingElement>node);
+
+                // Transformation nodes
+                case SyntaxKind.PartiallyEmittedExpression:
+                    return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
+            }
+        }
+
+        //
+        // Literals/Pseudo-literals
+        //
+
+        // SyntaxKind.NumericLiteral
+        function emitNumericLiteral(node: NumericLiteral) {
+            emitLiteral(node);
+            if (node.trailingComment) {
+                write(` /*${node.trailingComment}*/`);
+            }
+        }
+
+        // SyntaxKind.StringLiteral
+        // SyntaxKind.RegularExpressionLiteral
+        // SyntaxKind.NoSubstitutionTemplateLiteral
+        // SyntaxKind.TemplateHead
+        // SyntaxKind.TemplateMiddle
+        // SyntaxKind.TemplateTail
+        function emitLiteral(node: LiteralLikeNode) {
+            const text = getLiteralTextOfNode(node);
+            if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap)
+                && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
+                writer.writeLiteral(text);
+            }
+            else {
+                write(text);
+            }
+        }
+
+        //
+        // Identifiers
+        //
+
+        function emitIdentifier(node: Identifier) {
+            if (node.emitFlags & NodeEmitFlags.UMDDefine) {
+                writeLines(umdHelper);
+            }
+            else {
+                write(getTextOfNode(node, /*includeTrivia*/ false));
+            }
+        }
+
+        //
+        // Names
+        //
+
+        function emitQualifiedName(node: QualifiedName) {
+            emitEntityName(node.left);
+            write(".");
+            emit(node.right);
+        }
+
+        function emitEntityName(node: EntityName) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        function emitComputedPropertyName(node: ComputedPropertyName) {
+            write("[");
+            emitExpression(node.expression);
+            write("]");
+        }
+
+        //
+        // Signature elements
+        //
+
+        function emitTypeParameter(node: TypeParameterDeclaration) {
+            emit(node.name);
+            emitWithPrefix(" extends ", node.constraint);
+        }
+
+        function emitParameter(node: ParameterDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeIfPresent(node.dotDotDotToken, "...");
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitExpressionWithPrefix(" = ", node.initializer);
+            emitWithPrefix(": ", node.type);
+        }
+
+        function emitDecorator(decorator: Decorator) {
+            write("@");
+            emitExpression(decorator.expression);
+        }
+
+        //
+        // Type members
+        //
+
+        function emitPropertySignature(node: PropertySignature) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitPropertyDeclaration(node: PropertyDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            emitWithPrefix(": ", node.type);
+            emitExpressionWithPrefix(" = ", node.initializer);
+            write(";");
+        }
+
+        function emitMethodSignature(node: MethodSignature) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitMethodDeclaration(node: MethodDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeIfPresent(node.asteriskToken, "*");
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitConstructor(node: ConstructorDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("constructor");
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitAccessorDeclaration(node: AccessorDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitCallSignature(node: CallSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitConstructSignature(node: ConstructSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("new ");
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitIndexSignature(node: IndexSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitParametersForIndexSignature(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitSemicolonClassElement(node: SemicolonClassElement) {
+            write(";");
+        }
+
+        //
+        // Types
+        //
+
+        function emitTypePredicate(node: TypePredicateNode) {
+            emit(node.parameterName);
+            write(" is ");
+            emit(node.type);
+        }
+
+        function emitTypeReference(node: TypeReferenceNode) {
+            emit(node.typeName);
+            emitTypeArguments(node, node.typeArguments);
+        }
+
+        function emitFunctionType(node: FunctionTypeNode) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            write(" => ");
+            emit(node.type);
+        }
+
+        function emitConstructorType(node: ConstructorTypeNode) {
+            write("new ");
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            write(" => ");
+            emit(node.type);
+        }
+
+        function emitTypeQuery(node: TypeQueryNode) {
+            write("typeof ");
+            emit(node.exprName);
+        }
+
+        function emitTypeLiteral(node: TypeLiteralNode) {
+            write("{");
+            emitList(node, node.members, ListFormat.TypeLiteralMembers);
+            write("}");
+        }
+
+        function emitArrayType(node: ArrayTypeNode) {
+            emit(node.elementType);
+            write("[]");
+        }
+
+        function emitTupleType(node: TupleTypeNode) {
+            write("[");
+            emitList(node, node.elementTypes, ListFormat.TupleTypeElements);
+            write("]");
+        }
+
+        function emitUnionType(node: UnionTypeNode) {
+            emitList(node, node.types, ListFormat.UnionTypeConstituents);
+        }
+
+        function emitIntersectionType(node: IntersectionTypeNode) {
+            emitList(node, node.types, ListFormat.IntersectionTypeConstituents);
+        }
+
+        function emitParenthesizedType(node: ParenthesizedTypeNode) {
+            write("(");
+            emit(node.type);
+            write(")");
+        }
+
+        function emitThisType(node: ThisTypeNode) {
+            write("this");
+        }
+
+        function emitLiteralType(node: LiteralTypeNode) {
+            emitExpression(node.literal);
+        }
+
+        //
+        // Binding patterns
+        //
+
+        function emitObjectBindingPattern(node: ObjectBindingPattern) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("{}");
+            }
+            else {
+                write("{");
+                emitList(node, elements, ListFormat.ObjectBindingPatternElements);
+                write("}");
+            }
+        }
+
+        function emitArrayBindingPattern(node: ArrayBindingPattern) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("[]");
+            }
+            else {
+                write("[");
+                emitList(node, node.elements, ListFormat.ArrayBindingPatternElements);
+                write("]");
+            }
+        }
+
+        function emitBindingElement(node: BindingElement) {
+            emitWithSuffix(node.propertyName, ": ");
+            writeIfPresent(node.dotDotDotToken, "...");
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        //
+        // Expressions
+        //
+
+        function emitArrayLiteralExpression(node: ArrayLiteralExpression) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("[]");
+            }
+            else {
+                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
+                emitExpressionList(node, elements, ListFormat.ArrayLiteralExpressionElements | preferNewLine);
+            }
+        }
+
+        function emitObjectLiteralExpression(node: ObjectLiteralExpression) {
+            const properties = node.properties;
+            if (properties.length === 0) {
+                write("{}");
+            }
+            else {
+                const indentedFlag = node.emitFlags & NodeEmitFlags.Indented;
+                if (indentedFlag) {
+                    increaseIndent();
+                }
+
+                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
+                const allowTrailingComma = languageVersion >= ScriptTarget.ES5 ? ListFormat.AllowTrailingComma : ListFormat.None;
+                emitList(node, properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
+
+                if (indentedFlag) {
+                    decreaseIndent();
+                }
+            }
+        }
+
+        function emitPropertyAccessExpression(node: PropertyAccessExpression) {
+            if (tryEmitConstantValue(node)) {
+                return;
+            }
+
+            let indentBeforeDot = false;
+            let indentAfterDot = false;
+            if (!(node.emitFlags & NodeEmitFlags.NoIndentation)) {
+                const dotRangeStart = node.expression.end;
+                const dotRangeEnd = skipTrivia(currentText, node.expression.end) + 1;
+                const dotToken = <Node>{ kind: SyntaxKind.DotToken, pos: dotRangeStart, end: dotRangeEnd };
+                indentBeforeDot = needsIndentation(node, node.expression, dotToken);
+                indentAfterDot = needsIndentation(node, dotToken, node.name);
+            }
+            const shouldEmitDotDot = !indentBeforeDot && needsDotDotForPropertyAccess(node.expression);
+
+            emitExpression(node.expression);
+            increaseIndentIf(indentBeforeDot);
+            write(shouldEmitDotDot ? ".." : ".");
+            increaseIndentIf(indentAfterDot);
+            emit(node.name);
+            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+        }
+
+        // 1..toString is a valid property access, emit a dot after the literal
+        // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
+        function needsDotDotForPropertyAccess(expression: Expression) {
+            if (expression.kind === SyntaxKind.NumericLiteral) {
+                // check if numeric literal was originally written with a dot
+                const text = getLiteralTextOfNode(<LiteralExpression>expression);
+                return text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
+            }
+            else {
+                // check if constant enum value is integer
+                const constantValue = tryGetConstEnumValue(expression);
+                // isFinite handles cases when constantValue is undefined
+                return isFinite(constantValue) && Math.floor(constantValue) === constantValue;
+            }
+        }
+
+        function emitElementAccessExpression(node: ElementAccessExpression) {
+            if (tryEmitConstantValue(node)) {
+                return;
+            }
+
+            emitExpression(node.expression);
+            write("[");
+            emitExpression(node.argumentExpression);
+            write("]");
+        }
+
+        function emitCallExpression(node: CallExpression) {
+            emitExpression(node.expression);
+            emitExpressionList(node, node.arguments, ListFormat.CallExpressionArguments);
+        }
+
+        function emitNewExpression(node: NewExpression) {
+            write("new ");
+            emitExpression(node.expression);
+            emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
+        }
+
+        function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            emitExpression(node.tag);
+            write(" ");
+            emitExpression(node.template);
+        }
+
+        function emitTypeAssertionExpression(node: TypeAssertion) {
+            if (node.type) {
+                write("<");
+                emit(node.type);
+                write(">");
+            }
+
+            emitExpression(node.expression);
+        }
+
+        function emitParenthesizedExpression(node: ParenthesizedExpression) {
+            write("(");
+            emitExpression(node.expression);
+            write(")");
+        }
+
+        function emitFunctionExpression(node: FunctionExpression) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+
+        function emitArrowFunction(node: ArrowFunction) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitSignatureAndBody(node, emitArrowFunctionHead);
+        }
+
+        function emitArrowFunctionHead(node: ArrowFunction) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(" =>");
+        }
+
+        function emitDeleteExpression(node: DeleteExpression) {
+            write("delete ");
+            emitExpression(node.expression);
+        }
+
+        function emitTypeOfExpression(node: TypeOfExpression) {
+            write("typeof ");
+            emitExpression(node.expression);
+        }
+
+        function emitVoidExpression(node: VoidExpression) {
+            write("void ");
+            emitExpression(node.expression);
+        }
+
+        function emitAwaitExpression(node: AwaitExpression) {
+            write("await ");
+            emitExpression(node.expression);
+        }
+
+        function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
+            writeTokenText(node.operator);
+            if (shouldEmitWhitespaceBeforeOperand(node)) {
+                write(" ");
+            }
+            emitExpression(node.operand);
+        }
+
+        function shouldEmitWhitespaceBeforeOperand(node: PrefixUnaryExpression) {
+            // In some cases, we need to emit a space between the operator and the operand. One obvious case
+            // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
+            // and minus expressions in certain cases. Specifically, consider the following two cases (parens
+            // are just for clarity of exposition, and not part of the source code):
+            //
+            //  (+(+1))
+            //  (+(++1))
+            //
+            // We need to emit a space in both cases. In the first case, the absence of a space will make
+            // the resulting expression a prefix increment operation. And in the second, it will make the resulting
+            // expression a prefix increment whose operand is a plus expression - (++(+x))
+            // The same is true of minus of course.
+            const operand = node.operand;
+            return operand.kind === SyntaxKind.PrefixUnaryExpression
+                && ((node.operator === SyntaxKind.PlusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusPlusToken))
+                || (node.operator === SyntaxKind.MinusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusMinusToken)));
+        }
+
+        function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
+            emitExpression(node.operand);
+            writeTokenText(node.operator);
+        }
+
+        function emitBinaryExpression(node: BinaryExpression) {
+            const isCommaOperator = node.operatorToken.kind !== SyntaxKind.CommaToken;
+            const indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
+            const indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
+
+            emitExpression(node.left);
+            increaseIndentIf(indentBeforeOperator, isCommaOperator ? " " : undefined);
+            writeTokenText(node.operatorToken.kind);
+            increaseIndentIf(indentAfterOperator, " ");
+            emitExpression(node.right);
+            decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+        }
+
+        function emitConditionalExpression(node: ConditionalExpression) {
+            const indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
+            const indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
+            const indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
+            const indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+
+            emitExpression(node.condition);
+            increaseIndentIf(indentBeforeQuestion, " ");
+            write("?");
+            increaseIndentIf(indentAfterQuestion, " ");
+            emitExpression(node.whenTrue);
+            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
+
+            increaseIndentIf(indentBeforeColon, " ");
+            write(":");
+            increaseIndentIf(indentAfterColon, " ");
+            emitExpression(node.whenFalse);
+            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+        }
+
+        function emitTemplateExpression(node: TemplateExpression) {
+            emit(node.head);
+            emitList(node, node.templateSpans, ListFormat.TemplateExpressionSpans);
+        }
+
+        function emitYieldExpression(node: YieldExpression) {
+            write(node.asteriskToken ? "yield*" : "yield");
+            emitExpressionWithPrefix(" ", node.expression);
+        }
+
+        function emitSpreadElementExpression(node: SpreadElementExpression) {
+            write("...");
+            emitExpression(node.expression);
+        }
+
+        function emitClassExpression(node: ClassExpression) {
+            emitClassDeclarationOrExpression(node);
+        }
+
+        function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+        }
+
+        function emitAsExpression(node: AsExpression) {
+            emitExpression(node.expression);
+            if (node.type) {
+                write(" as ");
+                emit(node.type);
+            }
+        }
+
+        function emitNonNullExpression(node: NonNullExpression) {
+            emitExpression(node.expression);
+            write("!");
+        }
+
+        //
+        // Misc
+        //
+
+        function emitTemplateSpan(node: TemplateSpan) {
+            emitExpression(node.expression);
+            emit(node.literal);
+        }
+
+        //
+        // Statements
+        //
+
+        function emitBlock(node: Block, format?: ListFormat) {
+            if (isSingleLineEmptyBlock(node)) {
+                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                write(" ");
+                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
+            }
+            else {
+                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                emitBlockStatements(node);
+                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
+            }
+        }
+
+        function emitBlockStatements(node: Block) {
+            if (node.emitFlags & NodeEmitFlags.SingleLine) {
+                emitList(node, node.statements, ListFormat.SingleLineBlockStatements);
+            }
+            else {
+                emitList(node, node.statements, ListFormat.MultiLineBlockStatements);
+            }
+        }
+
+        function emitVariableStatement(node: VariableStatement) {
+            emitModifiers(node, node.modifiers);
+            emit(node.declarationList);
+            write(";");
+        }
+
+        function emitEmptyStatement(node: EmptyStatement) {
+            write(";");
+        }
+
+        function emitExpressionStatement(node: ExpressionStatement) {
+            emitExpression(node.expression);
+            write(";");
+        }
+
+        function emitIfStatement(node: IfStatement) {
+            const openParenPos = writeToken(SyntaxKind.IfKeyword, node.pos, node);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos, node);
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end, node);
+            emitEmbeddedStatement(node.thenStatement);
+            if (node.elseStatement) {
+                writeLine();
+                writeToken(SyntaxKind.ElseKeyword, node.thenStatement.end, node);
+                if (node.elseStatement.kind === SyntaxKind.IfStatement) {
+                    write(" ");
+                    emit(node.elseStatement);
+                }
+                else {
+                    emitEmbeddedStatement(node.elseStatement);
+                }
+            }
+        }
+
+        function emitDoStatement(node: DoStatement) {
+            write("do");
+            emitEmbeddedStatement(node.statement);
+            if (isBlock(node.statement)) {
+                write(" ");
+            }
+            else {
+                writeLine();
+            }
+
+            write("while (");
+            emitExpression(node.expression);
+            write(");");
+        }
+
+        function emitWhileStatement(node: WhileStatement) {
+            write("while (");
+            emitExpression(node.expression);
+            write(")");
+            emitEmbeddedStatement(node.statement);
+        }
+
+        function emitForStatement(node: ForStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos, /*contextNode*/ node);
+            emitForBinding(node.initializer);
+            write(";");
+            emitExpressionWithPrefix(" ", node.condition);
+            write(";");
+            emitExpressionWithPrefix(" ", node.incrementor);
+            write(")");
+            emitEmbeddedStatement(node.statement);
+        }
+
+        function emitForInStatement(node: ForInStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitForBinding(node.initializer);
+            write(" in ");
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            emitEmbeddedStatement(node.statement);
+        }
+
+        function emitForOfStatement(node: ForOfStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitForBinding(node.initializer);
+            write(" of ");
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            emitEmbeddedStatement(node.statement);
+        }
+
+        function emitForBinding(node: VariableDeclarationList | Expression) {
+            if (node !== undefined) {
+                if (node.kind === SyntaxKind.VariableDeclarationList) {
+                    emit(node);
+                }
+                else {
+                    emitExpression(<Expression>node);
+                }
+            }
+        }
+
+        function emitContinueStatement(node: ContinueStatement) {
+            writeToken(SyntaxKind.ContinueKeyword, node.pos);
+            emitWithPrefix(" ", node.label);
+            write(";");
+        }
+
+        function emitBreakStatement(node: BreakStatement) {
+            writeToken(SyntaxKind.BreakKeyword, node.pos);
+            emitWithPrefix(" ", node.label);
+            write(";");
+        }
+
+        function emitReturnStatement(node: ReturnStatement) {
+            writeToken(SyntaxKind.ReturnKeyword, node.pos, /*contextNode*/ node);
+            emitExpressionWithPrefix(" ", node.expression);
+            write(";");
+        }
+
+        function emitWithStatement(node: WithStatement) {
+            write("with (");
+            emitExpression(node.expression);
+            write(")");
+            emitEmbeddedStatement(node.statement);
+        }
+
+        function emitSwitchStatement(node: SwitchStatement) {
+            const openParenPos = writeToken(SyntaxKind.SwitchKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            write(" ");
+            emit(node.caseBlock);
+        }
+
+        function emitLabeledStatement(node: LabeledStatement) {
+            emit(node.label);
+            write(": ");
+            emit(node.statement);
+        }
+
+        function emitThrowStatement(node: ThrowStatement) {
+            write("throw");
+            emitExpressionWithPrefix(" ", node.expression);
+            write(";");
+        }
+
+        function emitTryStatement(node: TryStatement) {
+            write("try ");
+            emit(node.tryBlock);
+            emit(node.catchClause);
+            if (node.finallyBlock) {
+                writeLine();
+                write("finally ");
+                emit(node.finallyBlock);
+            }
+        }
+
+        function emitDebuggerStatement(node: DebuggerStatement) {
+            writeToken(SyntaxKind.DebuggerKeyword, node.pos);
+            write(";");
+        }
+
+        //
+        // Declarations
+        //
+
+        function emitVariableDeclaration(node: VariableDeclaration) {
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        function emitVariableDeclarationList(node: VariableDeclarationList) {
+            write(isLet(node) ? "let " : isConst(node) ? "const " : "var ");
+            emitList(node, node.declarations, ListFormat.VariableDeclarationList);
+        }
+
+        function emitFunctionDeclaration(node: FunctionDeclaration) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+
+        function emitFunctionDeclarationOrExpression(node: FunctionDeclaration | FunctionExpression) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write(node.asteriskToken ? "function* " : "function ");
+            emitIdentifierName(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitSignatureAndBody(node: FunctionLikeDeclaration, emitSignatureHead: (node: SignatureDeclaration) => void) {
+            const body = node.body;
+            if (body) {
+                if (isBlock(body)) {
+                    const indentedFlag = node.emitFlags & NodeEmitFlags.Indented;
+                    if (indentedFlag) {
+                        increaseIndent();
+                    }
+
+                    if (node.emitFlags & NodeEmitFlags.ReuseTempVariableScope) {
+                        emitSignatureHead(node);
+                        emitBlockFunctionBody(node, body);
+                    }
+                    else {
+                        const savedTempFlags = tempFlags;
+                        tempFlags = 0;
+                        emitSignatureHead(node);
+                        emitBlockFunctionBody(node, body);
+                        tempFlags = savedTempFlags;
+                    }
+
+                    if (indentedFlag) {
+                        decreaseIndent();
+                    }
+                }
+                else {
+                    emitSignatureHead(node);
+                    write(" ");
+                    emitExpression(body);
+                }
+            }
+            else {
+                emitSignatureHead(node);
+                write(";");
+            }
+
+        }
+
+        function emitSignatureHead(node: FunctionDeclaration | FunctionExpression | MethodDeclaration | AccessorDeclaration | ConstructorDeclaration) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+        }
+
+        function shouldEmitBlockFunctionBodyOnSingleLine(parentNode: Node, body: Block) {
+            // We must emit a function body as a single-line body in the following case:
+            // * The body has NodeEmitFlags.SingleLine specified.
+
+            // We must emit a function body as a multi-line body in the following cases:
+            // * The body is explicitly marked as multi-line.
+            // * A non-synthesized body's start and end position are on different lines.
+            // * Any statement in the body starts on a new line.
+
+            if (body.emitFlags & NodeEmitFlags.SingleLine) {
+                return true;
+            }
+
+            if (body.multiLine) {
+                return false;
+            }
+
+            if (!nodeIsSynthesized(body) && !rangeIsOnSingleLine(body, currentSourceFile)) {
+                return false;
+            }
+
+            if (shouldWriteLeadingLineTerminator(body, body.statements, ListFormat.PreserveLines)
+                || shouldWriteClosingLineTerminator(body, body.statements, ListFormat.PreserveLines)) {
+                return false;
+            }
+
+            let previousStatement: Statement;
+            for (const statement of body.statements) {
+                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, ListFormat.PreserveLines)) {
+                    return false;
+                }
+
+                previousStatement = statement;
+            }
+
+            return true;
+        }
+
+        function emitBlockFunctionBody(parentNode: Node, body: Block) {
+            write(" {");
+            increaseIndent();
+
+            emitBodyWithDetachedComments(body, body.statements,
+                shouldEmitBlockFunctionBodyOnSingleLine(parentNode, body)
+                    ? emitBlockFunctionBodyOnSingleLine
+                    : emitBlockFunctionBodyWorker);
+
+            decreaseIndent();
+            writeToken(SyntaxKind.CloseBraceToken, body.statements.end, body);
+        }
+
+        function emitBlockFunctionBodyOnSingleLine(body: Block) {
+            emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
+        }
+
+        function emitBlockFunctionBodyWorker(body: Block, emitBlockFunctionBodyOnSingleLine?: boolean) {
+            // Emit all the prologue directives (like "use strict").
+            const statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
+            const helpersEmitted = emitHelpers(body);
+
+            if (statementOffset === 0 && !helpersEmitted && emitBlockFunctionBodyOnSingleLine) {
+                decreaseIndent();
+                emitList(body, body.statements, ListFormat.SingleLineFunctionBodyStatements);
+                increaseIndent();
+            }
+            else {
+                emitList(body, body.statements, ListFormat.MultiLineFunctionBodyStatements, statementOffset);
+            }
+        }
+
+        function emitClassDeclaration(node: ClassDeclaration) {
+            emitClassDeclarationOrExpression(node);
+        }
+
+        function emitClassDeclarationOrExpression(node: ClassDeclaration | ClassExpression) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("class");
+            emitNodeWithPrefix(" ", node.name, emitIdentifierName);
+
+            const indentedFlag = node.emitFlags & NodeEmitFlags.Indented;
+            if (indentedFlag) {
+                increaseIndent();
+            }
+
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);
+
+            const savedTempFlags = tempFlags;
+            tempFlags = 0;
+
+            write(" {");
+            emitList(node, node.members, ListFormat.ClassMembers);
+            write("}");
+
+            if (indentedFlag) {
+                decreaseIndent();
+            }
+
+            tempFlags = savedTempFlags;
+        }
+
+        function emitInterfaceDeclaration(node: InterfaceDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("interface ");
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
+            write(" {");
+            emitList(node, node.members, ListFormat.InterfaceMembers);
+            write("}");
+        }
+
+        function emitTypeAliasDeclaration(node: TypeAliasDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("type ");
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            write(" = ");
+            emit(node.type);
+            write(";");
+        }
+
+        function emitEnumDeclaration(node: EnumDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("enum ");
+            emit(node.name);
+
+            const savedTempFlags = tempFlags;
+            tempFlags = 0;
+
+            write(" {");
+            emitList(node, node.members, ListFormat.EnumMembers);
+            write("}");
+            tempFlags = savedTempFlags;
+        }
+
+        function emitModuleDeclaration(node: ModuleDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write(node.flags & NodeFlags.Namespace ? "namespace " : "module ");
+            emit(node.name);
+
+            let body = node.body;
+            while (body.kind === SyntaxKind.ModuleDeclaration) {
+                write(".");
+                emit((<ModuleDeclaration>body).name);
+                body = (<ModuleDeclaration>body).body;
+            }
+
+            write(" ");
+            emit(body);
+        }
+
+        function emitModuleBlock(node: ModuleBlock) {
+            if (isSingleLineEmptyBlock(node)) {
+                write("{ }");
+            }
+            else {
+                const savedTempFlags = tempFlags;
+                tempFlags = 0;
+                write("{");
+                increaseIndent();
+                emitBlockStatements(node);
+                write("}");
+                tempFlags = savedTempFlags;
+            }
+        }
+
+        function emitCaseBlock(node: CaseBlock) {
+            writeToken(SyntaxKind.OpenBraceToken, node.pos);
+            emitList(node, node.clauses, ListFormat.CaseBlockClauses);
+            writeToken(SyntaxKind.CloseBraceToken, node.clauses.end);
+        }
+
+        function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("import ");
+            emit(node.name);
+            write(" = ");
+            emitModuleReference(node.moduleReference);
+            write(";");
+        }
+
+        function emitModuleReference(node: ModuleReference) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        function emitImportDeclaration(node: ImportDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("import ");
+            if (node.importClause) {
+                emit(node.importClause);
+                write(" from ");
+            }
+            emitExpression(node.moduleSpecifier);
+            write(";");
+        }
+
+        function emitImportClause(node: ImportClause) {
+            emit(node.name);
+            if (node.name && node.namedBindings) {
+                write(", ");
+            }
+            emit(node.namedBindings);
+        }
+
+        function emitNamespaceImport(node: NamespaceImport) {
+            write("* as ");
+            emit(node.name);
+        }
+
+        function emitNamedImports(node: NamedImports) {
+            emitNamedImportsOrExports(node);
+        }
+
+        function emitImportSpecifier(node: ImportSpecifier) {
+            emitImportOrExportSpecifier(node);
+        }
+
+        function emitExportAssignment(node: ExportAssignment) {
+            write(node.isExportEquals ? "export = " : "export default ");
+            emitExpression(node.expression);
+            write(";");
+        }
+
+        function emitExportDeclaration(node: ExportDeclaration) {
+            write("export ");
+            if (node.exportClause) {
+                emit(node.exportClause);
+            }
+            else {
+                write("*");
+            }
+            if (node.moduleSpecifier) {
+                write(" from ");
+                emitExpression(node.moduleSpecifier);
+            }
+            write(";");
+        }
+
+        function emitNamedExports(node: NamedExports) {
+            emitNamedImportsOrExports(node);
+        }
+
+        function emitExportSpecifier(node: ExportSpecifier) {
+            emitImportOrExportSpecifier(node);
+        }
+
+        function emitNamedImportsOrExports(node: NamedImportsOrExports) {
+            write("{");
+            emitList(node, node.elements, ListFormat.NamedImportsOrExportsElements);
+            write("}");
+        }
+
+        function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
+            if (node.propertyName) {
+                emit(node.propertyName);
+                write(" as ");
+            }
+
+            emit(node.name);
+        }
+
+        //
+        // Module references
+        //
+
+        function emitExternalModuleReference(node: ExternalModuleReference) {
+            write("require(");
+            emitExpression(node.expression);
+            write(")");
+        }
+
+        //
+        // JSX
+        //
+
+        function emitJsxElement(node: JsxElement) {
+            emit(node.openingElement);
+            emitList(node, node.children, ListFormat.JsxElementChildren);
+            emit(node.closingElement);
+        }
+
+        function emitJsxSelfClosingElement(node: JsxSelfClosingElement) {
+            write("<");
+            emitJsxTagName(node.tagName);
+            write(" ");
+            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
+            write("/>");
+        }
+
+        function emitJsxOpeningElement(node: JsxOpeningElement) {
+            write("<");
+            emitJsxTagName(node.tagName);
+            writeIfAny(node.attributes, " ");
+            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
+            write(">");
+        }
+
+        function emitJsxText(node: JsxText) {
+            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+        }
+
+        function emitJsxClosingElement(node: JsxClosingElement) {
+            write("</");
+            emitJsxTagName(node.tagName);
+            write(">");
+        }
+
+        function emitJsxAttribute(node: JsxAttribute) {
+            emit(node.name);
+            emitWithPrefix("=", node.initializer);
+        }
+
+        function emitJsxSpreadAttribute(node: JsxSpreadAttribute) {
+            write("{...");
+            emitExpression(node.expression);
+            write("}");
+        }
+
+        function emitJsxExpression(node: JsxExpression) {
+            if (node.expression) {
+                write("{");
+                emitExpression(node.expression);
+                write("}");
+            }
+        }
+
+        function emitJsxTagName(node: JsxTagNameExpression) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        //
+        // Clauses
+        //
+
+        function emitCaseClause(node: CaseClause) {
+            write("case ");
+            emitExpression(node.expression);
+            write(":");
+
+            emitCaseOrDefaultClauseStatements(node, node.statements);
+        }
+
+        function emitDefaultClause(node: DefaultClause) {
+            write("default:");
+            emitCaseOrDefaultClauseStatements(node, node.statements);
+        }
+
+        function emitCaseOrDefaultClauseStatements(parentNode: Node, statements: NodeArray<Statement>) {
+            const emitAsSingleStatement =
+                statements.length === 1 &&
+                (
+                    // treat synthesized nodes as located on the same line for emit purposes
+                    nodeIsSynthesized(parentNode) ||
+                    nodeIsSynthesized(statements[0]) ||
+                    rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile)
+                );
+
+            if (emitAsSingleStatement) {
+                write(" ");
+                emit(statements[0]);
+            }
+            else {
+                emitList(parentNode, statements, ListFormat.CaseOrDefaultClauseStatements);
+            }
+        }
+
+        function emitHeritageClause(node: HeritageClause) {
+            write(" ");
+            writeTokenText(node.token);
+            write(" ");
+            emitList(node, node.types, ListFormat.HeritageClauseTypes);
+        }
+
+        function emitCatchClause(node: CatchClause) {
+            writeLine();
+            const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emit(node.variableDeclaration);
+            writeToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : openParenPos);
+            write(" ");
+            emit(node.block);
+        }
+
+        //
+        // Property assignments
+        //
+
+        function emitPropertyAssignment(node: PropertyAssignment) {
+            emit(node.name);
+            write(": ");
+            // This is to ensure that we emit comment in the following case:
+            //      For example:
+            //          obj = {
+            //              id: /*comment1*/ ()=>void
+            //          }
+            // "comment1" is not considered to be leading comment for node.initializer
+            // but rather a trailing comment on the previous node.
+            const initializer = node.initializer;
+            if (!shouldSkipLeadingCommentsForNode(initializer)) {
+                const commentRange = initializer.commentRange || initializer;
+                emitTrailingCommentsOfPosition(commentRange.pos);
+            }
+
+            emitExpression(node.initializer);
+        }
+
+        function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
+            emit(node.name);
+            if (node.objectAssignmentInitializer) {
+                write(" = ");
+                emitExpression(node.objectAssignmentInitializer);
+            }
+        }
+
+        //
+        // Enum
+        //
+
+        function emitEnumMember(node: EnumMember) {
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        //
+        // Top-level nodes
+        //
+
+        function emitSourceFile(node: SourceFile) {
+            writeLine();
+            emitShebang();
+            emitBodyWithDetachedComments(node, node.statements, emitSourceFileWorker);
+        }
+
+        function emitSourceFileWorker(node: SourceFile) {
+            const statements = node.statements;
+            const statementOffset = emitPrologueDirectives(statements);
+            const savedTempFlags = tempFlags;
+            tempFlags = 0;
+            emitHelpers(node);
+            emitList(node, statements, ListFormat.MultiLine, statementOffset);
+            tempFlags = savedTempFlags;
+        }
+
+        // Transformation nodes
+
+        function emitPartiallyEmittedExpression(node: PartiallyEmittedExpression) {
+            emitExpression(node.expression);
+        }
+
+        /**
+         * Emits any prologue directives at the start of a Statement list, returning the
+         * number of prologue directives written to the output.
+         */
+        function emitPrologueDirectives(statements: Node[], startWithNewLine?: boolean): number {
+            for (let i = 0; i < statements.length; i++) {
+                if (isPrologueDirective(statements[i])) {
+                    if (startWithNewLine || i > 0) {
+                        writeLine();
+                    }
+                    emit(statements[i]);
+                }
+                else {
+                    // return index of the first non prologue directive
+                    return i;
+                }
+            }
+
+            return statements.length;
+        }
+
+        function emitHelpers(node: Node) {
+            const emitFlags = node.emitFlags;
+            let helpersEmitted = false;
+            if (emitFlags & NodeEmitFlags.EmitEmitHelpers) {
+                helpersEmitted = emitEmitHelpers(currentSourceFile);
+            }
+
+            if (emitFlags & NodeEmitFlags.EmitExportStar) {
+                writeLines(exportStarHelper);
+                helpersEmitted = true;
+            }
+
+            if (emitFlags & NodeEmitFlags.EmitSuperHelper) {
+                writeLines(superHelper);
+                helpersEmitted = true;
+            }
+
+            if (emitFlags & NodeEmitFlags.EmitAdvancedSuperHelper) {
+                writeLines(advancedSuperHelper);
+                helpersEmitted = true;
+            }
+
+            return helpersEmitted;
+        }
+
+        function emitEmitHelpers(node: SourceFile) {
+            // Only emit helpers if the user did not say otherwise.
+            if (compilerOptions.noEmitHelpers) {
+                return false;
+            }
+
+            // Don't emit helpers if we can import them.
+            if (compilerOptions.importHelpers
+                && (isExternalModule(node) || compilerOptions.isolatedModules)) {
+                return false;
+            }
+
+            let helpersEmitted = false;
+
+            // Only Emit __extends function when target ES5.
+            // For target ES6 and above, we can emit classDeclaration as is.
+            if ((languageVersion < ScriptTarget.ES6) && (!extendsEmitted && node.flags & NodeFlags.HasClassExtends)) {
+                writeLines(extendsHelper);
+                extendsEmitted = true;
+                helpersEmitted = true;
+            }
+
+            if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasJsxSpreadAttributes)) {
+                writeLines(assignHelper);
+                assignEmitted = true;
+            }
+
+            if (!decorateEmitted && node.flags & NodeFlags.HasDecorators) {
+                writeLines(decorateHelper);
+                if (compilerOptions.emitDecoratorMetadata) {
+                    writeLines(metadataHelper);
+                }
+
+                decorateEmitted = true;
+                helpersEmitted = true;
+            }
+
+            if (!paramEmitted && node.flags & NodeFlags.HasParamDecorators) {
+                writeLines(paramHelper);
+                paramEmitted = true;
+                helpersEmitted = true;
+            }
+
+            if (!awaiterEmitted && node.flags & NodeFlags.HasAsyncFunctions) {
+                writeLines(awaiterHelper);
+                if (languageVersion < ScriptTarget.ES6) {
+                    writeLines(generatorHelper);
+                }
+
+                awaiterEmitted = true;
+                helpersEmitted = true;
+            }
+
+            if (helpersEmitted) {
+                writeLine();
+            }
+
+            return helpersEmitted;
+        }
+
+        function writeLines(text: string): void {
+            const lines = text.split(/\r\n|\r|\n/g);
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
+                if (line.length) {
+                    if (i > 0) {
+                        writeLine();
+                    }
+                    write(line);
+                }
+            }
+        }
+
+        //
+        // Helpers
+        //
+
+        function emitShebang() {
+            const shebang = getShebang(currentText);
+            if (shebang) {
+                write(shebang);
+                writeLine();
+            }
+        }
+
+        function emitModifiers(node: Node, modifiers: NodeArray<Modifier>) {
+            if (modifiers && modifiers.length) {
+                emitList(node, modifiers, ListFormat.Modifiers);
+                write(" ");
+            }
+        }
+
+        function emitWithPrefix(prefix: string, node: Node) {
+            emitNodeWithPrefix(prefix, node, emit);
+        }
+
+        function emitExpressionWithPrefix(prefix: string, node: Node) {
+            emitNodeWithPrefix(prefix, node, emitExpression);
+        }
+
+        function emitNodeWithPrefix(prefix: string, node: Node, emit: (node: Node) => void) {
+            if (node) {
+                write(prefix);
+                emit(node);
+            }
+        }
+
+        function emitWithSuffix(node: Node, suffix: string) {
+            if (node) {
+                emit(node);
+                write(suffix);
+            }
+        }
+
+        function tryEmitSubstitute(node: Node, emitNode: (node: Node) => void, isExpression: boolean) {
+            if (isSubstitutionEnabled(node) && (node.emitFlags & NodeEmitFlags.NoSubstitution) === 0) {
+                const substitute = onSubstituteNode(node, isExpression);
+                if (substitute !== node) {
+                    substitute.emitFlags |= NodeEmitFlags.NoSubstitution;
+                    emitNode(substitute);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        function tryEmitConstantValue(node: PropertyAccessExpression | ElementAccessExpression): boolean {
+            const constantValue = tryGetConstEnumValue(node);
+            if (constantValue !== undefined) {
+                write(String(constantValue));
+                if (!compilerOptions.removeComments) {
+                    const propertyName = isPropertyAccessExpression(node)
+                        ? declarationNameToString(node.name)
+                        : getTextOfNode(node.argumentExpression);
+                    write(` /* ${propertyName} */`);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        function emitEmbeddedStatement(node: Statement) {
+            if (isBlock(node)) {
+                write(" ");
+                emit(node);
+            }
+            else {
+                writeLine();
+                increaseIndent();
+                emit(node);
+                decreaseIndent();
+            }
+        }
+
+        function emitDecorators(parentNode: Node, decorators: NodeArray<Decorator>) {
+            emitList(parentNode, decorators, ListFormat.Decorators);
+        }
+
+        function emitTypeArguments(parentNode: Node, typeArguments: NodeArray<TypeNode>) {
+            emitList(parentNode, typeArguments, ListFormat.TypeArguments);
+        }
+
+        function emitTypeParameters(parentNode: Node, typeParameters: NodeArray<TypeParameterDeclaration>) {
+            emitList(parentNode, typeParameters, ListFormat.TypeParameters);
+        }
+
+        function emitParameters(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            emitList(parentNode, parameters, ListFormat.Parameters);
+        }
+
+        function emitParametersForArrow(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            if (parameters &&
+                parameters.length === 1 &&
+                parameters[0].type === undefined &&
+                parameters[0].pos === parentNode.pos) {
+                emit(parameters[0]);
+            }
+            else {
+                emitParameters(parentNode, parameters);
+            }
+        }
+
+        function emitParametersForIndexSignature(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            emitList(parentNode, parameters, ListFormat.IndexSignatureParameters);
+        }
+
+        function emitList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
+            emitNodeList(emit, parentNode, children, format, start, count);
+        }
+
+        function emitExpressionList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
+            emitNodeList(emitExpression, parentNode, children, format, start, count);
+        }
+
+        function emitNodeList(emit: (node: Node) => void, parentNode: Node, children: NodeArray<Node>, format: ListFormat, start = 0, count = children ? children.length - start : 0) {
+            const isUndefined = children === undefined;
+            if (isUndefined && format & ListFormat.OptionalIfUndefined) {
+                return;
+            }
+
+            const isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0;
+            if (isEmpty && format & ListFormat.OptionalIfEmpty) {
+                return;
+            }
+
+            if (format & ListFormat.BracketsMask) {
+                write(getOpeningBracket(format));
+            }
+
+            if (isEmpty) {
+                // Write a line terminator if the parent node was multi-line
+                if (format & ListFormat.MultiLine) {
+                    writeLine();
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+            }
+            else {
+                // Write the opening line terminator or leading whitespace.
+                const mayEmitInterveningComments = (format & ListFormat.NoInterveningComments) === 0;
+                let shouldEmitInterveningComments = mayEmitInterveningComments;
+                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                    shouldEmitInterveningComments = false;
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+
+                // Increase the indent, if requested.
+                if (format & ListFormat.Indented) {
+                    increaseIndent();
+                }
+
+                // Emit each child.
+                let previousSibling: Node;
+                let shouldDecreaseIndentAfterEmit: boolean;
+                const delimiter = getDelimiter(format);
+                for (let i = 0; i < count; i++) {
+                    const child = children[start + i];
+
+                    // Write the delimiter if this is not the first node.
+                    if (previousSibling) {
+                        write(delimiter);
+
+                        // Write either a line terminator or whitespace to separate the elements.
+                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                            // If a synthesized node in a single-line list starts on a new
+                            // line, we should increase the indent.
+                            if ((format & (ListFormat.LinesMask | ListFormat.Indented)) === ListFormat.SingleLine) {
+                                increaseIndent();
+                                shouldDecreaseIndentAfterEmit = true;
+                            }
+
+                            writeLine();
+                            shouldEmitInterveningComments = false;
+                        }
+                        else if (previousSibling && format & ListFormat.SpaceBetweenSiblings) {
+                            write(" ");
+                        }
+                    }
+
+                    if (shouldEmitInterveningComments) {
+                        const commentRange = child.commentRange || child;
+                        emitTrailingCommentsOfPosition(commentRange.pos);
+                    }
+                    else {
+                        shouldEmitInterveningComments = mayEmitInterveningComments;
+                    }
+
+                    // Emit this child.
+                    emit(child);
+
+                    if (shouldDecreaseIndentAfterEmit) {
+                        decreaseIndent();
+                        shouldDecreaseIndentAfterEmit = false;
+                    }
+
+                    previousSibling = child;
+                }
+
+                // Write a trailing comma, if requested.
+                const hasTrailingComma = (format & ListFormat.AllowTrailingComma) && children.hasTrailingComma;
+                if (format & ListFormat.CommaDelimited && hasTrailingComma) {
+                    write(",");
+                }
+
+                // Decrease the indent, if requested.
+                if (format & ListFormat.Indented) {
+                    decreaseIndent();
+                }
+
+                // Write the closing line terminator or closing whitespace.
+                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+            }
+
+            if (format & ListFormat.BracketsMask) {
+                write(getClosingBracket(format));
+            }
+        }
+
+        function writeIfAny(nodes: NodeArray<Node>, text: string) {
+            if (nodes && nodes.length > 0) {
+                write(text);
+            }
+        }
+
+        function writeIfPresent(node: Node, text: string) {
+            if (node !== undefined) {
+                write(text);
+            }
+        }
+
+        function writeToken(token: SyntaxKind, pos: number, contextNode?: Node) {
+            const tokenStartPos = emitTokenStart(token, pos, contextNode, shouldSkipLeadingSourceMapForToken, getTokenSourceMapRange);
+            const tokenEndPos = writeTokenText(token, tokenStartPos);
+            return emitTokenEnd(token, tokenEndPos, contextNode, shouldSkipTrailingSourceMapForToken, getTokenSourceMapRange);
+        }
+
+        function shouldSkipLeadingSourceMapForToken(contextNode: Node) {
+            return (contextNode.emitFlags & NodeEmitFlags.NoTokenLeadingSourceMaps) !== 0;
+        }
+
+        function shouldSkipTrailingSourceMapForToken(contextNode: Node) {
+            return (contextNode.emitFlags & NodeEmitFlags.NoTokenTrailingSourceMaps) !== 0;
+        }
+
+        function writeTokenText(token: SyntaxKind, pos?: number) {
+            const tokenString = tokenToString(token);
+            write(tokenString);
+            return positionIsSynthesized(pos) ? -1 : pos + tokenString.length;
+        }
+
+        function writeTokenNode(node: Node) {
+            if (node) {
+                emitStart(/*range*/ node, /*contextNode*/ node, shouldSkipLeadingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
+                writeTokenText(node.kind);
+                emitEnd(/*range*/ node, /*contextNode*/ node, shouldSkipTrailingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
+            }
+        }
+
+        function increaseIndentIf(value: boolean, valueToWriteWhenNotIndenting?: string) {
+            if (value) {
+                increaseIndent();
+                writeLine();
+            }
+            else if (valueToWriteWhenNotIndenting) {
+                write(valueToWriteWhenNotIndenting);
+            }
+        }
+
+        // Helper function to decrease the indent if we previously indented.  Allows multiple
+        // previous indent values to be considered at a time.  This also allows caller to just
+        // call this once, passing in all their appropriate indent values, instead of needing
+        // to call this helper function multiple times.
+        function decreaseIndentIf(value1: boolean, value2?: boolean) {
+            if (value1) {
+                decreaseIndent();
+            }
+            if (value2) {
+                decreaseIndent();
+            }
+        }
+
+        function shouldWriteLeadingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return true;
+            }
+
+            if (format & ListFormat.PreserveLines) {
+                if (format & ListFormat.PreferNewLine) {
+                    return true;
+                }
+
+                const firstChild = children[0];
+                if (firstChild === undefined) {
+                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(firstChild)) {
+                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                }
+                else {
+                    return !rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+
+        function shouldWriteSeparatingLineTerminator(previousNode: Node, nextNode: Node, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return true;
+            }
+            else if (format & ListFormat.PreserveLines) {
+                if (previousNode === undefined || nextNode === undefined) {
+                    return false;
+                }
+                else if (nodeIsSynthesized(previousNode) || nodeIsSynthesized(nextNode)) {
+                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                }
+                else {
+                    return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                }
+            }
+            else {
+                return nextNode.startsOnNewLine;
+            }
+        }
+
+        function shouldWriteClosingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return (format & ListFormat.NoTrailingNewLine) === 0;
+            }
+            else if (format & ListFormat.PreserveLines) {
+                if (format & ListFormat.PreferNewLine) {
+                    return true;
+                }
+
+                const lastChild = lastOrUndefined(children);
+                if (lastChild === undefined) {
+                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(lastChild)) {
+                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                }
+                else {
+                    return !rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+
+        function synthesizedNodeStartsOnNewLine(node: Node, format?: ListFormat) {
+            if (nodeIsSynthesized(node)) {
+                const startsOnNewLine = node.startsOnNewLine;
+                if (startsOnNewLine === undefined) {
+                    return (format & ListFormat.PreferNewLine) !== 0;
+                }
+
+                return startsOnNewLine;
+            }
+
+            return (format & ListFormat.PreferNewLine) !== 0;
+        }
+
+        function needsIndentation(parent: Node, node1: Node, node2: Node): boolean {
+            parent = skipSynthesizedParentheses(parent);
+            node1 = skipSynthesizedParentheses(node1);
+            node2 = skipSynthesizedParentheses(node2);
+
+            // Always use a newline for synthesized code if the synthesizer desires it.
+            if (node2.startsOnNewLine) {
+                return true;
+            }
+
+            return !nodeIsSynthesized(parent)
+                && !nodeIsSynthesized(node1)
+                && !nodeIsSynthesized(node2)
+                && !rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+        }
+
+        function skipSynthesizedParentheses(node: Node) {
+            while (node.kind === SyntaxKind.ParenthesizedExpression && nodeIsSynthesized(node)) {
+                node = (<ParenthesizedExpression>node).expression;
+            }
+
+            return node;
+        }
+
+        function getTextOfNode(node: Node, includeTrivia?: boolean): string {
+            if (isGeneratedIdentifier(node)) {
+                return getGeneratedIdentifier(<Identifier>node);
+            }
+            else if (isIdentifier(node) && (nodeIsSynthesized(node) || !node.parent)) {
+                return unescapeIdentifier(node.text);
+            }
+            else if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
+                return getTextOfNode((<StringLiteral>node).textSourceNode, includeTrivia);
+            }
+            else if (isLiteralExpression(node) && (nodeIsSynthesized(node) || !node.parent)) {
+                return node.text;
+            }
+
+            return getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
+        }
+
+        function getLiteralTextOfNode(node: LiteralLikeNode): string {
+            if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
+                const textSourceNode = (<StringLiteral>node).textSourceNode;
+                if (isIdentifier(textSourceNode)) {
+                    return "\"" + escapeNonAsciiCharacters(escapeString(getTextOfNode(textSourceNode))) + "\"";
+                }
+                else {
+                    return getLiteralTextOfNode(textSourceNode);
+                }
+            }
+
+            return getLiteralText(node, currentSourceFile, languageVersion);
+        }
+
+        function tryGetConstEnumValue(node: Node): number {
+            if (compilerOptions.isolatedModules) {
+                return undefined;
+            }
+
+            return isPropertyAccessExpression(node) || isElementAccessExpression(node)
+                ? resolver.getConstantValue(<PropertyAccessExpression | ElementAccessExpression>node)
+                : undefined;
+        }
+
+        function isSingleLineEmptyBlock(block: Block) {
+            return !block.multiLine
+                && block.statements.length === 0
+                && rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
+        }
+
+        function isUniqueName(name: string): boolean {
+            return !resolver.hasGlobalName(name) &&
+                !hasProperty(currentFileIdentifiers, name) &&
+                !hasProperty(generatedNameSet, name);
+        }
+
+        function isUniqueLocalName(name: string, container: Node): boolean {
+            for (let node = container; isNodeDescendantOf(node, container); node = node.nextContainer) {
+                if (node.locals && hasProperty(node.locals, name)) {
+                    // We conservatively include alias symbols to cover cases where they're emitted as locals
+                    if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        /**
+        * Return the next available name in the pattern _a ... _z, _0, _1, ...
+        * TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
+        * Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
+        */
+        function makeTempVariableName(flags: TempFlags): string {
+            if (flags && !(tempFlags & flags)) {
+                const name = flags === TempFlags._i ? "_i" : "_n";
+                if (isUniqueName(name)) {
+                    tempFlags |= flags;
+                    return name;
+                }
+            }
+            while (true) {
+                const count = tempFlags & TempFlags.CountMask;
+                tempFlags++;
+                // Skip over 'i' and 'n'
+                if (count !== 8 && count !== 13) {
+                    const name = count < 26
+                        ? "_" + String.fromCharCode(CharacterCodes.a + count)
+                        : "_" + (count - 26);
+                    if (isUniqueName(name)) {
+                        return name;
+                    }
+                }
+            }
+        }
+
+        // Generate a name that is unique within the current file and doesn't conflict with any names
+        // in global scope. The name is formed by adding an '_n' suffix to the specified base name,
+        // where n is a positive integer. Note that names generated by makeTempVariableName and
+        // makeUniqueName are guaranteed to never conflict.
+        function makeUniqueName(baseName: string): string {
+            // Find the first unique 'name_n', where n is a positive number
+            if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
+                baseName += "_";
+            }
+            let i = 1;
+            while (true) {
+                const generatedName = baseName + i;
+                if (isUniqueName(generatedName)) {
+                    return generatedNameSet[generatedName] = generatedName;
+                }
+                i++;
+            }
+        }
+
+        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
+            const name = getTextOfNode(node.name);
+            // Use module/enum name itself if it is unique, otherwise make a unique variation
+            return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
+        }
+
+        function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
+            const expr = getExternalModuleName(node);
+            const baseName = expr.kind === SyntaxKind.StringLiteral ?
+                escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
+            return makeUniqueName(baseName);
+        }
+
+        function generateNameForExportDefault() {
+            return makeUniqueName("default");
+        }
+
+        function generateNameForClassExpression() {
+            return makeUniqueName("class");
+        }
+
+        /**
+         * Generates a unique name from a node.
+         *
+         * @param node A node.
+         */
+        function generateNameForNode(node: Node): string {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return makeUniqueName(getTextOfNode(node));
+                case SyntaxKind.ModuleDeclaration:
+                case SyntaxKind.EnumDeclaration:
+                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node);
+                case SyntaxKind.ImportDeclaration:
+                case SyntaxKind.ExportDeclaration:
+                    return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
+                case SyntaxKind.FunctionDeclaration:
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.ExportAssignment:
+                    return generateNameForExportDefault();
+                case SyntaxKind.ClassExpression:
+                    return generateNameForClassExpression();
+                default:
+                    return makeTempVariableName(TempFlags.Auto);
+            }
+        }
+
+        /**
+         * Generates a unique identifier for a node.
+         *
+         * @param name A generated name.
+         */
+        function generateName(name: Identifier) {
+            switch (name.autoGenerateKind) {
+                case GeneratedIdentifierKind.Auto:
+                    return makeTempVariableName(TempFlags.Auto);
+                case GeneratedIdentifierKind.Loop:
+                    return makeTempVariableName(TempFlags._i);
+                case GeneratedIdentifierKind.Unique:
+                    return makeUniqueName(name.text);
+            }
+
+            Debug.fail("Unsupported GeneratedIdentifierKind.");
+        }
+
+        /**
+         * Gets the node from which a name should be generated.
+         *
+         * @param name A generated name wrapper.
+         */
+        function getNodeForGeneratedName(name: Identifier) {
+            const autoGenerateId = name.autoGenerateId;
+            let node = name as Node;
+            let original = node.original;
+            while (original) {
+                node = original;
+
+                // if "node" is a different generated name (having a different
+                // "autoGenerateId"), use it and stop traversing.
+                if (isIdentifier(node)
+                    && node.autoGenerateKind === GeneratedIdentifierKind.Node
+                    && node.autoGenerateId !== autoGenerateId) {
+                    break;
+                }
+
+                original = node.original;
+            }
+
+            // otherwise, return the original node for the source;
+            return node;
+        }
+
+        /**
+         * Gets the generated identifier text from a generated identifier.
+         *
+         * @param name The generated identifier.
+         */
+        function getGeneratedIdentifier(name: Identifier) {
+            if (name.autoGenerateKind === GeneratedIdentifierKind.Node) {
+                // Generated names generate unique names based on their original node
+                // and are cached based on that node's id
+                const node = getNodeForGeneratedName(name);
+                const nodeId = getNodeId(node);
+                return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node)));
+            }
+            else {
+                // Auto, Loop, and Unique names are cached based on their unique
+                // autoGenerateId.
+                const autoGenerateId = name.autoGenerateId;
+                return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = unescapeIdentifier(generateName(name)));
+            }
+        }
+
+        function createDelimiterMap() {
+            const delimiters: string[] = [];
+            delimiters[ListFormat.None] = "";
+            delimiters[ListFormat.CommaDelimited] = ",";
+            delimiters[ListFormat.BarDelimited] = " |";
+            delimiters[ListFormat.AmpersandDelimited] = " &";
+            return delimiters;
+        }
+
+        function getDelimiter(format: ListFormat) {
+            return delimiters[format & ListFormat.DelimitersMask];
+        }
+
+        function createBracketsMap() {
+            const brackets: string[][] = [];
+            brackets[ListFormat.Braces] = ["{", "}"];
+            brackets[ListFormat.Parenthesis] = ["(", ")"];
+            brackets[ListFormat.AngleBrackets] = ["<", ">"];
+            brackets[ListFormat.SquareBrackets] = ["[", "]"];
+            return brackets;
+        }
+
+        function getOpeningBracket(format: ListFormat) {
+            return brackets[format & ListFormat.BracketsMask][0];
+        }
+
+        function getClosingBracket(format: ListFormat) {
+            return brackets[format & ListFormat.BracketsMask][1];
+        }
+    }
+
+    const enum ListFormat {
+        None = 0,
+
+        // Line separators
+        SingleLine = 0,                 // Prints the list on a single line (default).
+        MultiLine = 1 << 0,             // Prints the list on multiple lines.
+        PreserveLines = 1 << 1,         // Prints the list using line preservation if possible.
+        LinesMask = SingleLine | MultiLine | PreserveLines,
+
+        // Delimiters
+        NotDelimited = 0,               // There is no delimiter between list items (default).
+        BarDelimited = 1 << 2,          // Each list item is space-and-bar (" |") delimited.
+        AmpersandDelimited = 1 << 3,    // Each list item is space-and-ampersand (" &") delimited.
+        CommaDelimited = 1 << 4,        // Each list item is comma (",") delimited.
+        DelimitersMask = BarDelimited | AmpersandDelimited | CommaDelimited,
+
+        AllowTrailingComma = 1 << 5,    // Write a trailing comma (",") if present.
+
+        // Whitespace
+        Indented = 1 << 6,              // The list should be indented.
+        SpaceBetweenBraces = 1 << 7,    // Inserts a space after the opening brace and before the closing brace.
+        SpaceBetweenSiblings = 1 << 8,  // Inserts a space between each sibling node.
+
+        // Brackets/Braces
+        Braces = 1 << 9,                 // The list is surrounded by "{" and "}".
+        Parenthesis = 1 << 10,          // The list is surrounded by "(" and ")".
+        AngleBrackets = 1 << 11,        // The list is surrounded by "<" and ">".
+        SquareBrackets = 1 << 12,       // The list is surrounded by "[" and "]".
+        BracketsMask = Braces | Parenthesis | AngleBrackets | SquareBrackets,
+
+        OptionalIfUndefined = 1 << 13,  // Do not emit brackets if the list is undefined.
+        OptionalIfEmpty = 1 << 14,      // Do not emit brackets if the list is empty.
+        Optional = OptionalIfUndefined | OptionalIfEmpty,
+
+        // Other
+        PreferNewLine = 1 << 15,        // Prefer adding a LineTerminator between synthesized nodes.
+        NoTrailingNewLine = 1 << 16,    // Do not emit a trailing NewLine for a MultiLine list.
+        NoInterveningComments = 1 << 17, // Do not emit comments between each node
+
+        // Precomputed Formats
+        Modifiers = SingleLine | SpaceBetweenSiblings,
+        HeritageClauses = SingleLine | SpaceBetweenSiblings,
+        TypeLiteralMembers = MultiLine | Indented,
+        TupleTypeElements = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented,
+        UnionTypeConstituents = BarDelimited | SpaceBetweenSiblings | SingleLine,
+        IntersectionTypeConstituents = AmpersandDelimited | SpaceBetweenSiblings | SingleLine,
+        ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
+        ArrayBindingPatternElements = SingleLine | AllowTrailingComma | CommaDelimited | SpaceBetweenSiblings,
+        ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenSiblings | SpaceBetweenBraces | Indented | Braces,
+        ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | Indented | SquareBrackets,
+        CallExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis,
+        NewExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis | OptionalIfUndefined,
+        TemplateExpressionSpans = SingleLine | NoInterveningComments,
+        SingleLineBlockStatements = SpaceBetweenBraces | SpaceBetweenSiblings | SingleLine,
+        MultiLineBlockStatements = Indented | MultiLine,
+        VariableDeclarationList = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenSiblings | SpaceBetweenBraces,
+        MultiLineFunctionBodyStatements = MultiLine,
+        ClassHeritageClauses = SingleLine | SpaceBetweenSiblings,
+        ClassMembers = Indented | MultiLine,
+        InterfaceMembers = Indented | MultiLine,
+        EnumMembers = CommaDelimited | Indented | MultiLine,
+        CaseBlockClauses = Indented | MultiLine,
+        NamedImportsOrExportsElements = CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
+        JsxElementChildren = SingleLine | NoInterveningComments,
+        JsxElementAttributes = SingleLine | SpaceBetweenSiblings | NoInterveningComments,
+        CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
+        HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SourceFileStatements = MultiLine | NoTrailingNewLine,
+        Decorators = MultiLine | Optional,
+        TypeArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
+        TypeParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
+        Parameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | Parenthesis,
+        IndexSignatureParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | SquareBrackets,
     }
 }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
new file mode 100644
index 00000000000..1930481115c
--- /dev/null
+++ b/src/compiler/factory.ts
@@ -0,0 +1,2748 @@
+/// <reference path="core.ts"/>
+/// <reference path="utilities.ts"/>
+
+/* @internal */
+namespace ts {
+    let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
+    let SourceFileConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
+
+    function createNode(kind: SyntaxKind, location?: TextRange, flags?: NodeFlags): Node {
+        const ConstructorForKind = kind === SyntaxKind.SourceFile
+            ? (SourceFileConstructor || (SourceFileConstructor = objectAllocator.getSourceFileConstructor()))
+            : (NodeConstructor || (NodeConstructor = objectAllocator.getNodeConstructor()));
+
+        const node = location
+            ? new ConstructorForKind(kind, location.pos, location.end)
+            : new ConstructorForKind(kind, /*pos*/ -1, /*end*/ -1);
+
+        node.flags = flags | NodeFlags.Synthesized;
+
+        return node;
+    }
+
+    export function updateNode<T extends Node>(updated: T, original: T): T {
+        if (updated !== original) {
+            setOriginalNode(updated, original);
+            if (original.startsOnNewLine) {
+                updated.startsOnNewLine = true;
+            }
+            aggregateTransformFlags(updated);
+        }
+        return updated;
+    }
+
+    export function createNodeArray<T extends Node>(elements?: T[], location?: TextRange, hasTrailingComma?: boolean): NodeArray<T> {
+        if (elements) {
+            if (isNodeArray(elements)) {
+                return elements;
+            }
+        }
+        else {
+            elements = [];
+        }
+
+        const array = <NodeArray<T>>elements;
+        if (location) {
+            array.pos = location.pos;
+            array.end = location.end;
+        }
+        else {
+            array.pos = -1;
+            array.end = -1;
+        }
+
+        if (hasTrailingComma) {
+            array.hasTrailingComma = true;
+        }
+
+        return array;
+    }
+
+    export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node {
+        const node = createNode(kind, /*location*/ undefined);
+        node.startsOnNewLine = startsOnNewLine;
+        return node;
+    }
+
+    export function createSynthesizedNodeArray<T extends Node>(elements?: T[]): NodeArray<T> {
+        return createNodeArray(elements, /*location*/ undefined);
+    }
+
+    /**
+     * Creates a shallow, memberwise clone of a node with no source map location.
+     */
+    export function getSynthesizedClone<T extends Node>(node: T): T {
+        // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of
+        // the original node. We also need to exclude specific properties and only include own-
+        // properties (to skip members already defined on the shared prototype).
+        const clone = <T>createNode(node.kind, /*location*/ undefined, node.flags);
+        clone.original = node;
+
+        for (const key in node) {
+            if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) {
+                continue;
+            }
+
+            (<any>clone)[key] = (<any>node)[key];
+        }
+
+        return clone;
+    }
+
+    /**
+     * Creates a shallow, memberwise clone of a node for mutation.
+     */
+    export function getMutableClone<T extends Node>(node: T): T {
+        const clone = getSynthesizedClone(node);
+        clone.pos = node.pos;
+        clone.end = node.end;
+        clone.parent = node.parent;
+        return clone;
+    }
+
+    // Literals
+
+    export function createLiteral(textSource: StringLiteral | Identifier, location?: TextRange): StringLiteral;
+    export function createLiteral(value: string, location?: TextRange): StringLiteral;
+    export function createLiteral(value: number, location?: TextRange): NumericLiteral;
+    export function createLiteral(value: string | number | boolean, location?: TextRange): PrimaryExpression;
+    export function createLiteral(value: string | number | boolean | StringLiteral | Identifier, location?: TextRange): PrimaryExpression {
+        if (typeof value === "number") {
+            const node = <LiteralExpression>createNode(SyntaxKind.NumericLiteral, location, /*flags*/ undefined);
+            node.text = value.toString();
+            return node;
+        }
+        else if (typeof value === "boolean") {
+            return <PrimaryExpression>createNode(value ? SyntaxKind.TrueKeyword : SyntaxKind.FalseKeyword, location, /*flags*/ undefined);
+        }
+        else if (typeof value === "string") {
+            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined);
+            node.text = value;
+            return node;
+        }
+        else {
+            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined);
+            node.textSourceNode = value;
+            node.text = value.text;
+            return node;
+        }
+    }
+
+    // Identifiers
+
+    let nextAutoGenerateId = 0;
+
+    export function createIdentifier(text: string, location?: TextRange): Identifier {
+        const node = <Identifier>createNode(SyntaxKind.Identifier, location);
+        node.text = escapeIdentifier(text);
+        node.originalKeywordKind = stringToToken(text);
+        node.autoGenerateKind = GeneratedIdentifierKind.None;
+        node.autoGenerateId = 0;
+        return node;
+    }
+
+    export function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined, location?: TextRange): Identifier {
+        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
+        name.text = "";
+        name.originalKeywordKind = SyntaxKind.Unknown;
+        name.autoGenerateKind = GeneratedIdentifierKind.Auto;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        if (recordTempVariable) {
+            recordTempVariable(name);
+        }
+        return name;
+    }
+
+    export function createLoopVariable(location?: TextRange): Identifier {
+        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
+        name.text = "";
+        name.originalKeywordKind = SyntaxKind.Unknown;
+        name.autoGenerateKind = GeneratedIdentifierKind.Loop;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        return name;
+    }
+
+    export function createUniqueName(text: string, location?: TextRange): Identifier {
+        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
+        name.text = text;
+        name.originalKeywordKind = SyntaxKind.Unknown;
+        name.autoGenerateKind = GeneratedIdentifierKind.Unique;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        return name;
+    }
+
+    export function getGeneratedNameForNode(node: Node, location?: TextRange): Identifier {
+        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
+        name.original = node;
+        name.text = "";
+        name.originalKeywordKind = SyntaxKind.Unknown;
+        name.autoGenerateKind = GeneratedIdentifierKind.Node;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        return name;
+    }
+
+    // Punctuation
+
+    export function createToken(token: SyntaxKind) {
+        return createNode(token);
+    }
+
+    // Reserved words
+
+    export function createSuper() {
+        const node = <PrimaryExpression>createNode(SyntaxKind.SuperKeyword);
+        return node;
+    }
+
+    export function createThis(location?: TextRange) {
+        const node = <PrimaryExpression>createNode(SyntaxKind.ThisKeyword, location);
+        return node;
+    }
+
+    export function createNull() {
+        const node = <PrimaryExpression>createNode(SyntaxKind.NullKeyword);
+        return node;
+    }
+
+    // Names
+
+    export function createComputedPropertyName(expression: Expression, location?: TextRange) {
+        const node = <ComputedPropertyName>createNode(SyntaxKind.ComputedPropertyName, location);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateComputedPropertyName(node: ComputedPropertyName, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createComputedPropertyName(expression, node), node);
+        }
+        return node;
+    }
+
+    // Signature elements
+
+    export function createParameter(name: string | Identifier | BindingPattern, initializer?: Expression, location?: TextRange) {
+        return createParameterDeclaration(
+            /*decorators*/ undefined,
+            /*modifiers*/ undefined,
+            /*dotDotDotToken*/ undefined,
+            name,
+            /*questionToken*/ undefined,
+            /*type*/ undefined,
+            initializer,
+            location
+        );
+    }
+
+    export function createParameterDeclaration(decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: Node, name: string | Identifier | BindingPattern, questionToken: Node, type: TypeNode, initializer: Expression, location?: TextRange, flags?: NodeFlags) {
+        const node = <ParameterDeclaration>createNode(SyntaxKind.Parameter, location, flags);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.dotDotDotToken = dotDotDotToken;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.questionToken = questionToken;
+        node.type = type;
+        node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
+        return node;
+    }
+
+    export function updateParameterDeclaration(node: ParameterDeclaration, decorators: Decorator[], modifiers: Modifier[], name: BindingName, type: TypeNode, initializer: Expression) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
+            return updateNode(createParameterDeclaration(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
+        }
+
+        return node;
+    }
+
+    // Type members
+
+    export function createProperty(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, questionToken: Node, type: TypeNode, initializer: Expression, location?: TextRange) {
+        const node = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, location);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.questionToken = questionToken;
+        node.type = type;
+        node.initializer = initializer;
+        return node;
+    }
+
+    export function updateProperty(node: PropertyDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, type: TypeNode, initializer: Expression) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
+            return updateNode(createProperty(decorators, modifiers, name, node.questionToken, type, initializer, node), node);
+        }
+        return node;
+    }
+
+    export function createMethod(decorators: Decorator[], modifiers: Modifier[], asteriskToken: Node, name: string | PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
+        const node = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, location, flags);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.asteriskToken = asteriskToken;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+
+    export function updateMethod(node: MethodDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
+            return updateNode(createMethod(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createConstructor(decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags) {
+        const node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, location, flags);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.typeParameters = undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = undefined;
+        node.body = body;
+        return node;
+    }
+
+    export function updateConstructor(node: ConstructorDeclaration, decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.parameters !== parameters || node.body !== body) {
+            return updateNode(createConstructor(decorators, modifiers, parameters, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createGetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
+        const node = <GetAccessorDeclaration>createNode(SyntaxKind.GetAccessor, location, flags);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.typeParameters = undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+
+    export function updateGetAccessor(node: GetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.parameters !== parameters || node.type !== type || node.body !== body) {
+            return updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createSetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags) {
+        const node = <SetAccessorDeclaration>createNode(SyntaxKind.SetAccessor, location, flags);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.typeParameters = undefined;
+        node.parameters = createNodeArray(parameters);
+        node.body = body;
+        return node;
+    }
+
+    export function updateSetAccessor(node: SetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], body: Block) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.parameters !== parameters || node.body !== body) {
+            return updateNode(createSetAccessor(decorators, modifiers, name, parameters, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    // Binding Patterns
+
+    export function createObjectBindingPattern(elements: BindingElement[], location?: TextRange) {
+        const node = <ObjectBindingPattern>createNode(SyntaxKind.ObjectBindingPattern, location);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+
+    export function updateObjectBindingPattern(node: ObjectBindingPattern, elements: BindingElement[]) {
+        if (node.elements !== elements) {
+            return updateNode(createObjectBindingPattern(elements, node), node);
+        }
+        return node;
+    }
+
+    export function createArrayBindingPattern(elements: BindingElement[], location?: TextRange) {
+        const node = <ArrayBindingPattern>createNode(SyntaxKind.ArrayBindingPattern, location);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+
+    export function updateArrayBindingPattern(node: ArrayBindingPattern, elements: BindingElement[]) {
+        if (node.elements !== elements) {
+            return updateNode(createArrayBindingPattern(elements, node), node);
+        }
+        return node;
+    }
+
+    export function createBindingElement(propertyName: string | PropertyName, dotDotDotToken: Node, name: string | BindingName, initializer?: Expression, location?: TextRange) {
+        const node = <BindingElement>createNode(SyntaxKind.BindingElement, location);
+        node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
+        node.dotDotDotToken = dotDotDotToken;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.initializer = initializer;
+        return node;
+    }
+
+    export function updateBindingElement(node: BindingElement, propertyName: PropertyName, name: BindingName, initializer: Expression) {
+        if (node.propertyName !== propertyName || node.name !== name || node.initializer !== initializer) {
+            return updateNode(createBindingElement(propertyName, node.dotDotDotToken, name, initializer, node), node);
+        }
+        return node;
+    }
+
+    // Expression
+
+    export function createArrayLiteral(elements?: Expression[], location?: TextRange, multiLine?: boolean) {
+        const node = <ArrayLiteralExpression>createNode(SyntaxKind.ArrayLiteralExpression, location);
+        node.elements = parenthesizeListElements(createNodeArray(elements));
+        if (multiLine) {
+            node.multiLine = true;
+        }
+
+        return node;
+    }
+
+    export function updateArrayLiteral(node: ArrayLiteralExpression, elements: Expression[]) {
+        if (node.elements !== elements) {
+            return updateNode(createArrayLiteral(elements, node, node.multiLine), node);
+        }
+        return node;
+    }
+
+    export function createObjectLiteral(properties?: ObjectLiteralElement[], location?: TextRange, multiLine?: boolean) {
+        const node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression, location);
+        node.properties = createNodeArray(properties);
+        if (multiLine) {
+            node.multiLine = true;
+        }
+        return node;
+    }
+
+    export function updateObjectLiteral(node: ObjectLiteralExpression, properties: ObjectLiteralElement[]) {
+        if (node.properties !== properties) {
+            return updateNode(createObjectLiteral(properties, node, node.multiLine), node);
+        }
+        return node;
+    }
+
+    export function createPropertyAccess(expression: Expression, name: string | Identifier, location?: TextRange, flags?: NodeFlags) {
+        const node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, location, flags);
+        node.expression = parenthesizeForAccess(expression);
+        node.emitFlags = NodeEmitFlags.NoIndentation;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        return node;
+    }
+
+    export function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier) {
+        if (node.expression !== expression || node.name !== name) {
+            const propertyAccess = createPropertyAccess(expression, name, /*location*/ node, node.flags);
+            // Because we are updating existed propertyAccess we want to inherit its emitFlags instead of using default from createPropertyAccess
+            propertyAccess.emitFlags = node.emitFlags;
+            return updateNode(propertyAccess, node);
+        }
+        return node;
+    }
+
+    export function createElementAccess(expression: Expression, index: number | Expression, location?: TextRange) {
+        const node = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, location);
+        node.expression = parenthesizeForAccess(expression);
+        node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
+        return node;
+    }
+
+    export function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression) {
+        if (node.expression !== expression || node.argumentExpression !== argumentExpression) {
+            return updateNode(createElementAccess(expression, argumentExpression, node), node);
+        }
+        return node;
+    }
+
+    export function createCall(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags) {
+        const node = <CallExpression>createNode(SyntaxKind.CallExpression, location, flags);
+        node.expression = parenthesizeForAccess(expression);
+        if (typeArguments) {
+            node.typeArguments = createNodeArray(typeArguments);
+        }
+
+        node.arguments = parenthesizeListElements(createNodeArray(argumentsArray));
+        return node;
+    }
+
+    export function updateCall(node: CallExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) {
+        if (expression !== node.expression || typeArguments !== node.typeArguments || argumentsArray !== node.arguments) {
+            return updateNode(createCall(expression, typeArguments, argumentsArray, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createNew(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags) {
+        const node = <NewExpression>createNode(SyntaxKind.NewExpression, location, flags);
+        node.expression = parenthesizeForNew(expression);
+        node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
+        node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
+        return node;
+    }
+
+    export function updateNew(node: NewExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) {
+        if (node.expression !== expression || node.typeArguments !== typeArguments || node.arguments !== argumentsArray) {
+            return updateNode(createNew(expression, typeArguments, argumentsArray, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createTaggedTemplate(tag: Expression, template: Template, location?: TextRange) {
+        const node = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, location);
+        node.tag = parenthesizeForAccess(tag);
+        node.template = template;
+        return node;
+    }
+
+    export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: Template) {
+        if (node.tag !== tag || node.template !== template) {
+            return updateNode(createTaggedTemplate(tag, template, node), node);
+        }
+        return node;
+    }
+
+    export function createParen(expression: Expression, location?: TextRange) {
+        const node = <ParenthesizedExpression>createNode(SyntaxKind.ParenthesizedExpression, location);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateParen(node: ParenthesizedExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createParen(expression, node), node);
+        }
+        return node;
+    }
+
+    export function createFunctionExpression(asteriskToken: Node, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
+        const node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression, location, flags);
+        node.modifiers = undefined;
+        node.asteriskToken = asteriskToken;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+
+    export function updateFunctionExpression(node: FunctionExpression, name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        if (node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
+            return updateNode(createFunctionExpression(node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createArrowFunction(modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, equalsGreaterThanToken: Node, body: ConciseBody, location?: TextRange, flags?: NodeFlags) {
+        const node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction, location, flags);
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.equalsGreaterThanToken = equalsGreaterThanToken || createNode(SyntaxKind.EqualsGreaterThanToken);
+        node.body = parenthesizeConciseBody(body);
+        return node;
+    }
+
+    export function updateArrowFunction(node: ArrowFunction, modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: ConciseBody) {
+        if (node.modifiers !== modifiers || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
+            return updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, node.equalsGreaterThanToken, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createDelete(expression: Expression, location?: TextRange) {
+        const node = <DeleteExpression>createNode(SyntaxKind.DeleteExpression, location);
+        node.expression = parenthesizePrefixOperand(expression);
+        return node;
+    }
+
+    export function updateDelete(node: DeleteExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createDelete(expression, node), expression);
+        }
+        return node;
+    }
+
+    export function createTypeOf(expression: Expression, location?: TextRange) {
+        const node = <TypeOfExpression>createNode(SyntaxKind.TypeOfExpression, location);
+        node.expression = parenthesizePrefixOperand(expression);
+        return node;
+    }
+
+    export function updateTypeOf(node: TypeOfExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createTypeOf(expression, node), expression);
+        }
+        return node;
+    }
+
+    export function createVoid(expression: Expression, location?: TextRange) {
+        const node = <VoidExpression>createNode(SyntaxKind.VoidExpression, location);
+        node.expression = parenthesizePrefixOperand(expression);
+        return node;
+    }
+
+    export function updateVoid(node: VoidExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createVoid(expression, node), node);
+        }
+        return node;
+    }
+
+    export function createAwait(expression: Expression, location?: TextRange) {
+        const node = <AwaitExpression>createNode(SyntaxKind.AwaitExpression, location);
+        node.expression = parenthesizePrefixOperand(expression);
+        return node;
+    }
+
+    export function updateAwait(node: AwaitExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createAwait(expression, node), node);
+        }
+        return node;
+    }
+
+    export function createPrefix(operator: SyntaxKind, operand: Expression, location?: TextRange) {
+        const node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression, location);
+        node.operator = operator;
+        node.operand = parenthesizePrefixOperand(operand);
+        return node;
+    }
+
+    export function updatePrefix(node: PrefixUnaryExpression, operand: Expression) {
+        if (node.operand !== operand) {
+            return updateNode(createPrefix(node.operator, operand, node), node);
+        }
+        return node;
+    }
+
+    export function createPostfix(operand: Expression, operator: SyntaxKind, location?: TextRange) {
+        const node = <PostfixUnaryExpression>createNode(SyntaxKind.PostfixUnaryExpression, location);
+        node.operand = parenthesizePostfixOperand(operand);
+        node.operator = operator;
+        return node;
+    }
+
+    export function updatePostfix(node: PostfixUnaryExpression, operand: Expression) {
+        if (node.operand !== operand) {
+            return updateNode(createPostfix(operand, node.operator, node), node);
+        }
+        return node;
+    }
+
+    export function createBinary(left: Expression, operator: SyntaxKind | Node, right: Expression, location?: TextRange) {
+        const operatorToken = typeof operator === "number" ? createSynthesizedNode(operator) : operator;
+        const operatorKind = operatorToken.kind;
+        const node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, location);
+        node.left = parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
+        node.operatorToken = operatorToken;
+        node.right = parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left);
+        return node;
+    }
+
+    export function updateBinary(node: BinaryExpression, left: Expression, right: Expression) {
+        if (node.left !== left || node.right !== right) {
+            return updateNode(createBinary(left, node.operatorToken, right, /*location*/ node), node);
+        }
+        return node;
+    }
+
+    export function createConditional(condition: Expression, questionToken: Node, whenTrue: Expression, colonToken: Node, whenFalse: Expression, location?: TextRange) {
+        const node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, location);
+        node.condition = condition;
+        node.questionToken = questionToken;
+        node.whenTrue = whenTrue;
+        node.colonToken = colonToken;
+        node.whenFalse = whenFalse;
+        return node;
+    }
+
+    export function updateConditional(node: ConditionalExpression, condition: Expression, whenTrue: Expression, whenFalse: Expression) {
+        if (node.condition !== condition || node.whenTrue !== whenTrue || node.whenFalse !== whenFalse) {
+            return updateNode(createConditional(condition, node.questionToken, whenTrue, node.colonToken, whenFalse, node), node);
+        }
+        return node;
+    }
+
+    export function createTemplateExpression(head: TemplateLiteralFragment, templateSpans: TemplateSpan[], location?: TextRange) {
+        const node = <TemplateExpression>createNode(SyntaxKind.TemplateExpression, location);
+        node.head = head;
+        node.templateSpans = createNodeArray(templateSpans);
+        return node;
+    }
+
+    export function updateTemplateExpression(node: TemplateExpression, head: TemplateLiteralFragment, templateSpans: TemplateSpan[]) {
+        if (node.head !== head || node.templateSpans !== templateSpans) {
+            return updateNode(createTemplateExpression(head, templateSpans, node), node);
+        }
+        return node;
+    }
+
+    export function createYield(asteriskToken: Node, expression: Expression, location?: TextRange) {
+        const node = <YieldExpression>createNode(SyntaxKind.YieldExpression, location);
+        node.asteriskToken = asteriskToken;
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateYield(node: YieldExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createYield(node.asteriskToken, expression, node), node);
+        }
+        return node;
+    }
+
+    export function createSpread(expression: Expression, location?: TextRange) {
+        const node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression, location);
+        node.expression = parenthesizeExpressionForList(expression);
+        return node;
+    }
+
+    export function updateSpread(node: SpreadElementExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpread(expression, node), node);
+        }
+        return node;
+    }
+
+    export function createClassExpression(modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) {
+        const node = <ClassExpression>createNode(SyntaxKind.ClassExpression, location);
+        node.decorators = undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.name = name;
+        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.heritageClauses = createNodeArray(heritageClauses);
+        node.members = createNodeArray(members);
+        return node;
+    }
+
+    export function updateClassExpression(node: ClassExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) {
+        if (node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.heritageClauses !== heritageClauses || node.members !== members) {
+            return updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members, node), node);
+        }
+        return node;
+    }
+
+    export function createOmittedExpression(location?: TextRange) {
+        const node = <OmittedExpression>createNode(SyntaxKind.OmittedExpression, location);
+        return node;
+    }
+
+    export function createExpressionWithTypeArguments(typeArguments: TypeNode[], expression: Expression, location?: TextRange) {
+        const node = <ExpressionWithTypeArguments>createNode(SyntaxKind.ExpressionWithTypeArguments, location);
+        node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
+        node.expression = parenthesizeForAccess(expression);
+        return node;
+    }
+
+    export function updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, typeArguments: TypeNode[], expression: Expression) {
+        if (node.typeArguments !== typeArguments || node.expression !== expression) {
+            return updateNode(createExpressionWithTypeArguments(typeArguments, expression, node), node);
+        }
+        return node;
+    }
+
+
+    // Misc
+
+    export function createTemplateSpan(expression: Expression, literal: TemplateLiteralFragment, location?: TextRange) {
+        const node = <TemplateSpan>createNode(SyntaxKind.TemplateSpan, location);
+        node.expression = expression;
+        node.literal = literal;
+        return node;
+    }
+
+    export function updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateLiteralFragment) {
+        if (node.expression !== expression || node.literal !== literal) {
+            return updateNode(createTemplateSpan(expression, literal, node), node);
+        }
+        return node;
+    }
+
+    // Element
+
+    export function createBlock(statements: Statement[], location?: TextRange, multiLine?: boolean, flags?: NodeFlags): Block {
+        const block = <Block>createNode(SyntaxKind.Block, location, flags);
+        block.statements = createNodeArray(statements);
+        if (multiLine) {
+            block.multiLine = true;
+        }
+        return block;
+    }
+
+    export function updateBlock(node: Block, statements: Statement[]) {
+        if (statements !== node.statements) {
+            return updateNode(createBlock(statements, /*location*/ node, node.multiLine, node.flags), node);
+        }
+
+        return node;
+    }
+
+    export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableStatement {
+        const node = <VariableStatement>createNode(SyntaxKind.VariableStatement, location, flags);
+        node.decorators = undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.declarationList = isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
+        return node;
+    }
+
+    export function updateVariableStatement(node: VariableStatement, modifiers: Modifier[], declarationList: VariableDeclarationList): VariableStatement {
+        if (node.modifiers !== modifiers || node.declarationList !== declarationList) {
+            return updateNode(createVariableStatement(modifiers, declarationList, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createVariableDeclarationList(declarations: VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableDeclarationList {
+        const node = <VariableDeclarationList>createNode(SyntaxKind.VariableDeclarationList, location, flags);
+        node.declarations = createNodeArray(declarations);
+        return node;
+    }
+
+    export function updateVariableDeclarationList(node: VariableDeclarationList, declarations: VariableDeclaration[]) {
+        if (node.declarations !== declarations) {
+            return updateNode(createVariableDeclarationList(declarations, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createVariableDeclaration(name: string | BindingPattern | Identifier, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags): VariableDeclaration {
+        const node = <VariableDeclaration>createNode(SyntaxKind.VariableDeclaration, location, flags);
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.type = type;
+        node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
+        return node;
+    }
+
+    export function updateVariableDeclaration(node: VariableDeclaration, name: BindingName, type: TypeNode, initializer: Expression) {
+        if (node.name !== name || node.type !== type || node.initializer !== initializer) {
+            return updateNode(createVariableDeclaration(name, type, initializer, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createEmptyStatement(location: TextRange) {
+        return <EmptyStatement>createNode(SyntaxKind.EmptyStatement, location);
+    }
+
+    export function createStatement(expression: Expression, location?: TextRange, flags?: NodeFlags): ExpressionStatement {
+        const node = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, location, flags);
+        node.expression = parenthesizeExpressionForExpressionStatement(expression);
+        return node;
+    }
+
+    export function updateStatement(node: ExpressionStatement, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createStatement(expression, /*location*/ node, node.flags), node);
+        }
+
+        return node;
+    }
+
+    export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement, location?: TextRange) {
+        const node = <IfStatement>createNode(SyntaxKind.IfStatement, location);
+        node.expression = expression;
+        node.thenStatement = thenStatement;
+        node.elseStatement = elseStatement;
+        return node;
+    }
+
+    export function updateIf(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement) {
+        if (node.expression !== expression || node.thenStatement !== thenStatement || node.elseStatement !== elseStatement) {
+            return updateNode(createIf(expression, thenStatement, elseStatement, /*location*/ node), node);
+        }
+        return node;
+    }
+
+    export function createDo(statement: Statement, expression: Expression, location?: TextRange) {
+        const node = <DoStatement>createNode(SyntaxKind.DoStatement, location);
+        node.statement = statement;
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateDo(node: DoStatement, statement: Statement, expression: Expression) {
+        if (node.statement !== statement || node.expression !== expression) {
+            return updateNode(createDo(statement, expression, node), node);
+        }
+        return node;
+    }
+
+    export function createWhile(expression: Expression, statement: Statement, location?: TextRange) {
+        const node = <WhileStatement>createNode(SyntaxKind.WhileStatement, location);
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+
+    export function updateWhile(node: WhileStatement, expression: Expression, statement: Statement) {
+        if (node.expression !== expression || node.statement !== statement) {
+            return updateNode(createWhile(expression, statement, node), node);
+        }
+        return node;
+    }
+
+    export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement, location?: TextRange) {
+        const node = <ForStatement>createNode(SyntaxKind.ForStatement, location, /*flags*/ undefined);
+        node.initializer = initializer;
+        node.condition = condition;
+        node.incrementor = incrementor;
+        node.statement = statement;
+        return node;
+    }
+
+    export function updateFor(node: ForStatement, initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement) {
+        if (node.initializer !== initializer || node.condition !== condition || node.incrementor !== incrementor || node.statement !== statement) {
+            return updateNode(createFor(initializer, condition, incrementor, statement, node), node);
+        }
+        return node;
+    }
+
+    export function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange) {
+        const node = <ForInStatement>createNode(SyntaxKind.ForInStatement, location);
+        node.initializer = initializer;
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+
+    export function updateForIn(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement) {
+        if (node.initializer !== initializer || node.expression !== expression || node.statement !== statement) {
+            return updateNode(createForIn(initializer, expression, statement, node), node);
+        }
+        return node;
+    }
+
+    export function createForOf(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange) {
+        const node = <ForOfStatement>createNode(SyntaxKind.ForOfStatement, location);
+        node.initializer = initializer;
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+
+    export function updateForOf(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement) {
+        if (node.initializer !== initializer || node.expression !== expression || node.statement !== statement) {
+            return updateNode(createForOf(initializer, expression, statement, node), node);
+        }
+        return node;
+    }
+
+    export function createContinue(label?: Identifier, location?: TextRange): BreakStatement {
+        const node = <ContinueStatement>createNode(SyntaxKind.ContinueStatement, location);
+        if (label) {
+            node.label = label;
+        }
+        return node;
+    }
+
+    export function updateContinue(node: ContinueStatement, label: Identifier) {
+        if (node.label !== label) {
+            return updateNode(createContinue(label, node), node);
+        }
+        return node;
+    }
+
+    export function createBreak(label?: Identifier, location?: TextRange): BreakStatement {
+        const node = <BreakStatement>createNode(SyntaxKind.BreakStatement, location);
+        if (label) {
+            node.label = label;
+        }
+        return node;
+    }
+
+    export function updateBreak(node: BreakStatement, label: Identifier) {
+        if (node.label !== label) {
+            return updateNode(createBreak(label, node), node);
+        }
+        return node;
+    }
+
+    export function createReturn(expression?: Expression, location?: TextRange): ReturnStatement {
+        const node = <ReturnStatement>createNode(SyntaxKind.ReturnStatement, location);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateReturn(node: ReturnStatement, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createReturn(expression, /*location*/ node), node);
+        }
+        return node;
+    }
+
+    export function createWith(expression: Expression, statement: Statement, location?: TextRange) {
+        const node = <WithStatement>createNode(SyntaxKind.WithStatement, location);
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+
+    export function updateWith(node: WithStatement, expression: Expression, statement: Statement) {
+        if (node.expression !== expression || node.statement !== statement) {
+            return updateNode(createWith(expression, statement, node), node);
+        }
+        return node;
+    }
+
+    export function createSwitch(expression: Expression, caseBlock: CaseBlock, location?: TextRange): SwitchStatement {
+        const node = <SwitchStatement>createNode(SyntaxKind.SwitchStatement, location);
+        node.expression = parenthesizeExpressionForList(expression);
+        node.caseBlock = caseBlock;
+        return node;
+    }
+
+    export function updateSwitch(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock) {
+        if (node.expression !== expression || node.caseBlock !== caseBlock) {
+            return updateNode(createSwitch(expression, caseBlock, node), node);
+        }
+        return node;
+    }
+
+    export function createLabel(label: string | Identifier, statement: Statement, location?: TextRange) {
+        const node = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, location);
+        node.label = typeof label === "string" ? createIdentifier(label) : label;
+        node.statement = statement;
+        return node;
+    }
+
+    export function updateLabel(node: LabeledStatement, label: Identifier, statement: Statement) {
+        if (node.label !== label || node.statement !== statement) {
+            return updateNode(createLabel(label, statement, node), node);
+        }
+        return node;
+    }
+
+    export function createThrow(expression: Expression, location?: TextRange) {
+        const node = <ThrowStatement>createNode(SyntaxKind.ThrowStatement, location);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateThrow(node: ThrowStatement, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createThrow(expression, node), node);
+        }
+        return node;
+    }
+
+    export function createTry(tryBlock: Block, catchClause: CatchClause, finallyBlock: Block, location?: TextRange) {
+        const node = <TryStatement>createNode(SyntaxKind.TryStatement, location);
+        node.tryBlock = tryBlock;
+        node.catchClause = catchClause;
+        node.finallyBlock = finallyBlock;
+        return node;
+    }
+
+    export function updateTry(node: TryStatement, tryBlock: Block, catchClause: CatchClause, finallyBlock: Block) {
+        if (node.tryBlock !== tryBlock || node.catchClause !== catchClause || node.finallyBlock !== finallyBlock) {
+            return updateNode(createTry(tryBlock, catchClause, finallyBlock, node), node);
+        }
+        return node;
+    }
+
+    export function createCaseBlock(clauses: CaseOrDefaultClause[], location?: TextRange): CaseBlock {
+        const node = <CaseBlock>createNode(SyntaxKind.CaseBlock, location);
+        node.clauses = createNodeArray(clauses);
+        return node;
+    }
+
+    export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) {
+        if (node.clauses !== clauses) {
+            return updateNode(createCaseBlock(clauses, node), node);
+        }
+        return node;
+    }
+
+    export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: Node, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
+        const node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, location, flags);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.asteriskToken = asteriskToken;
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+
+    export function updateFunctionDeclaration(node: FunctionDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
+            return updateNode(createFunctionDeclaration(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node);
+        }
+        return node;
+    }
+
+    export function createClassDeclaration(decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) {
+        const node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, location);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.name = name;
+        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.heritageClauses = createNodeArray(heritageClauses);
+        node.members = createNodeArray(members);
+        return node;
+    }
+
+    export function updateClassDeclaration(node: ClassDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.heritageClauses !== heritageClauses || node.members !== members) {
+            return updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, node), node);
+        }
+        return node;
+    }
+
+    export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression, location?: TextRange): ImportDeclaration {
+        const node = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, location);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.importClause = importClause;
+        node.moduleSpecifier = moduleSpecifier;
+        return node;
+    }
+
+    export function updateImportDeclaration(node: ImportDeclaration, decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier: Expression) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.importClause !== importClause || node.moduleSpecifier !== moduleSpecifier) {
+            return updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, node), node);
+        }
+        return node;
+    }
+
+    export function createImportClause(name: Identifier, namedBindings: NamedImportBindings, location?: TextRange): ImportClause {
+        const node = <ImportClause>createNode(SyntaxKind.ImportClause, location);
+        node.name = name;
+        node.namedBindings = namedBindings;
+        return node;
+    }
+
+    export function updateImportClause(node: ImportClause, name: Identifier, namedBindings: NamedImportBindings) {
+        if (node.name !== name || node.namedBindings !== namedBindings) {
+            return updateNode(createImportClause(name, namedBindings, node), node);
+        }
+        return node;
+    }
+
+    export function createNamespaceImport(name: Identifier, location?: TextRange): NamespaceImport {
+        const node = <NamespaceImport>createNode(SyntaxKind.NamespaceImport, location);
+        node.name = name;
+        return node;
+    }
+
+    export function updateNamespaceImport(node: NamespaceImport, name: Identifier) {
+        if (node.name !== name) {
+            return updateNode(createNamespaceImport(name, node), node);
+        }
+        return node;
+    }
+
+    export function createNamedImports(elements: ImportSpecifier[], location?: TextRange): NamedImports {
+        const node = <NamedImports>createNode(SyntaxKind.NamedImports, location);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+
+    export function updateNamedImports(node: NamedImports, elements: ImportSpecifier[]) {
+        if (node.elements !== elements) {
+            return updateNode(createNamedImports(elements, node), node);
+        }
+        return node;
+    }
+
+    export function createImportSpecifier(propertyName: Identifier, name: Identifier, location?: TextRange) {
+        const node = <ImportSpecifier>createNode(SyntaxKind.ImportSpecifier, location);
+        node.propertyName = propertyName;
+        node.name = name;
+        return node;
+    }
+
+    export function updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier, name: Identifier) {
+        if (node.propertyName !== propertyName || node.name !== name) {
+            return updateNode(createImportSpecifier(propertyName, name, node), node);
+        }
+        return node;
+    }
+
+    export function createExportAssignment(decorators: Decorator[], modifiers: Modifier[], isExportEquals: boolean, expression: Expression, location?: TextRange) {
+        const node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, location);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.isExportEquals = isExportEquals;
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateExportAssignment(node: ExportAssignment, decorators: Decorator[], modifiers: Modifier[], expression: Expression) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.expression !== expression) {
+            return updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression, node), node);
+        }
+        return node;
+    }
+
+    export function createExportDeclaration(decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier?: Expression, location?: TextRange) {
+        const node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, location);
+        node.decorators = decorators ? createNodeArray(decorators) : undefined;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.exportClause = exportClause;
+        node.moduleSpecifier = moduleSpecifier;
+        return node;
+    }
+
+    export function updateExportDeclaration(node: ExportDeclaration, decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier: Expression) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.exportClause !== exportClause || node.moduleSpecifier !== moduleSpecifier) {
+            return updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, node), node);
+        }
+        return node;
+    }
+
+    export function createNamedExports(elements: ExportSpecifier[], location?: TextRange) {
+        const node = <NamedExports>createNode(SyntaxKind.NamedExports, location);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+
+    export function updateNamedExports(node: NamedExports, elements: ExportSpecifier[]) {
+        if (node.elements !== elements) {
+            return updateNode(createNamedExports(elements, node), node);
+        }
+        return node;
+    }
+
+    export function createExportSpecifier(name: string | Identifier, propertyName?: string | Identifier, location?: TextRange) {
+        const node = <ExportSpecifier>createNode(SyntaxKind.ExportSpecifier, location);
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
+        return node;
+    }
+
+    export function updateExportSpecifier(node: ExportSpecifier, name: Identifier, propertyName: Identifier) {
+        if (node.name !== name || node.propertyName !== propertyName) {
+            return updateNode(createExportSpecifier(name, propertyName, node), node);
+        }
+        return node;
+    }
+
+    // JSX
+
+    export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement, location?: TextRange) {
+        const node = <JsxElement>createNode(SyntaxKind.JsxElement, location);
+        node.openingElement = openingElement;
+        node.children = createNodeArray(children);
+        node.closingElement = closingElement;
+        return node;
+    }
+
+    export function updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) {
+        if (node.openingElement !== openingElement || node.children !== children || node.closingElement !== closingElement) {
+            return updateNode(createJsxElement(openingElement, children, closingElement, node), node);
+        }
+        return node;
+    }
+
+    export function createJsxSelfClosingElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange) {
+        const node = <JsxSelfClosingElement>createNode(SyntaxKind.JsxSelfClosingElement, location);
+        node.tagName = tagName;
+        node.attributes = createNodeArray(attributes);
+        return node;
+    }
+
+    export function updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) {
+        if (node.tagName !== tagName || node.attributes !== attributes) {
+            return updateNode(createJsxSelfClosingElement(tagName, attributes, node), node);
+        }
+        return node;
+    }
+
+    export function createJsxOpeningElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange) {
+        const node = <JsxOpeningElement>createNode(SyntaxKind.JsxOpeningElement, location);
+        node.tagName = tagName;
+        node.attributes = createNodeArray(attributes);
+        return node;
+    }
+
+    export function updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) {
+        if (node.tagName !== tagName || node.attributes !== attributes) {
+            return updateNode(createJsxOpeningElement(tagName, attributes, node), node);
+        }
+        return node;
+    }
+
+    export function createJsxClosingElement(tagName: JsxTagNameExpression, location?: TextRange) {
+        const node = <JsxClosingElement>createNode(SyntaxKind.JsxClosingElement, location);
+        node.tagName = tagName;
+        return node;
+    }
+
+    export function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression) {
+        if (node.tagName !== tagName) {
+            return updateNode(createJsxClosingElement(tagName, node), node);
+        }
+        return node;
+    }
+
+    export function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression, location?: TextRange) {
+        const node = <JsxAttribute>createNode(SyntaxKind.JsxAttribute, location);
+        node.name = name;
+        node.initializer = initializer;
+        return node;
+    }
+
+    export function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression) {
+        if (node.name !== name || node.initializer !== initializer) {
+            return updateNode(createJsxAttribute(name, initializer, node), node);
+        }
+        return node;
+    }
+
+    export function createJsxSpreadAttribute(expression: Expression, location?: TextRange) {
+        const node = <JsxSpreadAttribute>createNode(SyntaxKind.JsxSpreadAttribute, location);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createJsxSpreadAttribute(expression, node), node);
+        }
+        return node;
+    }
+
+    export function createJsxExpression(expression: Expression, location?: TextRange) {
+        const node = <JsxExpression>createNode(SyntaxKind.JsxExpression, location);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateJsxExpression(node: JsxExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createJsxExpression(expression, node), node);
+        }
+        return node;
+    }
+
+    // Clauses
+
+    export function createHeritageClause(token: SyntaxKind, types: ExpressionWithTypeArguments[], location?: TextRange) {
+        const node = <HeritageClause>createNode(SyntaxKind.HeritageClause, location);
+        node.token = token;
+        node.types = createNodeArray(types);
+        return node;
+    }
+
+    export function updateHeritageClause(node: HeritageClause, types: ExpressionWithTypeArguments[]) {
+        if (node.types !== types) {
+            return updateNode(createHeritageClause(node.token, types, node), node);
+        }
+        return node;
+    }
+
+    export function createCaseClause(expression: Expression, statements: Statement[], location?: TextRange) {
+        const node = <CaseClause>createNode(SyntaxKind.CaseClause, location);
+        node.expression = parenthesizeExpressionForList(expression);
+        node.statements = createNodeArray(statements);
+        return node;
+    }
+
+    export function updateCaseClause(node: CaseClause, expression: Expression, statements: Statement[]) {
+        if (node.expression !== expression || node.statements !== statements) {
+            return updateNode(createCaseClause(expression, statements, node), node);
+        }
+        return node;
+    }
+
+    export function createDefaultClause(statements: Statement[], location?: TextRange) {
+        const node = <DefaultClause>createNode(SyntaxKind.DefaultClause, location);
+        node.statements = createNodeArray(statements);
+        return node;
+    }
+
+    export function updateDefaultClause(node: DefaultClause, statements: Statement[]) {
+        if (node.statements !== statements) {
+            return updateNode(createDefaultClause(statements, node), node);
+        }
+        return node;
+    }
+
+    export function createCatchClause(variableDeclaration: string | VariableDeclaration, block: Block, location?: TextRange) {
+        const node = <CatchClause>createNode(SyntaxKind.CatchClause, location);
+        node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
+        node.block = block;
+        return node;
+    }
+
+    export function updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration, block: Block) {
+        if (node.variableDeclaration !== variableDeclaration || node.block !== block) {
+            return updateNode(createCatchClause(variableDeclaration, block, node), node);
+        }
+        return node;
+    }
+
+    // Property assignments
+
+    export function createPropertyAssignment(name: string | PropertyName, initializer: Expression, location?: TextRange) {
+        const node = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, location);
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.questionToken = undefined;
+        node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
+        return node;
+    }
+
+    export function updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression) {
+        if (node.name !== name || node.initializer !== initializer) {
+            return updateNode(createPropertyAssignment(name, initializer, node), node);
+        }
+        return node;
+    }
+
+    export function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer: Expression, location?: TextRange) {
+        const node = <ShorthandPropertyAssignment>createNode(SyntaxKind.ShorthandPropertyAssignment, location);
+        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
+        return node;
+    }
+
+    export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) {
+        if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
+            return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
+        }
+        return node;
+    }
+
+    // Top-level nodes
+
+    export function updateSourceFileNode(node: SourceFile, statements: Statement[]) {
+        if (node.statements !== statements) {
+            const updated = <SourceFile>createNode(SyntaxKind.SourceFile, /*location*/ node, node.flags);
+            updated.statements = createNodeArray(statements);
+            updated.endOfFileToken = node.endOfFileToken;
+            updated.fileName = node.fileName;
+            updated.path = node.path;
+            updated.text = node.text;
+            if (node.amdDependencies !== undefined) updated.amdDependencies = node.amdDependencies;
+            if (node.moduleName !== undefined) updated.moduleName = node.moduleName;
+            if (node.referencedFiles !== undefined) updated.referencedFiles = node.referencedFiles;
+            if (node.typeReferenceDirectives !== undefined) updated.typeReferenceDirectives = node.typeReferenceDirectives;
+            if (node.languageVariant !== undefined) updated.languageVariant = node.languageVariant;
+            if (node.isDeclarationFile !== undefined) updated.isDeclarationFile = node.isDeclarationFile;
+            if (node.renamedDependencies !== undefined) updated.renamedDependencies = node.renamedDependencies;
+            if (node.hasNoDefaultLib !== undefined) updated.hasNoDefaultLib = node.hasNoDefaultLib;
+            if (node.languageVersion !== undefined) updated.languageVersion = node.languageVersion;
+            if (node.scriptKind !== undefined) updated.scriptKind = node.scriptKind;
+            if (node.externalModuleIndicator !== undefined) updated.externalModuleIndicator = node.externalModuleIndicator;
+            if (node.commonJsModuleIndicator !== undefined) updated.commonJsModuleIndicator = node.commonJsModuleIndicator;
+            if (node.identifiers !== undefined) updated.identifiers = node.identifiers;
+            if (node.nodeCount !== undefined) updated.nodeCount = node.nodeCount;
+            if (node.identifierCount !== undefined) updated.identifierCount = node.identifierCount;
+            if (node.symbolCount !== undefined) updated.symbolCount = node.symbolCount;
+            if (node.parseDiagnostics !== undefined) updated.parseDiagnostics = node.parseDiagnostics;
+            if (node.bindDiagnostics !== undefined) updated.bindDiagnostics = node.bindDiagnostics;
+            if (node.lineMap !== undefined) updated.lineMap = node.lineMap;
+            if (node.classifiableNames !== undefined) updated.classifiableNames = node.classifiableNames;
+            if (node.resolvedModules !== undefined) updated.resolvedModules = node.resolvedModules;
+            if (node.resolvedTypeReferenceDirectiveNames !== undefined) updated.resolvedTypeReferenceDirectiveNames = node.resolvedTypeReferenceDirectiveNames;
+            if (node.imports !== undefined) updated.imports = node.imports;
+            if (node.moduleAugmentations !== undefined) updated.moduleAugmentations = node.moduleAugmentations;
+            if (node.externalHelpersModuleName !== undefined) updated.externalHelpersModuleName = node.externalHelpersModuleName;
+            return updateNode(updated, node);
+        }
+
+        return node;
+    }
+
+    // Transformation nodes
+
+    /**
+     * Creates a synthetic statement to act as a placeholder for a not-emitted statement in
+     * order to preserve comments.
+     *
+     * @param original The original statement.
+     */
+    export function createNotEmittedStatement(original: Node) {
+        const node = <NotEmittedStatement>createNode(SyntaxKind.NotEmittedStatement, /*location*/ original);
+        node.original = original;
+        return node;
+    }
+
+    /**
+     * Creates a synthetic expression to act as a placeholder for a not-emitted expression in
+     * order to preserve comments or sourcemap positions.
+     *
+     * @param expression The inner expression to emit.
+     * @param original The original outer expression.
+     * @param location The location for the expression. Defaults to the positions from "original" if provided.
+     */
+    export function createPartiallyEmittedExpression(expression: Expression, original?: Node, location?: TextRange) {
+        const node = <PartiallyEmittedExpression>createNode(SyntaxKind.PartiallyEmittedExpression, /*location*/ location || original);
+        node.expression = expression;
+        node.original = original;
+        return node;
+    }
+
+    export function updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createPartiallyEmittedExpression(expression, node.original, node), node);
+        }
+        return node;
+    }
+
+    // Compound nodes
+
+    export function createComma(left: Expression, right: Expression) {
+        return <Expression>createBinary(left, SyntaxKind.CommaToken, right);
+    }
+
+    export function createLessThan(left: Expression, right: Expression, location?: TextRange) {
+        return <Expression>createBinary(left, SyntaxKind.LessThanToken, right, location);
+    }
+
+    export function createAssignment(left: Expression, right: Expression, location?: TextRange) {
+        return createBinary(left, SyntaxKind.EqualsToken, right, location);
+    }
+
+    export function createStrictEquality(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.EqualsEqualsEqualsToken, right);
+    }
+
+    export function createStrictInequality(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.ExclamationEqualsEqualsToken, right);
+    }
+
+    export function createAdd(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.PlusToken, right);
+    }
+
+    export function createSubtract(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.MinusToken, right);
+    }
+
+    export function createPostfixIncrement(operand: Expression, location?: TextRange) {
+        return createPostfix(operand, SyntaxKind.PlusPlusToken, location);
+    }
+
+    export function createLogicalAnd(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.AmpersandAmpersandToken, right);
+    }
+
+    export function createLogicalOr(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.BarBarToken, right);
+    }
+
+    export function createLogicalNot(operand: Expression) {
+        return createPrefix(SyntaxKind.ExclamationToken, operand);
+    }
+
+    export function createVoidZero() {
+        return createVoid(createLiteral(0));
+    }
+
+    export function createMemberAccessForPropertyName(target: Expression, memberName: PropertyName, location?: TextRange): MemberExpression {
+        if (isComputedPropertyName(memberName)) {
+             return createElementAccess(target, memberName.expression, location);
+        }
+        else {
+            const expression = isIdentifier(memberName) ? createPropertyAccess(target, memberName, location) : createElementAccess(target, memberName, location);
+            expression.emitFlags |= NodeEmitFlags.NoNestedSourceMaps;
+            return expression;
+        }
+    }
+
+    export function createRestParameter(name: string | Identifier) {
+        return createParameterDeclaration(
+            /*decorators*/ undefined,
+            /*modifiers*/ undefined,
+            createSynthesizedNode(SyntaxKind.DotDotDotToken),
+            name,
+            /*questionToken*/ undefined,
+            /*type*/ undefined,
+            /*initializer*/ undefined
+        );
+    }
+
+    export function createFunctionCall(func: Expression, thisArg: Expression, argumentsList: Expression[], location?: TextRange) {
+        return createCall(
+            createPropertyAccess(func, "call"),
+            /*typeArguments*/ undefined,
+            [
+                thisArg,
+                ...argumentsList
+            ],
+            location
+        );
+    }
+
+    export function createFunctionApply(func: Expression, thisArg: Expression, argumentsExpression: Expression, location?: TextRange) {
+        return createCall(
+            createPropertyAccess(func, "apply"),
+            /*typeArguments*/ undefined,
+            [
+                thisArg,
+                argumentsExpression
+            ],
+            location
+        );
+    }
+
+    export function createArraySlice(array: Expression, start?: number | Expression) {
+        const argumentsList: Expression[] = [];
+        if (start !== undefined) {
+            argumentsList.push(typeof start === "number" ? createLiteral(start) : start);
+        }
+
+        return createCall(createPropertyAccess(array, "slice"), /*typeArguments*/ undefined, argumentsList);
+    }
+
+    export function createArrayConcat(array: Expression, values: Expression[]) {
+        return createCall(
+            createPropertyAccess(array, "concat"),
+            /*typeArguments*/ undefined,
+            values
+        );
+    }
+
+    export function createMathPow(left: Expression, right: Expression, location?: TextRange) {
+        return createCall(
+            createPropertyAccess(createIdentifier("Math"), "pow"),
+            /*typeArguments*/ undefined,
+            [left, right],
+            location
+        );
+    }
+
+    function createReactNamespace(reactNamespace: string, parent: JsxOpeningLikeElement) {
+        // To ensure the emit resolver can properly resolve the namespace, we need to
+        // treat this identifier as if it were a source tree node by clearing the `Synthesized`
+        // flag and setting a parent node.
+        const react = createIdentifier(reactNamespace || "React");
+        react.flags &= ~NodeFlags.Synthesized;
+        react.parent = parent;
+        return react;
+    }
+
+    export function createReactCreateElement(reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
+        const argumentsList = [tagName];
+        if (props) {
+            argumentsList.push(props);
+        }
+
+        if (children && children.length > 0) {
+            if (!props) {
+                argumentsList.push(createNull());
+            }
+
+            if (children.length > 1) {
+                for (const child of children) {
+                    child.startsOnNewLine = true;
+                    argumentsList.push(child);
+                }
+            }
+            else {
+                argumentsList.push(children[0]);
+            }
+        }
+
+        return createCall(
+            createPropertyAccess(
+                createReactNamespace(reactNamespace, parentElement),
+                "createElement"
+            ),
+            /*typeArguments*/ undefined,
+            argumentsList,
+            location
+        );
+    }
+
+    export function createLetDeclarationList(declarations: VariableDeclaration[], location?: TextRange) {
+        return createVariableDeclarationList(declarations, location, NodeFlags.Let);
+    }
+
+    export function createConstDeclarationList(declarations: VariableDeclaration[], location?: TextRange) {
+        return createVariableDeclarationList(declarations, location, NodeFlags.Const);
+    }
+
+    // Helpers
+
+    export function createHelperName(externalHelpersModuleName: Identifier | undefined, name: string) {
+        return externalHelpersModuleName
+            ? createPropertyAccess(externalHelpersModuleName, name)
+            : createIdentifier(name);
+    }
+
+    export function createExtendsHelper(externalHelpersModuleName: Identifier | undefined, name: Identifier) {
+        return createCall(
+            createHelperName(externalHelpersModuleName, "__extends"),
+            /*typeArguments*/ undefined,
+            [
+                name,
+                createIdentifier("_super")
+            ]
+        );
+    }
+
+    export function createAssignHelper(externalHelpersModuleName: Identifier | undefined, attributesSegments: Expression[]) {
+        return createCall(
+            createHelperName(externalHelpersModuleName, "__assign"),
+            /*typeArguments*/ undefined,
+            attributesSegments
+        );
+    }
+
+    export function createParamHelper(externalHelpersModuleName: Identifier | undefined, expression: Expression, parameterOffset: number, location?: TextRange) {
+        return createCall(
+            createHelperName(externalHelpersModuleName, "__param"),
+            /*typeArguments*/ undefined,
+            [
+                createLiteral(parameterOffset),
+                expression
+            ],
+            location
+        );
+    }
+
+    export function createMetadataHelper(externalHelpersModuleName: Identifier | undefined, metadataKey: string, metadataValue: Expression) {
+        return createCall(
+            createHelperName(externalHelpersModuleName, "__metadata"),
+            /*typeArguments*/ undefined,
+            [
+                createLiteral(metadataKey),
+                metadataValue
+            ]
+        );
+    }
+
+    export function createDecorateHelper(externalHelpersModuleName: Identifier | undefined, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
+        const argumentsArray: Expression[] = [];
+        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
+        argumentsArray.push(target);
+        if (memberName) {
+            argumentsArray.push(memberName);
+            if (descriptor) {
+                argumentsArray.push(descriptor);
+            }
+        }
+
+        return createCall(createHelperName(externalHelpersModuleName, "__decorate"), /*typeArguments*/ undefined, argumentsArray, location);
+    }
+
+    export function createAwaiterHelper(externalHelpersModuleName: Identifier | undefined, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block) {
+        const generatorFunc = createFunctionExpression(
+            createNode(SyntaxKind.AsteriskToken),
+            /*name*/ undefined,
+            /*typeParameters*/ undefined,
+            /*parameters*/ [],
+            /*type*/ undefined,
+            body
+        );
+
+        // Mark this node as originally an async function
+        generatorFunc.emitFlags |= NodeEmitFlags.AsyncFunctionBody;
+
+        return createCall(
+            createHelperName(externalHelpersModuleName, "__awaiter"),
+            /*typeArguments*/ undefined,
+            [
+                createThis(),
+                hasLexicalArguments ? createIdentifier("arguments") : createVoidZero(),
+                promiseConstructor ? createExpressionFromEntityName(promiseConstructor) : createVoidZero(),
+                generatorFunc
+            ]
+        );
+    }
+
+    export function createHasOwnProperty(target: LeftHandSideExpression, propertyName: Expression) {
+        return createCall(
+            createPropertyAccess(target, "hasOwnProperty"),
+            /*typeArguments*/ undefined,
+            [propertyName]
+        );
+    }
+
+    function createObjectCreate(prototype: Expression) {
+        return createCall(
+            createPropertyAccess(createIdentifier("Object"), "create"),
+            /*typeArguments*/ undefined,
+            [prototype]
+        );
+    }
+
+    function createGeti(target: LeftHandSideExpression) {
+        // name => super[name]
+        return createArrowFunction(
+            /*modifiers*/ undefined,
+            /*typeParameters*/ undefined,
+            [createParameter("name")],
+            /*type*/ undefined,
+            /*equalsGreaterThanToken*/ undefined,
+            createElementAccess(
+                target,
+                createIdentifier("name")
+            )
+        );
+    }
+
+    function createSeti(target: LeftHandSideExpression) {
+        // (name, value) => super[name] = value
+        return createArrowFunction(
+            /*modifiers*/ undefined,
+            /*typeParameters*/ undefined,
+            [
+                createParameter("name"),
+                createParameter("value")
+            ],
+            /*type*/ undefined,
+            /*equalsGreaterThanToken*/ undefined,
+            createAssignment(
+                createElementAccess(
+                    target,
+                    createIdentifier("name")
+                ),
+                createIdentifier("value")
+            )
+        );
+    }
+
+    export function createAdvancedAsyncSuperHelper() {
+        //  const _super = (function (geti, seti) {
+        //      const cache = Object.create(null);
+        //      return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
+        //  })(name => super[name], (name, value) => super[name] = value);
+
+        // const cache = Object.create(null);
+        const createCache = createVariableStatement(
+            /*modifiers*/ undefined,
+            createConstDeclarationList([
+                createVariableDeclaration(
+                    "cache",
+                    /*type*/ undefined,
+                    createObjectCreate(createNull())
+                )
+            ])
+        );
+
+        // get value() { return geti(name); }
+        const getter = createGetAccessor(
+            /*decorators*/ undefined,
+            /*modifiers*/ undefined,
+            "value",
+            /*parameters*/ [],
+            /*type*/ undefined,
+            createBlock([
+                createReturn(
+                    createCall(
+                        createIdentifier("geti"),
+                        /*typeArguments*/ undefined,
+                        [createIdentifier("name")]
+                    )
+                )
+            ])
+        );
+
+        // set value(v) { seti(name, v); }
+        const setter = createSetAccessor(
+            /*decorators*/ undefined,
+            /*modifiers*/ undefined,
+            "value",
+            [createParameter("v")],
+            createBlock([
+                createStatement(
+                    createCall(
+                        createIdentifier("seti"),
+                        /*typeArguments*/ undefined,
+                        [
+                            createIdentifier("name"),
+                            createIdentifier("v")
+                        ]
+                    )
+                )
+            ])
+        );
+
+        // return name => cache[name] || ...
+        const getOrCreateAccessorsForName = createReturn(
+            createArrowFunction(
+                /*modifiers*/ undefined,
+                /*typeParameters*/ undefined,
+                [createParameter("name")],
+                /*type*/ undefined,
+                /*equalsGreaterThanToken*/ undefined,
+                createLogicalOr(
+                    createElementAccess(
+                        createIdentifier("cache"),
+                        createIdentifier("name")
+                    ),
+                    createParen(
+                        createAssignment(
+                            createElementAccess(
+                                createIdentifier("cache"),
+                                createIdentifier("name")
+                            ),
+                            createObjectLiteral([
+                                getter,
+                                setter
+                            ])
+                        )
+                    )
+                )
+            )
+        );
+
+        //  const _super = (function (geti, seti) {
+        //      const cache = Object.create(null);
+        //      return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
+        //  })(name => super[name], (name, value) => super[name] = value);
+        return createVariableStatement(
+            /*modifiers*/ undefined,
+            createConstDeclarationList([
+                createVariableDeclaration(
+                    "_super",
+                    /*type*/ undefined,
+                    createCall(
+                        createParen(
+                            createFunctionExpression(
+                                /*asteriskToken*/ undefined,
+                                /*name*/ undefined,
+                                /*typeParameters*/ undefined,
+                                [
+                                    createParameter("geti"),
+                                    createParameter("seti")
+                                ],
+                                /*type*/ undefined,
+                                createBlock([
+                                    createCache,
+                                    getOrCreateAccessorsForName
+                                ])
+                            )
+                        ),
+                        /*typeArguments*/ undefined,
+                        [
+                            createGeti(createSuper()),
+                            createSeti(createSuper())
+                        ]
+                    )
+                )
+            ])
+        );
+    }
+
+    export function createSimpleAsyncSuperHelper() {
+        return createVariableStatement(
+            /*modifiers*/ undefined,
+            createConstDeclarationList([
+                createVariableDeclaration(
+                    "_super",
+                    /*type*/ undefined,
+                    createGeti(createSuper())
+                )
+            ])
+        );
+    }
+
+    export interface CallBinding {
+        target: LeftHandSideExpression;
+        thisArg: Expression;
+    }
+
+    function shouldBeCapturedInTempVariable(node: Expression, cacheIdentifiers: boolean): boolean {
+        const target = skipParentheses(node);
+        switch (target.kind) {
+            case SyntaxKind.Identifier:
+                return cacheIdentifiers;
+            case SyntaxKind.ThisKeyword:
+            case SyntaxKind.NumericLiteral:
+            case SyntaxKind.StringLiteral:
+                return false;
+            case SyntaxKind.ArrayLiteralExpression:
+                const elements = (<ArrayLiteralExpression>target).elements;
+                if (elements.length === 0) {
+                    return false;
+                }
+                return true;
+            case SyntaxKind.ObjectLiteralExpression:
+                return (<ObjectLiteralExpression>target).properties.length > 0;
+            default:
+                return true;
+        }
+    }
+
+    export function createCallBinding(expression: Expression, recordTempVariable: (temp: Identifier) => void, languageVersion?: ScriptTarget, cacheIdentifiers?: boolean): CallBinding {
+        const callee = skipOuterExpressions(expression, OuterExpressionKinds.All);
+        let thisArg: Expression;
+        let target: LeftHandSideExpression;
+        if (isSuperProperty(callee)) {
+            thisArg = createThis();
+            target = callee;
+        }
+        else if (callee.kind === SyntaxKind.SuperKeyword) {
+            thisArg = createThis();
+            target = languageVersion < ScriptTarget.ES6 ? createIdentifier("_super", /*location*/ callee) : <PrimaryExpression>callee;
+        }
+        else {
+            switch (callee.kind) {
+                case SyntaxKind.PropertyAccessExpression: {
+                    if (shouldBeCapturedInTempVariable((<PropertyAccessExpression>callee).expression, cacheIdentifiers)) {
+                        // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
+                        thisArg = createTempVariable(recordTempVariable);
+                        target = createPropertyAccess(
+                            createAssignment(
+                                thisArg,
+                                (<PropertyAccessExpression>callee).expression,
+                                /*location*/ (<PropertyAccessExpression>callee).expression
+                            ),
+                            (<PropertyAccessExpression>callee).name,
+                            /*location*/ callee
+                        );
+                    }
+                    else {
+                        thisArg = (<PropertyAccessExpression>callee).expression;
+                        target = <PropertyAccessExpression>callee;
+                    }
+                    break;
+                }
+
+                case SyntaxKind.ElementAccessExpression: {
+                    if (shouldBeCapturedInTempVariable((<ElementAccessExpression>callee).expression, cacheIdentifiers)) {
+                        // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
+                        thisArg = createTempVariable(recordTempVariable);
+                        target = createElementAccess(
+                            createAssignment(
+                                thisArg,
+                                (<ElementAccessExpression>callee).expression,
+                                /*location*/ (<ElementAccessExpression>callee).expression
+                            ),
+                            (<ElementAccessExpression>callee).argumentExpression,
+                            /*location*/ callee
+                        );
+                    }
+                    else {
+                        thisArg = (<ElementAccessExpression>callee).expression;
+                        target = <ElementAccessExpression>callee;
+                    }
+
+                    break;
+                }
+
+                default: {
+                    // for `a()` target is `a` and thisArg is `void 0`
+                    thisArg = createVoidZero();
+                    target = parenthesizeForAccess(expression);
+                    break;
+                }
+            }
+        }
+
+        return { target, thisArg };
+    }
+
+    export function inlineExpressions(expressions: Expression[]) {
+        return reduceLeft(expressions, createComma);
+    }
+
+    export function createExpressionFromEntityName(node: EntityName | Expression): Expression {
+        if (isQualifiedName(node)) {
+            const left = createExpressionFromEntityName(node.left);
+            const right = getMutableClone(node.right);
+            return createPropertyAccess(left, right, /*location*/ node);
+        }
+        else {
+            return getMutableClone(node);
+        }
+    }
+
+    export function createExpressionForPropertyName(memberName: PropertyName): Expression {
+        if (isIdentifier(memberName)) {
+            return createLiteral(memberName, /*location*/ undefined);
+        }
+        else if (isComputedPropertyName(memberName)) {
+            return getMutableClone(memberName.expression);
+        }
+        else {
+            return getMutableClone(memberName);
+        }
+    }
+
+    export function createExpressionForObjectLiteralElement(node: ObjectLiteralExpression, property: ObjectLiteralElement, receiver: Expression): Expression {
+        switch (property.kind) {
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+                return createExpressionForAccessorDeclaration(node.properties, <AccessorDeclaration>property, receiver, node.multiLine);
+            case SyntaxKind.PropertyAssignment:
+                return createExpressionForPropertyAssignment(<PropertyAssignment>property, receiver);
+            case SyntaxKind.ShorthandPropertyAssignment:
+                return createExpressionForShorthandPropertyAssignment(<ShorthandPropertyAssignment>property, receiver);
+            case SyntaxKind.MethodDeclaration:
+                return createExpressionForMethodDeclaration(<MethodDeclaration>property, receiver);
+        }
+    }
+
+    function createExpressionForAccessorDeclaration(properties: NodeArray<Declaration>, property: AccessorDeclaration, receiver: Expression, multiLine: boolean) {
+        const { firstAccessor, getAccessor, setAccessor } = getAllAccessorDeclarations(properties, property);
+        if (property === firstAccessor) {
+            const properties: ObjectLiteralElement[] = [];
+            if (getAccessor) {
+                const getterFunction = createFunctionExpression(
+                    /*asteriskToken*/ undefined,
+                    /*name*/ undefined,
+                    /*typeParameters*/ undefined,
+                    getAccessor.parameters,
+                    /*type*/ undefined,
+                    getAccessor.body,
+                    /*location*/ getAccessor
+                );
+                setOriginalNode(getterFunction, getAccessor);
+                const getter = createPropertyAssignment("get", getterFunction);
+                properties.push(getter);
+            }
+
+            if (setAccessor) {
+                const setterFunction = createFunctionExpression(
+                    /*asteriskToken*/ undefined,
+                    /*name*/ undefined,
+                    /*typeParameters*/ undefined,
+                    setAccessor.parameters,
+                    /*type*/ undefined,
+                    setAccessor.body,
+                    /*location*/ setAccessor
+                );
+                setOriginalNode(setterFunction, setAccessor);
+                const setter = createPropertyAssignment("set", setterFunction);
+                properties.push(setter);
+            }
+
+            properties.push(createPropertyAssignment("enumerable", createLiteral(true)));
+            properties.push(createPropertyAssignment("configurable", createLiteral(true)));
+
+            const expression = createCall(
+                createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                /*typeArguments*/ undefined,
+                [
+                    receiver,
+                    createExpressionForPropertyName(property.name),
+                    createObjectLiteral(properties, /*location*/ undefined, multiLine)
+                ],
+                /*location*/ firstAccessor
+            );
+
+            return aggregateTransformFlags(expression);
+        }
+
+        return undefined;
+    }
+
+    function createExpressionForPropertyAssignment(property: PropertyAssignment, receiver: Expression) {
+        return aggregateTransformFlags(
+            setOriginalNode(
+                createAssignment(
+                    createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name),
+                    property.initializer,
+                    /*location*/ property
+                ),
+                /*original*/ property
+            )
+        );
+    }
+
+    function createExpressionForShorthandPropertyAssignment(property: ShorthandPropertyAssignment, receiver: Expression) {
+        return aggregateTransformFlags(
+            setOriginalNode(
+                createAssignment(
+                    createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name),
+                    getSynthesizedClone(property.name),
+                    /*location*/ property
+                ),
+                /*original*/ property
+            )
+        );
+    }
+
+    function createExpressionForMethodDeclaration(method: MethodDeclaration, receiver: Expression) {
+        return aggregateTransformFlags(
+            setOriginalNode(
+                createAssignment(
+                    createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name),
+                    setOriginalNode(
+                        createFunctionExpression(
+                            method.asteriskToken,
+                            /*name*/ undefined,
+                            /*typeParameters*/ undefined,
+                            method.parameters,
+                            /*type*/ undefined,
+                            method.body,
+                            /*location*/ method
+                        ),
+                        /*original*/ method
+                    ),
+                    /*location*/ method
+                ),
+                /*original*/ method
+            )
+        );
+    }
+
+    // Utilities
+
+    function isUseStrictPrologue(node: ExpressionStatement): boolean {
+        return (node.expression as StringLiteral).text === "use strict";
+    }
+
+    /**
+     * Add any necessary prologue-directives into target statement-array.
+     * The function needs to be called during each transformation step.
+     * This function needs to be called whenever we transform the statement
+     * list of a source file, namespace, or function-like body.
+     *
+     * @param target: result statements array
+     * @param source: origin statements array
+     * @param ensureUseStrict: boolean determining whether the function need to add prologue-directives
+     * @param visitor: Optional callback used to visit any custom prologue directives.
+     */
+    export function addPrologueDirectives(target: Statement[], source: Statement[], ensureUseStrict?: boolean, visitor?: (node: Node) => VisitResult<Node>): number {
+        Debug.assert(target.length === 0, "PrologueDirectives should be at the first statement in the target statements array");
+        let foundUseStrict = false;
+        let statementOffset = 0;
+        const numStatements = source.length;
+        while (statementOffset < numStatements) {
+            const statement = source[statementOffset];
+            if (isPrologueDirective(statement)) {
+                if (isUseStrictPrologue(statement as ExpressionStatement)) {
+                    foundUseStrict = true;
+                }
+                target.push(statement);
+            }
+            else {
+                if (ensureUseStrict && !foundUseStrict) {
+                    target.push(startOnNewLine(createStatement(createLiteral("use strict"))));
+                    foundUseStrict = true;
+                }
+                if (statement.emitFlags & NodeEmitFlags.CustomPrologue) {
+                    target.push(visitor ? visitNode(statement, visitor, isStatement) : statement);
+                }
+                else {
+                    break;
+                }
+            }
+            statementOffset++;
+        }
+        return statementOffset;
+    }
+
+    /**
+     * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
+     * order of operations.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    export function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand?: Expression) {
+        const skipped = skipPartiallyEmittedExpressions(operand);
+
+        // If the resulting expression is already parenthesized, we do not need to do any further processing.
+        if (skipped.kind === SyntaxKind.ParenthesizedExpression) {
+            return operand;
+        }
+
+        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
+            ? createParen(operand)
+            : operand;
+    }
+
+    /**
+     * Determines whether the operand to a BinaryExpression needs to be parenthesized.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand: Expression) {
+        // If the operand has lower precedence, then it needs to be parenthesized to preserve the
+        // intent of the expression. For example, if the operand is `a + b` and the operator is
+        // `*`, then we need to parenthesize the operand to preserve the intended order of
+        // operations: `(a + b) * x`.
+        //
+        // If the operand has higher precedence, then it does not need to be parenthesized. For
+        // example, if the operand is `a * b` and the operator is `+`, then we do not need to
+        // parenthesize to preserve the intended order of operations: `a * b + x`.
+        //
+        // If the operand has the same precedence, then we need to check the associativity of
+        // the operator based on whether this is the left or right operand of the expression.
+        //
+        // For example, if `a / d` is on the right of operator `*`, we need to parenthesize
+        // to preserve the intended order of operations: `x * (a / d)`
+        //
+        // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
+        // the intended order of operations: `(a ** b) ** c`
+        const binaryOperatorPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, binaryOperator);
+        const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
+        const emittedOperand = skipPartiallyEmittedExpressions(operand);
+        const operandPrecedence = getExpressionPrecedence(emittedOperand);
+        switch (compareValues(operandPrecedence, binaryOperatorPrecedence)) {
+            case Comparison.LessThan:
+                // If the operand is the right side of a right-associative binary operation
+                // and is a yield expression, then we do not need parentheses.
+                if (!isLeftSideOfBinary
+                    && binaryOperatorAssociativity === Associativity.Right
+                    && operand.kind === SyntaxKind.YieldExpression) {
+                    return false;
+                }
+
+                return true;
+
+            case Comparison.GreaterThan:
+                return false;
+
+            case Comparison.EqualTo:
+                if (isLeftSideOfBinary) {
+                    // No need to parenthesize the left operand when the binary operator is
+                    // left associative:
+                    //  (a*b)/x    ->  a*b/x
+                    //  (a**b)/x   ->  a**b/x
+                    //
+                    // Parentheses are needed for the left operand when the binary operator is
+                    // right associative:
+                    //  (a/b)**x   ->  (a/b)**x
+                    //  (a**b)**x  ->  (a**b)**x
+                    return binaryOperatorAssociativity === Associativity.Right;
+                }
+                else {
+                    if (isBinaryExpression(emittedOperand)
+                        && emittedOperand.operatorToken.kind === binaryOperator) {
+                        // No need to parenthesize the right operand when the binary operator and
+                        // operand are the same and one of the following:
+                        //  x*(a*b)     => x*a*b
+                        //  x|(a|b)     => x|a|b
+                        //  x&(a&b)     => x&a&b
+                        //  x^(a^b)     => x^a^b
+                        if (operatorHasAssociativeProperty(binaryOperator)) {
+                            return false;
+                        }
+
+                        // No need to parenthesize the right operand when the binary operator
+                        // is plus (+) if both the left and right operands consist solely of either
+                        // literals of the same kind or binary plus (+) expressions for literals of
+                        // the same kind (recursively).
+                        //  "a"+(1+2)       => "a"+(1+2)
+                        //  "a"+("b"+"c")   => "a"+"b"+"c"
+                        if (binaryOperator === SyntaxKind.PlusToken) {
+                            const leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : SyntaxKind.Unknown;
+                            if (isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) {
+                                return false;
+                            }
+                        }
+                    }
+
+                    // No need to parenthesize the right operand when the operand is right
+                    // associative:
+                    //  x/(a**b)    -> x/a**b
+                    //  x**(a**b)   -> x**a**b
+                    //
+                    // Parentheses are needed for the right operand when the operand is left
+                    // associative:
+                    //  x/(a*b)     -> x/(a*b)
+                    //  x**(a/b)    -> x**(a/b)
+                    const operandAssociativity = getExpressionAssociativity(emittedOperand);
+                    return operandAssociativity === Associativity.Left;
+                }
+        }
+    }
+
+    /**
+     * Determines whether a binary operator is mathematically associative.
+     *
+     * @param binaryOperator The binary operator.
+     */
+    function operatorHasAssociativeProperty(binaryOperator: SyntaxKind) {
+        // The following operators are associative in JavaScript:
+        //  (a*b)*c     -> a*(b*c)  -> a*b*c
+        //  (a|b)|c     -> a|(b|c)  -> a|b|c
+        //  (a&b)&c     -> a&(b&c)  -> a&b&c
+        //  (a^b)^c     -> a^(b^c)  -> a^b^c
+        //
+        // While addition is associative in mathematics, JavaScript's `+` is not
+        // guaranteed to be associative as it is overloaded with string concatenation.
+        return binaryOperator === SyntaxKind.AsteriskToken
+            || binaryOperator === SyntaxKind.BarToken
+            || binaryOperator === SyntaxKind.AmpersandToken
+            || binaryOperator === SyntaxKind.CaretToken;
+    }
+
+    interface BinaryPlusExpression extends BinaryExpression {
+        cachedLiteralKind: SyntaxKind;
+    }
+
+    /**
+     * This function determines whether an expression consists of a homogeneous set of
+     * literal expressions or binary plus expressions that all share the same literal kind.
+     * It is used to determine whether the right-hand operand of a binary plus expression can be
+     * emitted without parentheses.
+     */
+    function getLiteralKindOfBinaryPlusOperand(node: Expression): SyntaxKind {
+        node = skipPartiallyEmittedExpressions(node);
+
+        if (isLiteralKind(node.kind)) {
+            return node.kind;
+        }
+
+        if (node.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>node).operatorToken.kind === SyntaxKind.PlusToken) {
+            if ((<BinaryPlusExpression>node).cachedLiteralKind !== undefined) {
+                return (<BinaryPlusExpression>node).cachedLiteralKind;
+            }
+
+            const leftKind = getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).left);
+            const literalKind = isLiteralKind(leftKind)
+                && leftKind === getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).right)
+                    ? leftKind
+                    : SyntaxKind.Unknown;
+
+            (<BinaryPlusExpression>node).cachedLiteralKind = literalKind;
+            return literalKind;
+        }
+
+        return SyntaxKind.Unknown;
+    }
+
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression
+     * as the expression of a NewExpression node.
+     *
+     * @param expression The Expression node.
+     */
+    export function parenthesizeForNew(expression: Expression): LeftHandSideExpression {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        switch (emittedExpression.kind) {
+            case SyntaxKind.CallExpression:
+                return createParen(expression);
+
+            case SyntaxKind.NewExpression:
+                return (<NewExpression>emittedExpression).arguments
+                    ? <LeftHandSideExpression>expression
+                    : createParen(expression);
+        }
+
+        return parenthesizeForAccess(expression);
+    }
+
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression for
+     * property or element access.
+     *
+     * @param expr The expression node.
+     */
+    export function parenthesizeForAccess(expression: Expression): LeftHandSideExpression {
+        // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
+        // to parenthesize the expression before a dot. The known exceptions are:
+        //
+        //    NewExpression:
+        //       new C.x        -> not the same as (new C).x
+        //    NumericLiteral
+        //       1.x            -> not the same as (1).x
+        //
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isLeftHandSideExpression(emittedExpression)
+            && (emittedExpression.kind !== SyntaxKind.NewExpression || (<NewExpression>emittedExpression).arguments)
+            && emittedExpression.kind !== SyntaxKind.NumericLiteral) {
+            return <LeftHandSideExpression>expression;
+        }
+
+        return createParen(expression, /*location*/ expression);
+    }
+
+    export function parenthesizePostfixOperand(operand: Expression) {
+        return isLeftHandSideExpression(operand)
+            ? <LeftHandSideExpression>operand
+            : createParen(operand, /*location*/ operand);
+    }
+
+    export function parenthesizePrefixOperand(operand: Expression) {
+        return isUnaryExpression(operand)
+            ? <UnaryExpression>operand
+            : createParen(operand, /*location*/ operand);
+    }
+
+    function parenthesizeListElements(elements: NodeArray<Expression>) {
+        let result: Expression[];
+        for (let i = 0; i < elements.length; i++) {
+            const element = parenthesizeExpressionForList(elements[i]);
+            if (result !== undefined || element !== elements[i]) {
+                if (result === undefined) {
+                    result = elements.slice(0, i);
+                }
+
+                result.push(element);
+            }
+        }
+
+        if (result !== undefined) {
+            return createNodeArray(result, elements, elements.hasTrailingComma);
+        }
+
+        return elements;
+    }
+
+    export function parenthesizeExpressionForList(expression: Expression) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        const expressionPrecedence = getExpressionPrecedence(emittedExpression);
+        const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
+        return expressionPrecedence > commaPrecedence
+            ? expression
+            : createParen(expression, /*location*/ expression);
+    }
+
+    export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isCallExpression(emittedExpression)) {
+            const callee = emittedExpression.expression;
+            const kind = skipPartiallyEmittedExpressions(callee).kind;
+            if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) {
+                const mutableCall = getMutableClone(emittedExpression);
+                mutableCall.expression = createParen(callee, /*location*/ callee);
+                return recreatePartiallyEmittedExpressions(expression, mutableCall);
+            }
+        }
+        else {
+            const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
+            if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
+                return createParen(expression, /*location*/ expression);
+            }
+        }
+
+        return expression;
+    }
+
+    /**
+     * Clones a series of not-emitted expressions with a new inner expression.
+     *
+     * @param originalOuterExpression The original outer expression.
+     * @param newInnerExpression The new inner expression.
+     */
+    function recreatePartiallyEmittedExpressions(originalOuterExpression: Expression, newInnerExpression: Expression) {
+        if (isPartiallyEmittedExpression(originalOuterExpression)) {
+            const clone = getMutableClone(originalOuterExpression);
+            clone.expression = recreatePartiallyEmittedExpressions(clone.expression, newInnerExpression);
+            return clone;
+        }
+
+        return newInnerExpression;
+    }
+
+    function getLeftmostExpression(node: Expression): Expression {
+        while (true) {
+            switch (node.kind) {
+                case SyntaxKind.PostfixUnaryExpression:
+                    node = (<PostfixUnaryExpression>node).operand;
+                    continue;
+
+                case SyntaxKind.BinaryExpression:
+                    node = (<BinaryExpression>node).left;
+                    continue;
+
+                case SyntaxKind.ConditionalExpression:
+                    node = (<ConditionalExpression>node).condition;
+                    continue;
+
+                case SyntaxKind.CallExpression:
+                case SyntaxKind.ElementAccessExpression:
+                case SyntaxKind.PropertyAccessExpression:
+                    node = (<CallExpression | PropertyAccessExpression | ElementAccessExpression>node).expression;
+                    continue;
+
+                case SyntaxKind.PartiallyEmittedExpression:
+                    node = (<PartiallyEmittedExpression>node).expression;
+                    continue;
+            }
+
+            return node;
+        }
+    }
+
+    export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
+        const emittedBody = skipPartiallyEmittedExpressions(body);
+        if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) {
+            return createParen(<Expression>body, /*location*/ body);
+        }
+
+        return body;
+    }
+
+    export const enum OuterExpressionKinds {
+        Parentheses = 1 << 0,
+        Assertions = 1 << 1,
+        PartiallyEmittedExpressions = 1 << 2,
+
+        All = Parentheses | Assertions | PartiallyEmittedExpressions
+    }
+
+    export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
+    export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node;
+    export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) {
+        let previousNode: Node;
+        do {
+            previousNode = node;
+            if (kinds & OuterExpressionKinds.Parentheses) {
+                node = skipParentheses(node);
+            }
+
+            if (kinds & OuterExpressionKinds.Assertions) {
+                node = skipAssertions(node);
+            }
+
+            if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) {
+                node = skipPartiallyEmittedExpressions(node);
+            }
+        }
+        while (previousNode !== node);
+
+        return node;
+    }
+
+    export function skipParentheses(node: Expression): Expression;
+    export function skipParentheses(node: Node): Node;
+    export function skipParentheses(node: Node): Node {
+        while (node.kind === SyntaxKind.ParenthesizedExpression) {
+            node = (<ParenthesizedExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function skipAssertions(node: Expression): Expression;
+    export function skipAssertions(node: Node): Node;
+    export function skipAssertions(node: Node): Node {
+        while (isAssertionExpression(node)) {
+            node = (<AssertionExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function skipPartiallyEmittedExpressions(node: Expression): Expression;
+    export function skipPartiallyEmittedExpressions(node: Node): Node;
+    export function skipPartiallyEmittedExpressions(node: Node) {
+        while (node.kind === SyntaxKind.PartiallyEmittedExpression) {
+            node = (<PartiallyEmittedExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function startOnNewLine<T extends Node>(node: T): T {
+        node.startsOnNewLine = true;
+        return node;
+    }
+
+    export function setOriginalNode<T extends Node>(node: T, original: Node): T {
+        node.original = original;
+        if (original) {
+            const { emitFlags, commentRange, sourceMapRange } = original;
+            if (emitFlags) node.emitFlags = emitFlags;
+            if (commentRange) node.commentRange = commentRange;
+            if (sourceMapRange) node.sourceMapRange = sourceMapRange;
+        }
+        return node;
+    }
+
+    export function setTextRange<T extends TextRange>(node: T, location: TextRange): T {
+        if (location) {
+            node.pos = location.pos;
+            node.end = location.end;
+        }
+        return node;
+    }
+
+    export function setNodeFlags<T extends Node>(node: T, flags: NodeFlags): T {
+        node.flags = flags;
+        return node;
+    }
+
+    export function setMultiLine<T extends ObjectLiteralExpression | ArrayLiteralExpression | Block>(node: T, multiLine: boolean): T {
+        node.multiLine = multiLine;
+        return node;
+    }
+
+    export function setHasTrailingComma<T extends Node>(nodes: NodeArray<T>, hasTrailingComma: boolean): NodeArray<T> {
+        nodes.hasTrailingComma = hasTrailingComma;
+        return nodes;
+    }
+
+    /**
+     * Get the name of that target module from an import or export declaration
+     */
+    export function getLocalNameForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration, sourceFile: SourceFile): Identifier {
+        const namespaceDeclaration = getNamespaceDeclarationNode(node);
+        if (namespaceDeclaration && !isDefaultImport(node)) {
+            const name = namespaceDeclaration.name;
+            return isGeneratedIdentifier(name) ? name : createIdentifier(getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
+        }
+        if (node.kind === SyntaxKind.ImportDeclaration && (<ImportDeclaration>node).importClause) {
+            return getGeneratedNameForNode(node);
+        }
+        if (node.kind === SyntaxKind.ExportDeclaration && (<ExportDeclaration>node).moduleSpecifier) {
+            return getGeneratedNameForNode(node);
+        }
+        return undefined;
+    }
+
+   /**
+     * Get the name of a target module from an import/export declaration as should be written in the emitted output.
+     * The emitted output name can be different from the input if:
+     *  1. The module has a /// <amd-module name="<new name>" />
+     *  2. --out or --outFile is used, making the name relative to the rootDir
+     *  3- The containing SourceFile has an entry in renamedDependencies for the import as requested by some module loaders (e.g. System).
+     * Otherwise, a new StringLiteral node representing the module name will be returned.
+     */
+    export function getExternalModuleNameLiteral(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, compilerOptions: CompilerOptions) {
+        const moduleName = getExternalModuleName(importNode);
+        if (moduleName.kind === SyntaxKind.StringLiteral) {
+            return tryGetModuleNameFromDeclaration(importNode, host, resolver, compilerOptions)
+                || tryRenameExternalModule(<StringLiteral>moduleName, sourceFile)
+                || getSynthesizedClone(<StringLiteral>moduleName);
+        }
+
+        return undefined;
+    }
+
+    /**
+     * Some bundlers (SystemJS builder) sometimes want to rename dependencies.
+     * Here we check if alternative name was provided for a given moduleName and return it if possible.
+     */
+    function tryRenameExternalModule(moduleName: LiteralExpression, sourceFile: SourceFile) {
+        if (sourceFile.renamedDependencies && hasProperty(sourceFile.renamedDependencies, moduleName.text)) {
+            return createLiteral(sourceFile.renamedDependencies[moduleName.text]);
+        }
+        return undefined;
+    }
+
+    /**
+     * Get the name of a module as should be written in the emitted output.
+     * The emitted output name can be different from the input if:
+     *  1. The module has a /// <amd-module name="<new name>" />
+     *  2. --out or --outFile is used, making the name relative to the rootDir
+     * Otherwise, a new StringLiteral node representing the module name will be returned.
+     */
+    export function tryGetModuleNameFromFile(file: SourceFile, host: EmitHost, options: CompilerOptions): StringLiteral {
+        if (!file) {
+            return undefined;
+        }
+        if (file.moduleName) {
+            return createLiteral(file.moduleName);
+        }
+        if (!isDeclarationFile(file) && (options.out || options.outFile)) {
+            return createLiteral(getExternalModuleNameFromPath(host, file.fileName));
+        }
+        return undefined;
+    }
+
+    function tryGetModuleNameFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration, host: EmitHost, resolver: EmitResolver, compilerOptions: CompilerOptions) {
+        return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index b28f13e438f..ac43e0fb63c 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1,5 +1,6 @@
 /// <reference path="utilities.ts"/>
 /// <reference path="scanner.ts"/>
+/// <reference path="factory.ts"/>
 
 namespace ts {
     let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
@@ -417,6 +418,8 @@ namespace ts {
             case SyntaxKind.JSDocPropertyTag:
                 return visitNode(cbNode, (<JSDocPropertyTag>node).typeExpression) ||
                     visitNode(cbNode, (<JSDocPropertyTag>node).name);
+            case SyntaxKind.PartiallyEmittedExpression:
+                return visitNode(cbNode, (<PartiallyEmittedExpression>node).expression);
             case SyntaxKind.JSDocLiteralType:
                     return visitNode(cbNode, (<JSDocLiteralType>node).literal);
         }
@@ -1053,6 +1056,16 @@ namespace ts {
                     new TokenConstructor(kind, pos, pos);
         }
 
+        function createNodeArray<T extends Node>(elements?: T[], pos?: number): NodeArray<T> {
+            const array = <NodeArray<T>>(elements || []);
+            if (!(pos >= 0)) {
+                pos = getNodePos();
+            }
+            array.pos = pos;
+            array.end = pos;
+            return array;
+        }
+
         function finishNode<T extends Node>(node: T, end?: number): T {
             node.end = end === undefined ? scanner.getStartPos() : end;
 
@@ -1440,8 +1453,7 @@ namespace ts {
         function parseList<T extends Node>(kind: ParsingContext, parseElement: () => T): NodeArray<T> {
             const saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
-            const result = <NodeArray<T>>[];
-            result.pos = getNodePos();
+            const result = createNodeArray<T>();
 
             while (!isListTerminator(kind)) {
                 if (isListElement(kind, /*inErrorRecovery*/ false)) {
@@ -1788,8 +1800,7 @@ namespace ts {
         function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, considerSemicolonAsDelimiter?: boolean): NodeArray<T> {
             const saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
-            const result = <NodeArray<T>>[];
-            result.pos = getNodePos();
+            const result = createNodeArray<T>();
 
             let commaStart = -1; // Meaning the previous token was not a comma
             while (true) {
@@ -1844,12 +1855,8 @@ namespace ts {
             return result;
         }
 
-        function createMissingList<T>(): NodeArray<T> {
-            const pos = getNodePos();
-            const result = <NodeArray<T>>[];
-            result.pos = pos;
-            result.end = pos;
-            return result;
+        function createMissingList<T extends Node>(): NodeArray<T> {
+            return createNodeArray<T>();
         }
 
         function parseBracketedList<T extends Node>(kind: ParsingContext, parseElement: () => T, open: SyntaxKind, close: SyntaxKind): NodeArray<T> {
@@ -1914,8 +1921,7 @@ namespace ts {
             template.head = parseTemplateLiteralFragment();
             Debug.assert(template.head.kind === SyntaxKind.TemplateHead, "Template head has wrong token kind");
 
-            const templateSpans = <NodeArray<TemplateSpan>>[];
-            templateSpans.pos = getNodePos();
+            const templateSpans = createNodeArray<TemplateSpan>();
 
             do {
                 templateSpans.push(parseTemplateSpan());
@@ -2064,13 +2070,6 @@ namespace ts {
             return token() === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifierKind(token()) || token() === SyntaxKind.AtToken || token() === SyntaxKind.ThisKeyword;
         }
 
-        function setModifiers(node: Node, modifiers: ModifiersArray) {
-            if (modifiers) {
-                node.flags |= modifiers.flags;
-                node.modifiers = modifiers;
-            }
-        }
-
         function parseParameter(): ParameterDeclaration {
             const node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
             if (token() === SyntaxKind.ThisKeyword) {
@@ -2080,13 +2079,13 @@ namespace ts {
             }
 
             node.decorators = parseDecorators();
-            setModifiers(node, parseModifiers());
+            node.modifiers = parseModifiers();
             node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
 
             // FormalParameter [Yield,Await]:
             //      BindingElement[?Yield,?Await]
             node.name = parseIdentifierOrPattern();
-            if (getFullWidth(node.name) === 0 && node.flags === 0 && isModifierKind(token())) {
+            if (getFullWidth(node.name) === 0 && !hasModifiers(node) && isModifierKind(token())) {
                 // in cases like
                 // 'use strict'
                 // function foo(static)
@@ -2267,23 +2266,23 @@ namespace ts {
             return token() === SyntaxKind.ColonToken || token() === SyntaxKind.CommaToken || token() === SyntaxKind.CloseBracketToken;
         }
 
-        function parseIndexSignatureDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): IndexSignatureDeclaration {
+        function parseIndexSignatureDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): IndexSignatureDeclaration {
             const node = <IndexSignatureDeclaration>createNode(SyntaxKind.IndexSignature, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             node.parameters = parseBracketedList(ParsingContext.Parameters, parseParameter, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
             return finishNode(node);
         }
 
-        function parsePropertyOrMethodSignature(fullStart: number, modifiers: ModifiersArray): PropertySignature | MethodSignature {
+        function parsePropertyOrMethodSignature(fullStart: number, modifiers: NodeArray<Modifier>): PropertySignature | MethodSignature {
             const name = parsePropertyName();
             const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
 
             if (token() === SyntaxKind.OpenParenToken || token() === SyntaxKind.LessThanToken) {
                 const method = <MethodSignature>createNode(SyntaxKind.MethodSignature, fullStart);
-                setModifiers(method, modifiers);
+                method.modifiers = modifiers;
                 method.name = name;
                 method.questionToken = questionToken;
 
@@ -2295,7 +2294,7 @@ namespace ts {
             }
             else {
                 const property = <PropertySignature>createNode(SyntaxKind.PropertySignature, fullStart);
-                setModifiers(property, modifiers);
+                property.modifiers = modifiers;
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -2519,8 +2518,7 @@ namespace ts {
         function parseUnionOrIntersectionType(kind: SyntaxKind, parseConstituentType: () => TypeNode, operator: SyntaxKind): TypeNode {
             let type = parseConstituentType();
             if (token() === operator) {
-                const types = <NodeArray<TypeNode>>[type];
-                types.pos = type.pos;
+                const types = createNodeArray<TypeNode>([type], type.pos);
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
@@ -2874,13 +2872,13 @@ namespace ts {
             }
         }
 
-        function parseSimpleArrowFunctionExpression(identifier: Identifier, asyncModifier?: ModifiersArray): ArrowFunction {
+        function parseSimpleArrowFunctionExpression(identifier: Identifier, asyncModifier?: NodeArray<Modifier>): ArrowFunction {
             Debug.assert(token() === SyntaxKind.EqualsGreaterThanToken, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
 
             let node: ArrowFunction;
             if (asyncModifier) {
                 node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction, asyncModifier.pos);
-                setModifiers(node, asyncModifier);
+                node.modifiers = asyncModifier;
             }
             else {
                 node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction, identifier.pos);
@@ -2890,8 +2888,7 @@ namespace ts {
             parameter.name = identifier;
             finishNode(parameter);
 
-            node.parameters = <NodeArray<ParameterDeclaration>>[parameter];
-            node.parameters.pos = parameter.pos;
+            node.parameters = createNodeArray<ParameterDeclaration>([parameter], parameter.pos);
             node.parameters.end = parameter.end;
 
             node.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, /*reportAtCurrentPosition*/ false, Diagnostics._0_expected, "=>");
@@ -2920,7 +2917,7 @@ namespace ts {
                 return undefined;
             }
 
-            const isAsync = !!(arrowFunction.flags & NodeFlags.Async);
+            const isAsync = !!(getModifierFlags(arrowFunction) & ModifierFlags.Async);
 
             // If we have an arrow, then try to parse the body. Even if not, try to parse if we
             // have an opening brace, just in case we're in an error state.
@@ -3099,8 +3096,8 @@ namespace ts {
 
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity: boolean): ArrowFunction {
             const node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction);
-            setModifiers(node, parseModifiersForArrowFunction());
-            const isAsync = !!(node.flags & NodeFlags.Async);
+            node.modifiers = parseModifiersForArrowFunction();
+            const isAsync = !!(getModifierFlags(node) & ModifierFlags.Async);
 
             // Arrow functions are never generators.
             //
@@ -3729,8 +3726,7 @@ namespace ts {
         }
 
         function parseJsxChildren(openingTagName: LeftHandSideExpression): NodeArray<JsxChild> {
-            const result = <NodeArray<JsxChild>>[];
-            result.pos = scanner.getStartPos();
+            const result = createNodeArray<JsxChild>();
             const saveParsingContext = parsingContext;
             parsingContext |= 1 << ParsingContext.JsxChildren;
 
@@ -4112,7 +4108,7 @@ namespace ts {
             return finishNode(node);
         }
 
-        function tryParseAccessorDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {
+        function tryParseAccessorDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): AccessorDeclaration {
             if (parseContextualModifier(SyntaxKind.GetKeyword)) {
                 return addJSDocComment(parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers));
             }
@@ -4197,12 +4193,12 @@ namespace ts {
             }
 
             const node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression);
-            setModifiers(node, parseModifiers());
+            node.modifiers = parseModifiers();
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
 
             const isGenerator = !!node.asteriskToken;
-            const isAsync = !!(node.flags & NodeFlags.Async);
+            const isAsync = !!(getModifierFlags(node) & ModifierFlags.Async);
             node.name =
                 isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
                     isGenerator ? doInYieldContext(parseOptionalIdentifier) :
@@ -4239,6 +4235,10 @@ namespace ts {
         function parseBlock(ignoreMissingOpenBrace: boolean, diagnosticMessage?: DiagnosticMessage): Block {
             const node = <Block>createNode(SyntaxKind.Block);
             if (parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage) || ignoreMissingOpenBrace) {
+                if (scanner.hasPrecedingLineBreak()) {
+                    node.multiLine = true;
+                }
+
                 node.statements = parseList(ParsingContext.BlockStatements, parseStatement);
                 parseExpected(SyntaxKind.CloseBraceToken);
             }
@@ -4789,7 +4789,7 @@ namespace ts {
                         const node = <Statement>createMissingNode(SyntaxKind.MissingDeclaration, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
-                        setModifiers(node, modifiers);
+                        node.modifiers = modifiers;
                         return finishNode(node);
                     }
             }
@@ -4924,57 +4924,57 @@ namespace ts {
             return nextTokenIsIdentifier() && nextToken() === SyntaxKind.CloseParenToken;
         }
 
-        function parseVariableStatement(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): VariableStatement {
+        function parseVariableStatement(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): VariableStatement {
             const node = <VariableStatement>createNode(SyntaxKind.VariableStatement, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return addJSDocComment(finishNode(node));
         }
 
-        function parseFunctionDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): FunctionDeclaration {
+        function parseFunctionDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): FunctionDeclaration {
             const node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
-            node.name = node.flags & NodeFlags.Default ? parseOptionalIdentifier() : parseIdentifier();
+            node.name = hasModifier(node, ModifierFlags.Default) ? parseOptionalIdentifier() : parseIdentifier();
             const isGenerator = !!node.asteriskToken;
-            const isAsync = !!(node.flags & NodeFlags.Async);
+            const isAsync = hasModifier(node, ModifierFlags.Async);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, Diagnostics.or_expected);
             return addJSDocComment(finishNode(node));
         }
 
-        function parseConstructorDeclaration(pos: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ConstructorDeclaration {
+        function parseConstructorDeclaration(pos: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ConstructorDeclaration {
             const node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, pos);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             parseExpected(SyntaxKind.ConstructorKeyword);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, Diagnostics.or_expected);
             return addJSDocComment(finishNode(node));
         }
 
-        function parseMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, asteriskToken: Node, name: PropertyName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
+        function parseMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>, asteriskToken: Node, name: PropertyName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
             const method = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, fullStart);
             method.decorators = decorators;
-            setModifiers(method, modifiers);
+            method.modifiers = modifiers;
             method.asteriskToken = asteriskToken;
             method.name = name;
             method.questionToken = questionToken;
             const isGenerator = !!asteriskToken;
-            const isAsync = !!(method.flags & NodeFlags.Async);
+            const isAsync = hasModifier(method, ModifierFlags.Async);
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
             return addJSDocComment(finishNode(method));
         }
 
-        function parsePropertyDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, name: PropertyName, questionToken: Node): ClassElement {
+        function parsePropertyDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>, name: PropertyName, questionToken: Node): ClassElement {
             const property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
             property.decorators = decorators;
-            setModifiers(property, modifiers);
+            property.modifiers = modifiers;
             property.name = name;
             property.questionToken = questionToken;
             property.type = parseTypeAnnotation();
@@ -4988,7 +4988,7 @@ namespace ts {
             //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initializer_opt[In, ?Yield];
             //
             // The checker may still error in the static case to explicitly disallow the yield expression.
-            property.initializer = modifiers && modifiers.flags & NodeFlags.Static
+            property.initializer = hasModifier(property, ModifierFlags.Static)
                 ? allowInAnd(parseNonParameterInitializer)
                 : doOutsideOfContext(NodeFlags.YieldContext | NodeFlags.DisallowInContext, parseNonParameterInitializer);
 
@@ -4996,7 +4996,7 @@ namespace ts {
             return finishNode(property);
         }
 
-        function parsePropertyOrMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ClassElement {
+        function parsePropertyOrMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ClassElement {
             const asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
             const name = parsePropertyName();
 
@@ -5015,10 +5015,10 @@ namespace ts {
             return parseInitializer(/*inParameter*/ false);
         }
 
-        function parseAccessorDeclaration(kind: SyntaxKind, fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {
+        function parseAccessorDeclaration(kind: SyntaxKind, fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): AccessorDeclaration {
             const node = <AccessorDeclaration>createNode(kind, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             node.name = parsePropertyName();
             fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false);
@@ -5114,14 +5114,15 @@ namespace ts {
                     break;
                 }
 
-                if (!decorators) {
-                    decorators = <NodeArray<Decorator>>[];
-                    decorators.pos = decoratorStart;
-                }
-
                 const decorator = <Decorator>createNode(SyntaxKind.Decorator, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
-                decorators.push(finishNode(decorator));
+                finishNode(decorator);
+                if (!decorators) {
+                    decorators = createNodeArray<Decorator>([decorator], decoratorStart);
+                }
+                else {
+                    decorators.push(decorator);
+                }
             }
             if (decorators) {
                 decorators.end = getNodeEnd();
@@ -5136,9 +5137,8 @@ namespace ts {
          *
          * In such situations, 'permitInvalidConstAsModifier' should be set to true.
          */
-        function parseModifiers(permitInvalidConstAsModifier?: boolean): ModifiersArray {
-            let flags: NodeFlags = 0;
-            let modifiers: ModifiersArray;
+        function parseModifiers(permitInvalidConstAsModifier?: boolean): NodeArray<Modifier> {
+            let modifiers: NodeArray<Modifier>;
             while (true) {
                 const modifierStart = scanner.getStartPos();
                 const modifierKind = token();
@@ -5156,33 +5156,28 @@ namespace ts {
                     }
                 }
 
+                const modifier = finishNode(<Modifier>createNode(modifierKind, modifierStart));
                 if (!modifiers) {
-                    modifiers = <ModifiersArray>[];
-                    modifiers.pos = modifierStart;
+                    modifiers = createNodeArray<Modifier>([modifier], modifierStart);
+                }
+                else {
+                    modifiers.push(modifier);
                 }
-
-                flags |= modifierToFlag(modifierKind);
-                modifiers.push(finishNode(<Modifier>createNode(modifierKind, modifierStart)));
             }
             if (modifiers) {
-                modifiers.flags = flags;
                 modifiers.end = scanner.getStartPos();
             }
             return modifiers;
         }
 
-        function parseModifiersForArrowFunction(): ModifiersArray {
-            let flags = 0;
-            let modifiers: ModifiersArray;
+        function parseModifiersForArrowFunction(): NodeArray<Modifier> {
+            let modifiers: NodeArray<Modifier>;
             if (token() === SyntaxKind.AsyncKeyword) {
                 const modifierStart = scanner.getStartPos();
                 const modifierKind = token();
                 nextToken();
-                modifiers = <ModifiersArray>[];
-                modifiers.pos = modifierStart;
-                flags |= modifierToFlag(modifierKind);
-                modifiers.push(finishNode(<Modifier>createNode(modifierKind, modifierStart)));
-                modifiers.flags = flags;
+                const modifier = finishNode(<Modifier>createNode(modifierKind, modifierStart));
+                modifiers = createNodeArray<Modifier>([modifier], modifierStart);
                 modifiers.end = scanner.getStartPos();
             }
 
@@ -5242,14 +5237,14 @@ namespace ts {
                 SyntaxKind.ClassExpression);
         }
 
-        function parseClassDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ClassDeclaration {
+        function parseClassDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ClassDeclaration {
             return <ClassDeclaration>parseClassDeclarationOrExpression(fullStart, decorators, modifiers, SyntaxKind.ClassDeclaration);
         }
 
-        function parseClassDeclarationOrExpression(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, kind: SyntaxKind): ClassLikeDeclaration {
+        function parseClassDeclarationOrExpression(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>, kind: SyntaxKind): ClassLikeDeclaration {
             const node = <ClassLikeDeclaration>createNode(kind, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             parseExpected(SyntaxKind.ClassKeyword);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
@@ -5324,10 +5319,10 @@ namespace ts {
             return parseList(ParsingContext.ClassMembers, parseClassElement);
         }
 
-        function parseInterfaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): InterfaceDeclaration {
+        function parseInterfaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): InterfaceDeclaration {
             const node = <InterfaceDeclaration>createNode(SyntaxKind.InterfaceDeclaration, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             parseExpected(SyntaxKind.InterfaceKeyword);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
@@ -5336,10 +5331,10 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseTypeAliasDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): TypeAliasDeclaration {
+        function parseTypeAliasDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): TypeAliasDeclaration {
             const node = <TypeAliasDeclaration>createNode(SyntaxKind.TypeAliasDeclaration, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             parseExpected(SyntaxKind.TypeKeyword);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
@@ -5360,10 +5355,10 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseEnumDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): EnumDeclaration {
+        function parseEnumDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): EnumDeclaration {
             const node = <EnumDeclaration>createNode(SyntaxKind.EnumDeclaration, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             parseExpected(SyntaxKind.EnumKeyword);
             node.name = parseIdentifier();
             if (parseExpected(SyntaxKind.OpenBraceToken)) {
@@ -5388,25 +5383,25 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseModuleOrNamespaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, flags: NodeFlags): ModuleDeclaration {
+        function parseModuleOrNamespaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>, flags: NodeFlags): ModuleDeclaration {
             const node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             const namespaceFlag = flags & NodeFlags.Namespace;
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(SyntaxKind.DotToken)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, NodeFlags.Export | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, NodeFlags.NestedNamespace | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
 
-        function parseAmbientExternalModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ModuleDeclaration {
+        function parseAmbientExternalModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ModuleDeclaration {
             const node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             if (token() === SyntaxKind.GlobalKeyword) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
@@ -5426,8 +5421,8 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ModuleDeclaration {
-            let flags = modifiers ? modifiers.flags : 0;
+        function parseModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ModuleDeclaration {
+            let flags: NodeFlags = 0;
             if (token() === SyntaxKind.GlobalKeyword) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
@@ -5457,7 +5452,7 @@ namespace ts {
             return nextToken() === SyntaxKind.SlashToken;
         }
 
-        function parseNamespaceExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): NamespaceExportDeclaration {
+        function parseNamespaceExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): NamespaceExportDeclaration {
             const exportDeclaration = <NamespaceExportDeclaration>createNode(SyntaxKind.NamespaceExportDeclaration, fullStart);
             exportDeclaration.decorators = decorators;
             exportDeclaration.modifiers = modifiers;
@@ -5471,7 +5466,7 @@ namespace ts {
             return finishNode(exportDeclaration);
         }
 
-        function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
+        function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ImportEqualsDeclaration | ImportDeclaration {
             parseExpected(SyntaxKind.ImportKeyword);
             const afterImportPos = scanner.getStartPos();
 
@@ -5484,7 +5479,7 @@ namespace ts {
                     // import x = M.x;
                     const importEqualsDeclaration = <ImportEqualsDeclaration>createNode(SyntaxKind.ImportEqualsDeclaration, fullStart);
                     importEqualsDeclaration.decorators = decorators;
-                    setModifiers(importEqualsDeclaration, modifiers);
+                    importEqualsDeclaration.modifiers = modifiers;
                     importEqualsDeclaration.name = identifier;
                     parseExpected(SyntaxKind.EqualsToken);
                     importEqualsDeclaration.moduleReference = parseModuleReference();
@@ -5496,7 +5491,7 @@ namespace ts {
             // Import statement
             const importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
             importDeclaration.decorators = decorators;
-            setModifiers(importDeclaration, modifiers);
+            importDeclaration.modifiers = modifiers;
 
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
@@ -5632,10 +5627,10 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ExportDeclaration {
+        function parseExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ExportDeclaration {
             const node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             if (parseOptional(SyntaxKind.AsteriskToken)) {
                 parseExpected(SyntaxKind.FromKeyword);
                 node.moduleSpecifier = parseModuleSpecifier();
@@ -5655,10 +5650,10 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseExportAssignment(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ExportAssignment {
+        function parseExportAssignment(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ExportAssignment {
             const node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, fullStart);
             node.decorators = decorators;
-            setModifiers(node, modifiers);
+            node.modifiers = modifiers;
             if (parseOptional(SyntaxKind.EqualsToken)) {
                 node.isExportEquals = true;
             }
@@ -5744,7 +5739,7 @@ namespace ts {
 
         function setExternalModuleIndicator(sourceFile: SourceFile) {
             sourceFile.externalModuleIndicator = forEach(sourceFile.statements, node =>
-                node.flags & NodeFlags.Export
+                hasModifier(node, ModifierFlags.Export)
                     || node.kind === SyntaxKind.ImportEqualsDeclaration && (<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference
                     || node.kind === SyntaxKind.ImportDeclaration
                     || node.kind === SyntaxKind.ExportAssignment
@@ -6084,10 +6079,8 @@ namespace ts {
             function parseJSDocTypeList(firstType: JSDocType) {
                 Debug.assert(!!firstType);
 
-                const types = <NodeArray<JSDocType>>[];
-                types.pos = firstType.pos;
+                const types = createNodeArray([firstType], firstType.pos);
 
-                types.push(firstType);
                 while (parseOptional(SyntaxKind.BarToken)) {
                     types.push(parseJSDocType());
                 }
@@ -6302,11 +6295,11 @@ namespace ts {
                 function addTag(tag: JSDocTag): void {
                     if (tag) {
                         if (!tags) {
-                            tags = <NodeArray<JSDocTag>>[];
-                            tags.pos = tag.pos;
+                            tags = createNodeArray([tag], tag.pos);
+                        }
+                        else {
+                            tags.push(tag);
                         }
-
-                        tags.push(tag);
                         tags.end = tag.end;
                     }
                 }
@@ -6518,8 +6511,7 @@ namespace ts {
                     }
 
                     // Type parameter list looks like '@template T,U,V'
-                    const typeParameters = <NodeArray<TypeParameterDeclaration>>[];
-                    typeParameters.pos = scanner.getStartPos();
+                    const typeParameters = createNodeArray<TypeParameterDeclaration>();
 
                     while (true) {
                         const name = parseJSDocIdentifierName();
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 49f61981d72..7c010285b70 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -8,11 +8,9 @@ namespace ts {
 
     const emptyArray: any[] = [];
 
-    const defaultTypeRoots = ["node_modules/@types"];
-
-    export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string {
+    export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string {
         while (true) {
-            const fileName = combinePaths(searchPath, "tsconfig.json");
+            const fileName = combinePaths(searchPath, configName);
             if (fileExists(fileName)) {
                 return fileName;
             }
@@ -168,7 +166,7 @@ namespace ts {
 
     const typeReferenceExtensions = [".d.ts"];
 
-    function getEffectiveTypeRoots(options: CompilerOptions, host: ModuleResolutionHost) {
+    export function getEffectiveTypeRoots(options: CompilerOptions, host: { directoryExists?: (directoryName: string) => boolean, getCurrentDirectory?: () => string }): string[] | undefined  {
         if (options.typeRoots) {
             return options.typeRoots;
         }
@@ -181,12 +179,38 @@ namespace ts {
             currentDirectory = host.getCurrentDirectory();
         }
 
-        if (!currentDirectory) {
-            return undefined;
-        }
-        return map(defaultTypeRoots, d => combinePaths(currentDirectory, d));
+        return currentDirectory && getDefaultTypeRoots(currentDirectory, host);
     }
 
+    /**
+     * Returns the path to every node_modules/@types directory from some ancestor directory.
+     * Returns undefined if there are none.
+     */
+    function getDefaultTypeRoots(currentDirectory: string,  host: { directoryExists?: (directoryName: string) => boolean }): string[] | undefined {
+        if (!host.directoryExists) {
+            return [combinePaths(currentDirectory, nodeModulesAtTypes)];
+            // And if it doesn't exist, tough.
+        }
+
+        let typeRoots: string[];
+
+        while (true) {
+            const atTypes = combinePaths(currentDirectory, nodeModulesAtTypes);
+            if (host.directoryExists(atTypes)) {
+                (typeRoots || (typeRoots = [])).push(atTypes);
+            }
+
+            const parent = getDirectoryPath(currentDirectory);
+            if (parent === currentDirectory) {
+                break;
+            }
+            currentDirectory = parent;
+        }
+
+        return typeRoots;
+    }
+    const nodeModulesAtTypes = combinePaths("node_modules", "@types");
+
     /**
      * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
      * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
@@ -963,6 +987,7 @@ namespace ts {
             readFile: fileName => sys.readFile(fileName),
             trace: (s: string) => sys.write(s + newLine),
             directoryExists: directoryName => sys.directoryExists(directoryName),
+            getEnvironmentVariable: name => getEnvironmentVariable(name, /*host*/ undefined),
             getDirectories: (path: string) => sys.getDirectories(path),
             realpath
         };
@@ -1706,7 +1731,7 @@ namespace ts {
                     return false;
                 }
 
-                function checkModifiers(modifiers: ModifiersArray): boolean {
+                function checkModifiers(modifiers: NodeArray<Modifier>): boolean {
                     if (modifiers) {
                         for (const modifier of modifiers) {
                             switch (modifier.kind) {
@@ -1790,6 +1815,17 @@ namespace ts {
             let imports: LiteralExpression[];
             let moduleAugmentations: LiteralExpression[];
 
+            // If we are importing helpers, we need to add a synthetic reference to resolve the
+            // helpers library.
+            if (options.importHelpers
+                && (options.isolatedModules || isExternalModuleFile)
+                && !file.isDeclarationFile) {
+                const externalHelpersModuleReference = <StringLiteral>createNode(SyntaxKind.StringLiteral);
+                externalHelpersModuleReference.text = externalHelpersModuleNameText;
+                externalHelpersModuleReference.parent = file;
+                imports = [externalHelpersModuleReference];
+            }
+
             for (const node of file.statements) {
                 collectModuleReferences(node, /*inAmbientModule*/ false);
                 if (isJavaScriptFile) {
@@ -1823,7 +1859,7 @@ namespace ts {
                         }
                         break;
                     case SyntaxKind.ModuleDeclaration:
-                        if (isAmbientModule(<ModuleDeclaration>node) && (inAmbientModule || node.flags & NodeFlags.Ambient || isDeclarationFile(file))) {
+                        if (isAmbientModule(<ModuleDeclaration>node) && (inAmbientModule || hasModifier(node, ModifierFlags.Ambient) || isDeclarationFile(file))) {
                             const moduleName = <LiteralExpression>(<ModuleDeclaration>node).name;
                             // Ambient module declarations can be interpreted as augmentations for some existing external modules.
                             // This will happen in two cases:
@@ -2306,7 +2342,7 @@ namespace ts {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
 
-            if (options.reactNamespace && !isIdentifier(options.reactNamespace, languageVersion)) {
+            if (options.reactNamespace && !isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
 
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index c1431ca23ed..2d07c2998e0 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -439,9 +439,7 @@ namespace ts {
 
       /* @internal */
       export function skipTrivia(text: string, pos: number, stopAfterLineBreak?: boolean, stopAtComments = false): number {
-          // Using ! with a greater than test is a fast way of testing the following conditions:
-          //  pos === undefined || pos === null || isNaN(pos) || pos < 0;
-          if (!(pos >= 0)) {
+          if (positionIsSynthesized(pos)) {
               return pos;
           }
 
@@ -590,20 +588,34 @@ namespace ts {
     }
 
     /**
-     * Extract comments from text prefixing the token closest following `pos`.
-     * The return value is an array containing a TextRange for each comment.
-     * Single-line comment ranges include the beginning '//' characters but not the ending line break.
-     * Multi - line comment ranges include the beginning '/* and ending '<asterisk>/' characters.
-     * The return value is undefined if no comments were found.
-     * @param trailing
-     * If false, whitespace is skipped until the first line break and comments between that location
-     * and the next token are returned.
-     * If true, comments occurring between the given position and the next line break are returned.
+     * Invokes a callback for each comment range following the provided position.
+     *
+     * Single-line comment ranges include the leading double-slash characters but not the ending
+     * line break. Multi-line comment ranges include the leading slash-asterisk and trailing
+     * asterisk-slash characters.
+     *
+     * @param reduce If true, accumulates the result of calling the callback in a fashion similar
+     *      to reduceLeft. If false, iteration stops when the callback returns a truthy value.
+     * @param text The source text to scan.
+     * @param pos The position at which to start scanning.
+     * @param trailing If false, whitespace is skipped until the first line break and comments
+     *      between that location and the next token are returned. If true, comments occurring
+     *      between the given position and the next line break are returned.
+     * @param cb The callback to execute as each comment range is encountered.
+     * @param state A state value to pass to each iteration of the callback.
+     * @param initial An initial value to pass when accumulating results (when "reduce" is true).
+     * @returns If "reduce" is true, the accumulated value. If "reduce" is false, the first truthy
+     *      return value of the callback.
      */
-    function getCommentRanges(text: string, pos: number, trailing: boolean): CommentRange[] {
-        let result: CommentRange[];
+    function iterateCommentRanges<T, U>(reduce: boolean, text: string, pos: number, trailing: boolean, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial?: U): U {
+        let pendingPos: number;
+        let pendingEnd: number;
+        let pendingKind: SyntaxKind;
+        let pendingHasTrailingNewLine: boolean;
+        let hasPendingCommentRange = false;
         let collecting = trailing || pos === 0;
-        while (pos < text.length) {
+        let accumulator = initial;
+        scan: while (pos >= 0 && pos < text.length) {
             const ch = text.charCodeAt(pos);
             switch (ch) {
                 case CharacterCodes.carriageReturn:
@@ -613,12 +625,14 @@ namespace ts {
                 case CharacterCodes.lineFeed:
                     pos++;
                     if (trailing) {
-                        return result;
+                        break scan;
                     }
+
                     collecting = true;
-                    if (result && result.length) {
-                        lastOrUndefined(result).hasTrailingNewLine = true;
+                    if (hasPendingCommentRange) {
+                        pendingHasTrailingNewLine = true;
                     }
+
                     continue;
                 case CharacterCodes.tab:
                 case CharacterCodes.verticalTab:
@@ -651,38 +665,78 @@ namespace ts {
                                 pos++;
                             }
                         }
+
                         if (collecting) {
-                            if (!result) {
-                                result = [];
+                            if (hasPendingCommentRange) {
+                                accumulator = cb(pendingPos, pendingEnd, pendingKind, pendingHasTrailingNewLine, state, accumulator);
+                                if (!reduce && accumulator) {
+                                    // If we are not reducing and we have a truthy result, return it.
+                                    return accumulator;
+                                }
+
+                                hasPendingCommentRange = false;
                             }
 
-                            result.push({ pos: startPos, end: pos, hasTrailingNewLine, kind });
+                            pendingPos = startPos;
+                            pendingEnd = pos;
+                            pendingKind = kind;
+                            pendingHasTrailingNewLine = hasTrailingNewLine;
+                            hasPendingCommentRange = true;
                         }
+
                         continue;
                     }
-                    break;
+                    break scan;
                 default:
                     if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpace(ch))) {
-                        if (result && result.length && isLineBreak(ch)) {
-                            lastOrUndefined(result).hasTrailingNewLine = true;
+                        if (hasPendingCommentRange && isLineBreak(ch)) {
+                            pendingHasTrailingNewLine = true;
                         }
                         pos++;
                         continue;
                     }
-                    break;
+                    break scan;
             }
-            return result;
         }
 
-        return result;
+        if (hasPendingCommentRange) {
+            accumulator = cb(pendingPos, pendingEnd, pendingKind, pendingHasTrailingNewLine, state, accumulator);
+        }
+
+        return accumulator;
+    }
+
+    export function forEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T) => U, state?: T) {
+        return iterateCommentRanges(/*reduce*/ false, text, pos, /*trailing*/ false, cb, state);
+    }
+
+    export function forEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T) => U, state?: T) {
+        return iterateCommentRanges(/*reduce*/ false, text, pos, /*trailing*/ true, cb, state);
+    }
+
+    export function reduceEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U) {
+        return iterateCommentRanges(/*reduce*/ true, text, pos, /*trailing*/ false, cb, state, initial);
+    }
+
+    export function reduceEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U) {
+        return iterateCommentRanges(/*reduce*/ true, text, pos, /*trailing*/ true, cb, state, initial);
+    }
+
+    function appendCommentRange(pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: any, comments: CommentRange[]) {
+        if (!comments) {
+            comments = [];
+        }
+
+        comments.push({ pos, end, hasTrailingNewLine, kind });
+        return comments;
     }
 
     export function getLeadingCommentRanges(text: string, pos: number): CommentRange[] {
-        return getCommentRanges(text, pos, /*trailing*/ false);
+        return reduceEachLeadingCommentRange(text, pos, appendCommentRange, undefined, undefined);
     }
 
     export function getTrailingCommentRanges(text: string, pos: number): CommentRange[] {
-        return getCommentRanges(text, pos, /*trailing*/ true);
+        return reduceEachTrailingCommentRange(text, pos, appendCommentRange, undefined, undefined);
     }
 
     /** Optionally, get the shebang */
@@ -705,7 +759,7 @@ namespace ts {
     }
 
     /* @internal */
-    export function isIdentifier(name: string, languageVersion: ScriptTarget): boolean {
+    export function isIdentifierText(name: string, languageVersion: ScriptTarget): boolean {
         if (!isIdentifierStart(name.charCodeAt(0), languageVersion)) {
             return false;
         }
diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts
index 4046867faf1..eb369be39d7 100644
--- a/src/compiler/sourcemap.ts
+++ b/src/compiler/sourcemap.ts
@@ -3,19 +3,211 @@
 /* @internal */
 namespace ts {
     export interface SourceMapWriter {
-        getSourceMapData(): SourceMapData;
-        setSourceFile(sourceFile: SourceFile): void;
-        emitPos(pos: number): void;
-        emitStart(range: TextRange): void;
-        emitEnd(range: TextRange, stopOverridingSpan?: boolean): void;
-        changeEmitSourcePos(): void;
-        getText(): string;
-        getSourceMappingURL(): string;
+        /**
+         * Initialize the SourceMapWriter for a new output file.
+         *
+         * @param filePath The path to the generated output file.
+         * @param sourceMapFilePath The path to the output source map file.
+         * @param sourceFiles The input source files for the program.
+         * @param isBundledEmit A value indicating whether the generated output file is a bundle.
+         */
         initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void;
+
+        /**
+         * Reset the SourceMapWriter to an empty state.
+         */
         reset(): void;
+
+        /**
+         * Gets test data for source maps.
+         */
+        getSourceMapData(): SourceMapData;
+
+        /**
+         * Set the current source file.
+         *
+         * @param sourceFile The source file.
+         */
+        setSourceFile(sourceFile: SourceFile): void;
+
+        /**
+         * Emits a mapping.
+         *
+         * If the position is synthetic (undefined or a negative value), no mapping will be
+         * created.
+         *
+         * @param pos The position.
+         */
+        emitPos(pos: number): void;
+
+        /**
+         * Emits a mapping for the start of a range.
+         *
+         * If the range's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param range The range to emit.
+         */
+        emitStart(range: TextRange): void;
+
+        /**
+         * Emits a mapping for the start of a range.
+         *
+         * If the node's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param range The range to emit.
+         * @param contextNode The node for the current range.
+         * @param ignoreNodeCallback A callback used to determine whether to skip source map
+         *        emit for the start position of this node.
+         * @param ignoreChildrenCallback A callback used to determine whether to skip source
+         *        map emit for all children of this node.
+         * @param getTextRangeCallbackCallback A callback used to get a custom source map
+         *        range for this node.
+         */
+        emitStart(range: TextRange, contextNode: Node, ignoreNodeCallback: (node: Node) => boolean, ignoreChildrenCallback: (node: Node) => boolean, getTextRangeCallbackCallback: (node: Node) => TextRange): void;
+
+        /**
+         * Emits a mapping for the end of a range.
+         *
+         * If the range's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param range The range to emit.
+         */
+        emitEnd(range: TextRange): void;
+
+        /**
+         * Emits a mapping for the end of a range.
+         *
+         * If the node's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param range The range to emit.
+         * @param contextNode The node for the current range.
+         * @param ignoreNodeCallback A callback used to determine whether to skip source map
+         *        emit for the end position of this node.
+         * @param ignoreChildrenCallback A callback used to determine whether to skip source
+         *        map emit for all children of this node.
+         * @param getTextRangeCallbackCallback A callback used to get a custom source map
+         *        range for this node.
+         */
+        emitEnd(range: TextRange, contextNode: Node, ignoreNodeCallback: (node: Node) => boolean, ignoreChildrenCallback: (node: Node) => boolean, getTextRangeCallbackCallback: (node: Node) => TextRange): void;
+
+        /**
+         * Emits a mapping for the start position of a token.
+         *
+         * If the token's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param token The token to emit.
+         * @param tokenStartPos The start position of the token.
+         * @returns The start position of the token, following any trivia.
+         */
+        emitTokenStart(token: SyntaxKind, tokenStartPos: number): number;
+
+        /**
+         * Emits a mapping for the start position of a token.
+         *
+         * If the token's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param token The token to emit.
+         * @param tokenStartPos The start position of the token.
+         * @param contextNode The node containing this token.
+         * @param ignoreTokenCallback A callback used to determine whether to skip source map
+         *        emit for the start position of this token.
+         * @param getTokenTextRangeCallback A callback used to get a custom source
+         *        map range for this node.
+         * @returns The start position of the token, following any trivia.
+         */
+        emitTokenStart(token: SyntaxKind, tokenStartPos: number, contextNode: Node, ignoreTokenCallback: (node: Node, token: SyntaxKind) => boolean, getTokenTextRangeCallback: (node: Node, token: SyntaxKind) => TextRange): number;
+
+        /**
+         * Emits a mapping for the end position of a token.
+         *
+         * If the token's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param token The token to emit.
+         * @param tokenEndPos The end position of the token.
+         * @returns The end position of the token.
+         */
+        emitTokenEnd(token: SyntaxKind, tokenEndPos: number): number;
+
+        /**
+         * Emits a mapping for the end position of a token.
+         *
+         * If the token's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param token The token to emit.
+         * @param tokenEndPos The end position of the token.
+         * @param contextNode The node containing this token.
+         * @param ignoreTokenCallback A callback used to determine whether to skip source map
+         *        emit for the end position of this token.
+         * @param getTokenTextRangeCallback A callback used to get a custom source
+         *        map range for this node.
+         * @returns The end position of the token.
+         */
+        emitTokenEnd(token: SyntaxKind, tokenEndPos: number, contextNode: Node, ignoreTokenCallback: (node: Node, token: SyntaxKind) => boolean, getTokenTextRangeCallback: (node: Node, token: SyntaxKind) => TextRange): number;
+
+        /*@deprecated*/ changeEmitSourcePos(): void;
+        /*@deprecated*/ stopOverridingSpan(): void;
+
+        /**
+         * Gets the text for the source map.
+         */
+        getText(): string;
+
+        /**
+         * Gets the SourceMappingURL for the source map.
+         */
+        getSourceMappingURL(): string;
+    }
+
+    export function createSourceMapWriter(host: EmitHost, writer: EmitTextWriter): SourceMapWriter {
+        const compilerOptions = host.getCompilerOptions();
+        if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
+            if (compilerOptions.extendedDiagnostics) {
+                return createSourceMapWriterWithExtendedDiagnostics(host, writer);
+            }
+
+            return createSourceMapWriterWorker(host, writer);
+        }
+        else {
+            return getNullSourceMapWriter();
+        }
     }
 
     let nullSourceMapWriter: SourceMapWriter;
+
+    export function getNullSourceMapWriter(): SourceMapWriter {
+        if (nullSourceMapWriter === undefined) {
+            nullSourceMapWriter = {
+                initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void { },
+                reset(): void { },
+                getSourceMapData(): SourceMapData { return undefined; },
+                setSourceFile(sourceFile: SourceFile): void { },
+                emitPos(pos: number): void { },
+                emitStart(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean, ignoreChildrenCallback?: (node: Node) => boolean, getTextRangeCallback?: (node: Node) => TextRange): void { },
+                emitEnd(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean, ignoreChildrenCallback?: (node: Node) => boolean, getTextRangeCallback?: (node: Node) => TextRange): void { },
+                emitTokenStart(token: SyntaxKind, pos: number, contextNode?: Node, ignoreTokenCallback?: (node: Node) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind) => TextRange): number { return -1; },
+                emitTokenEnd(token: SyntaxKind, end: number, contextNode?: Node, ignoreTokenCallback?: (node: Node) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind) => TextRange): number { return -1; },
+                changeEmitSourcePos(): void { },
+                stopOverridingSpan(): void { },
+                getText(): string { return undefined; },
+                getSourceMappingURL(): string { return undefined; }
+            };
+        }
+
+        return nullSourceMapWriter;
+    }
+
     // Used for initialize lastEncodedSourceMapSpan and reset lastEncodedSourceMapSpan when updateLastEncodedAndRecordedSpans
     const defaultLastEncodedSourceMapSpan: SourceMapSpan = {
         emittedLine: 1,
@@ -25,29 +217,11 @@ namespace ts {
         sourceIndex: 0
     };
 
-    export function getNullSourceMapWriter(): SourceMapWriter {
-        if (nullSourceMapWriter === undefined) {
-            nullSourceMapWriter = {
-                getSourceMapData(): SourceMapData { return undefined; },
-                setSourceFile(sourceFile: SourceFile): void { },
-                emitStart(range: TextRange): void { },
-                emitEnd(range: TextRange, stopOverridingSpan?: boolean): void { },
-                emitPos(pos: number): void { },
-                changeEmitSourcePos(): void { },
-                getText(): string { return undefined; },
-                getSourceMappingURL(): string { return undefined; },
-                initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void { },
-                reset(): void { },
-            };
-        }
-
-        return nullSourceMapWriter;
-    }
-
-    export function createSourceMapWriter(host: EmitHost, writer: EmitTextWriter): SourceMapWriter {
+    function createSourceMapWriterWorker(host: EmitHost, writer: EmitTextWriter): SourceMapWriter {
         const compilerOptions = host.getCompilerOptions();
         const extendedDiagnostics = compilerOptions.extendedDiagnostics;
         let currentSourceFile: SourceFile;
+        let currentSourceText: string;
         let sourceMapDir: string; // The directory in which sourcemap will be
         let stopOverridingSpan = false;
         let modifyLastSourcePos = false;
@@ -63,25 +237,45 @@ namespace ts {
         // Source map data
         let sourceMapData: SourceMapData;
 
+        // This keeps track of the number of times `disable` has been called without a
+        // corresponding call to `enable`. As long as this value is non-zero, mappings will not
+        // be recorded.
+        // This is primarily used to provide a better experience when debugging binding
+        // patterns and destructuring assignments for simple expressions.
+        let disableDepth: number;
+
         return {
+            initialize,
+            reset,
             getSourceMapData: () => sourceMapData,
             setSourceFile,
             emitPos,
             emitStart,
             emitEnd,
+            emitTokenStart,
+            emitTokenEnd,
             changeEmitSourcePos,
+            stopOverridingSpan: () => stopOverridingSpan = true,
             getText,
             getSourceMappingURL,
-            initialize,
-            reset,
         };
 
+        /**
+         * Initialize the SourceMapWriter for a new output file.
+         *
+         * @param filePath The path to the generated output file.
+         * @param sourceMapFilePath The path to the output source map file.
+         * @param sourceFiles The input source files for the program.
+         * @param isBundledEmit A value indicating whether the generated output file is a bundle.
+         */
         function initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
             if (sourceMapData) {
                 reset();
             }
 
             currentSourceFile = undefined;
+            currentSourceText = undefined;
+            disableDepth = 0;
 
             // Current source map file and its index in the sources list
             sourceMapSourceIndex = -1;
@@ -140,6 +334,9 @@ namespace ts {
             }
         }
 
+        /**
+         * Reset the SourceMapWriter to an empty state.
+         */
         function reset() {
             currentSourceFile = undefined;
             sourceMapDir = undefined;
@@ -148,6 +345,23 @@ namespace ts {
             lastEncodedSourceMapSpan = undefined;
             lastEncodedNameIndex = undefined;
             sourceMapData = undefined;
+            disableDepth = 0;
+        }
+
+        /**
+         * Re-enables the recording of mappings.
+         */
+        function enable() {
+            if (disableDepth > 0) {
+                disableDepth--;
+            }
+        }
+
+        /**
+         * Disables the recording of mappings.
+         */
+        function disable() {
+            disableDepth++;
         }
 
         function updateLastEncodedAndRecordedSpans() {
@@ -236,8 +450,16 @@ namespace ts {
             sourceMapData.sourceMapDecodedMappings.push(lastEncodedSourceMapSpan);
         }
 
+        /**
+         * Emits a mapping.
+         *
+         * If the position is synthetic (undefined or a negative value), no mapping will be
+         * created.
+         *
+         * @param pos The position.
+         */
         function emitPos(pos: number) {
-            if (pos === -1) {
+            if (positionIsSynthesized(pos) || disableDepth > 0) {
                 return;
             }
 
@@ -291,27 +513,201 @@ namespace ts {
             }
         }
 
-        function getStartPos(range: TextRange) {
+        function getStartPosPastDecorators(range: TextRange) {
             const rangeHasDecorators = !!(range as Node).decorators;
-            return range.pos !== -1 ? skipTrivia(currentSourceFile.text, rangeHasDecorators ? (range as Node).decorators.end : range.pos) : -1;
+            return skipTrivia(currentSourceText, rangeHasDecorators ? (range as Node).decorators.end : range.pos);
         }
 
-        function emitStart(range: TextRange) {
-            emitPos(getStartPos(range));
+        /**
+         * Emits a mapping for the start of a range.
+         *
+         * If the range's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param range The range to emit.0
+         */
+        function emitStart(range: TextRange): void;
+        /**
+         * Emits a mapping for the start of a range.
+         *
+         * If the node's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param range The range to emit.
+         * @param contextNode The node for the current range.
+         * @param ignoreNodeCallback A callback used to determine whether to skip source map
+         *        emit for the start position of this node.
+         * @param ignoreChildrenCallback A callback used to determine whether to skip source
+         *        map emit for all children of this node.
+         * @param getTextRangeCallbackCallback A callback used to get a custom source map
+         *        range for this node.
+         */
+        function emitStart(range: TextRange, contextNode: Node, ignoreNodeCallback: (node: Node) => boolean, ignoreChildrenCallback: (node: Node) => boolean, getTextRangeCallback: (node: Node) => TextRange): void;
+        function emitStart(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean, ignoreChildrenCallback?: (node: Node) => boolean, getTextRangeCallback?: (node: Node) => TextRange) {
+            if (contextNode) {
+                if (!ignoreNodeCallback(contextNode)) {
+                    range = getTextRangeCallback(contextNode) || range;
+                    emitPos(getStartPosPastDecorators(range));
+                }
+
+                if (ignoreChildrenCallback(contextNode)) {
+                    disable();
+                }
+            }
+            else {
+                emitPos(getStartPosPastDecorators(range));
+            }
         }
 
-        function emitEnd(range: TextRange, stopOverridingEnd?: boolean) {
-            emitPos(range.end);
-            stopOverridingSpan = stopOverridingEnd;
+        /**
+         * Emits a mapping for the end of a range.
+         *
+         * If the range's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param range The range to emit.
+         */
+        function emitEnd(range: TextRange): void;
+        /**
+         * Emits a mapping for the end of a range.
+         *
+         * If the node's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param range The range to emit.
+         * @param contextNode The node for the current range.
+         * @param ignoreNodeCallback A callback used to determine whether to skip source map
+         *        emit for the end position of this node.
+         * @param ignoreChildrenCallback A callback used to determine whether to skip source
+         *        map emit for all children of this node.
+         * @param getTextRangeCallbackCallback A callback used to get a custom source map
+         *        range for this node.
+         */
+        function emitEnd(range: TextRange, contextNode: Node, ignoreNodeCallback: (node: Node) => boolean, ignoreChildrenCallback: (node: Node) => boolean, getTextRangeCallback: (node: Node) => TextRange): void;
+        function emitEnd(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean, ignoreChildrenCallback?: (node: Node) => boolean, getTextRangeCallback?: (node: Node) => TextRange) {
+            if (contextNode) {
+                if (ignoreChildrenCallback(contextNode)) {
+                    enable();
+                }
+
+                if (!ignoreNodeCallback(contextNode)) {
+                    range = getTextRangeCallback(contextNode) || range;
+                    emitPos(range.end);
+                }
+            }
+            else {
+                emitPos(range.end);
+            }
+
+            stopOverridingSpan = false;
         }
 
+        /**
+         * Emits a mapping for the start position of a token.
+         *
+         * If the token's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param token The token to emit.
+         * @param tokenStartPos The start position of the token.
+         * @returns The start position of the token, following any trivia.
+         */
+        function emitTokenStart(token: SyntaxKind, tokenStartPos: number): number;
+        /**
+         * Emits a mapping for the start position of a token.
+         *
+         * If the token's start position is synthetic (undefined or a negative value), no mapping
+         * will be created. Any trivia at the start position in the original source will be
+         * skipped.
+         *
+         * @param token The token to emit.
+         * @param tokenStartPos The start position of the token.
+         * @param contextNode The node containing this token.
+         * @param ignoreTokenCallback A callback used to determine whether to skip source map
+         *        emit for the start position of this token.
+         * @param getTokenTextRangeCallback A callback used to get a custom source
+         *        map range for this node.
+         * @returns The start position of the token, following any trivia.
+         */
+        function emitTokenStart(token: SyntaxKind, tokenStartPos: number, contextNode: Node, ignoreTokenCallback: (node: Node, token: SyntaxKind) => boolean, getTokenTextRangeCallback: (node: Node, token: SyntaxKind) => TextRange): number;
+        function emitTokenStart(token: SyntaxKind, tokenStartPos: number, contextNode?: Node, ignoreTokenCallback?: (node: Node, token: SyntaxKind) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind) => TextRange): number {
+            if (contextNode) {
+                if (ignoreTokenCallback(contextNode, token)) {
+                    return skipTrivia(currentSourceText, tokenStartPos);
+                }
+
+                const range = getTokenTextRangeCallback(contextNode, token);
+                if (range) {
+                    tokenStartPos = range.pos;
+                }
+            }
+
+            tokenStartPos = skipTrivia(currentSourceText, tokenStartPos);
+            emitPos(tokenStartPos);
+            return tokenStartPos;
+        }
+
+        /**
+         * Emits a mapping for the end position of a token.
+         *
+         * If the token's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param token The token to emit.
+         * @param tokenEndPos The end position of the token.
+         * @returns The end position of the token.
+         */
+        function emitTokenEnd(token: SyntaxKind, tokenEndPos: number): number;
+        /**
+         * Emits a mapping for the end position of a token.
+         *
+         * If the token's end position is synthetic (undefined or a negative value), no mapping
+         * will be created.
+         *
+         * @param token The token to emit.
+         * @param tokenEndPos The end position of the token.
+         * @param contextNode The node containing this token.
+         * @param ignoreTokenCallback A callback used to determine whether to skip source map
+         *        emit for the end position of this token.
+         * @param getTokenTextRangeCallback A callback used to get a custom source
+         *        map range for this node.
+         * @returns The end position of the token.
+         */
+        function emitTokenEnd(token: SyntaxKind, tokenEndPos: number, contextNode: Node, ignoreTokenCallback: (node: Node, token: SyntaxKind) => boolean, getTokenTextRangeCallback: (node: Node, token: SyntaxKind) => TextRange): number;
+        function emitTokenEnd(token: SyntaxKind, tokenEndPos: number, contextNode?: Node, ignoreTokenCallback?: (node: Node, token: SyntaxKind) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind) => TextRange): number {
+            if (contextNode) {
+                if (ignoreTokenCallback(contextNode, token)) {
+                    return tokenEndPos;
+                }
+
+                const range = getTokenTextRangeCallback(contextNode, token);
+                if (range) {
+                    tokenEndPos = range.end;
+                }
+            }
+
+            emitPos(tokenEndPos);
+            return tokenEndPos;
+        }
+
+
+        // @deprecated
         function changeEmitSourcePos() {
             Debug.assert(!modifyLastSourcePos);
             modifyLastSourcePos = true;
         }
 
+        /**
+         * Set the current source file.
+         *
+         * @param sourceFile The source file.
+         */
         function setSourceFile(sourceFile: SourceFile) {
             currentSourceFile = sourceFile;
+            currentSourceText = currentSourceFile.text;
 
             // Add the file to tsFilePaths
             // If sourceroot option: Use the relative path corresponding to the common directory path
@@ -330,14 +726,17 @@ namespace ts {
                 sourceMapData.sourceMapSources.push(source);
 
                 // The one that can be used from program to get the actual source file
-                sourceMapData.inputSourceFileNames.push(sourceFile.fileName);
+                sourceMapData.inputSourceFileNames.push(currentSourceFile.fileName);
 
                 if (compilerOptions.inlineSources) {
-                    sourceMapData.sourceMapSourcesContent.push(sourceFile.text);
+                    sourceMapData.sourceMapSourcesContent.push(currentSourceFile.text);
                 }
             }
         }
 
+        /**
+         * Gets the text for the source map.
+         */
         function getText() {
             encodeLastRecordedSourceMapSpan();
 
@@ -352,6 +751,9 @@ namespace ts {
             });
         }
 
+        /**
+         * Gets the SourceMappingURL for the source map.
+         */
         function getSourceMappingURL() {
             if (compilerOptions.inlineSourceMap) {
                 // Encode the sourceMap into the sourceMap url
@@ -364,6 +766,61 @@ namespace ts {
         }
     }
 
+    function createSourceMapWriterWithExtendedDiagnostics(host: EmitHost, writer: EmitTextWriter): SourceMapWriter {
+        const {
+            initialize,
+            reset,
+            getSourceMapData,
+            setSourceFile,
+            emitPos,
+            emitStart,
+            emitEnd,
+            emitTokenStart,
+            emitTokenEnd,
+            changeEmitSourcePos,
+            stopOverridingSpan,
+            getText,
+            getSourceMappingURL,
+        } = createSourceMapWriterWorker(host, writer);
+        return {
+            initialize,
+            reset,
+            getSourceMapData,
+            setSourceFile,
+            emitPos(pos: number): void {
+                 performance.mark("sourcemapStart");
+                emitPos(pos);
+                performance.measure("sourceMapTime", "sourcemapStart");
+            },
+            emitStart(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean, ignoreChildrenCallback?: (node: Node) => boolean, getTextRangeCallback?: (node: Node) => TextRange): void {
+                performance.mark("emitSourcemap:emitStart");
+                emitStart(range, contextNode, ignoreNodeCallback, ignoreChildrenCallback, getTextRangeCallback);
+                performance.measure("sourceMapTime", "emitSourcemap:emitStart");
+            },
+            emitEnd(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean, ignoreChildrenCallback?: (node: Node) => boolean, getTextRangeCallback?: (node: Node) => TextRange): void {
+                performance.mark("emitSourcemap:emitEnd");
+                emitEnd(range, contextNode, ignoreNodeCallback, ignoreChildrenCallback, getTextRangeCallback);
+                performance.measure("sourceMapTime", "emitSourcemap:emitEnd");
+            },
+            emitTokenStart(token: SyntaxKind, tokenStartPos: number, contextNode?: Node, ignoreTokenCallback?: (node: Node) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind) => TextRange): number {
+                performance.mark("emitSourcemap:emitTokenStart");
+                tokenStartPos = emitTokenStart(token, tokenStartPos, contextNode, ignoreTokenCallback, getTokenTextRangeCallback);
+                performance.measure("sourceMapTime", "emitSourcemap:emitTokenStart");
+                return tokenStartPos;
+            },
+            emitTokenEnd(token: SyntaxKind, tokenEndPos: number, contextNode?: Node, ignoreTokenCallback?: (node: Node) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind) => TextRange): number {
+                performance.mark("emitSourcemap:emitTokenEnd");
+                tokenEndPos = emitTokenEnd(token, tokenEndPos, contextNode, ignoreTokenCallback, getTokenTextRangeCallback);
+                performance.measure("sourceMapTime", "emitSourcemap:emitTokenEnd");
+                return tokenEndPos;
+            },
+            changeEmitSourcePos,
+            stopOverridingSpan,
+            getText,
+            getSourceMappingURL,
+        };
+    }
+
     const base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     function base64FormatEncode(inValue: number) {
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 350d75429b7..437cf8e05ec 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -32,6 +32,8 @@ namespace ts {
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
         realpath?(path: string): string;
+        /*@internal*/ getEnvironmentVariable(name: string): string;
+        /*@internal*/ tryEnableSourceMapsForHost?(): void;
     }
 
     export interface FileWatcher {
@@ -78,6 +80,7 @@ namespace ts {
         watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         realpath(path: string): string;
+        getEnvironmentVariable?(name: string): string;
     };
 
     export var sys: System = (function() {
@@ -212,6 +215,9 @@ namespace ts {
                     return shell.CurrentDirectory;
                 },
                 getDirectories,
+                getEnvironmentVariable(name: string) {
+                    return new ActiveXObject("WScript.Shell").ExpandEnvironmentStrings(`%${name}%`);
+                },
                 readDirectory,
                 exit(exitCode?: number): void {
                     try {
@@ -267,7 +273,7 @@ namespace ts {
                 }
 
                 function addFileWatcherCallback(filePath: string, callback: FileWatcherCallback): void {
-                    (fileWatcherCallbacks[filePath] || (fileWatcherCallbacks[filePath] = [])).push(callback);
+                    multiMapAdd(fileWatcherCallbacks, filePath, callback);
                 }
 
                 function addFile(fileName: string, callback: FileWatcherCallback): WatchedFile {
@@ -283,16 +289,7 @@ namespace ts {
                 }
 
                 function removeFileWatcherCallback(filePath: string, callback: FileWatcherCallback) {
-                    const callbacks = fileWatcherCallbacks[filePath];
-                    if (callbacks) {
-                        const newCallbacks = copyListRemovingItem(callback, callbacks);
-                        if (newCallbacks.length === 0) {
-                            delete fileWatcherCallbacks[filePath];
-                        }
-                        else {
-                            fileWatcherCallbacks[filePath] = newCallbacks;
-                        }
-                    }
+                    multiMapRemove(fileWatcherCallbacks, filePath, callback);
                 }
 
                 function fileEventHandler(eventName: string, relativeFileName: string, baseDirPath: string) {
@@ -432,7 +429,7 @@ namespace ts {
             }
 
             function getDirectories(path: string): string[] {
-                return filter<string>(_fs.readdirSync(path), p => fileSystemEntryExists(combinePaths(path, p), FileSystemEntryKind.Directory));
+                return filter<string>(_fs.readdirSync(path), dir => fileSystemEntryExists(combinePaths(path, dir), FileSystemEntryKind.Directory));
             }
 
             const nodeSystem: System = {
@@ -508,6 +505,9 @@ namespace ts {
                     return process.cwd();
                 },
                 getDirectories,
+                getEnvironmentVariable(name: string) {
+                    return process.env[name] || "";
+                },
                 readDirectory,
                 getModifiedTime(path) {
                     try {
@@ -543,6 +543,14 @@ namespace ts {
                 },
                 realpath(path: string): string {
                     return _fs.realpathSync(path);
+                },
+                tryEnableSourceMapsForHost() {
+                    try {
+                        require("source-map-support").install();
+                    }
+                    catch (e) {
+                        // Could not enable source maps.
+                    }
                 }
             };
             return nodeSystem;
@@ -574,6 +582,7 @@ namespace ts {
                 getExecutingFilePath: () => ChakraHost.executingFile,
                 getCurrentDirectory: () => ChakraHost.currentDirectory,
                 getDirectories: ChakraHost.getDirectories,
+                getEnvironmentVariable: ChakraHost.getEnvironmentVariable || ((name: string) => ""),
                 readDirectory: (path: string, extensions?: string[], excludes?: string[], includes?: string[]) => {
                     const pattern = getFileMatcherPatterns(path, extensions, excludes, includes, !!ChakraHost.useCaseSensitiveFileNames, ChakraHost.currentDirectory);
                     return ChakraHost.readDirectory(path, extensions, pattern.basePaths, pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern);
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
new file mode 100644
index 00000000000..6242a2f2347
--- /dev/null
+++ b/src/compiler/transformer.ts
@@ -0,0 +1,632 @@
+/// <reference path="visitor.ts" />
+/// <reference path="transformers/ts.ts" />
+/// <reference path="transformers/jsx.ts" />
+/// <reference path="transformers/es7.ts" />
+/// <reference path="transformers/es6.ts" />
+/// <reference path="transformers/generators.ts" />
+/// <reference path="transformers/module/module.ts" />
+/// <reference path="transformers/module/system.ts" />
+/// <reference path="transformers/module/es6.ts" />
+
+/* @internal */
+namespace ts {
+    const moduleTransformerMap = createMap<Transformer>({
+        [ModuleKind.ES6]: transformES6Module,
+        [ModuleKind.System]: transformSystemModule,
+        [ModuleKind.AMD]: transformModule,
+        [ModuleKind.CommonJS]: transformModule,
+        [ModuleKind.UMD]: transformModule,
+        [ModuleKind.None]: transformModule,
+    });
+
+    const enum SyntaxKindFeatureFlags {
+        Substitution = 1 << 0,
+        EmitNotifications = 1 << 1,
+    }
+
+    export interface TransformationResult {
+        /**
+         * Gets the transformed source files.
+         */
+        getSourceFiles(): SourceFile[];
+
+        /**
+         * Gets the TextRange to use for source maps for a token of a node.
+         */
+        getTokenSourceMapRange(node: Node, token: SyntaxKind): TextRange;
+
+        /**
+         * Determines whether expression substitutions are enabled for the provided node.
+         */
+        isSubstitutionEnabled(node: Node): boolean;
+
+        /**
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
+         */
+        isEmitNotificationEnabled(node: Node): boolean;
+
+        /**
+         * Hook used by transformers to substitute expressions just before they
+         * are emitted by the pretty printer.
+         *
+         * @param node The node to substitute.
+         * @param isExpression A value indicating whether the node is in an expression context.
+         */
+        onSubstituteNode(node: Node, isExpression: boolean): Node;
+
+        /**
+         * Hook used to allow transformers to capture state before or after
+         * the printer emits a node.
+         *
+         * @param node The node to emit.
+         * @param emitCallback A callback used to emit the node.
+         */
+        onEmitNode(node: Node, emitCallback: (node: Node) => void): void;
+
+        /**
+         * Reset transient transformation properties on parse tree nodes.
+         */
+        dispose(): void;
+    }
+
+    export interface TransformationContext extends LexicalEnvironment {
+        getCompilerOptions(): CompilerOptions;
+        getEmitResolver(): EmitResolver;
+        getEmitHost(): EmitHost;
+
+        /**
+         * Gets flags used to customize later transformations or emit.
+         */
+        getNodeEmitFlags(node: Node): NodeEmitFlags;
+
+        /**
+         * Sets flags used to customize later transformations or emit.
+         */
+        setNodeEmitFlags<T extends Node>(node: T, flags: NodeEmitFlags): T;
+
+        /**
+         * Gets the TextRange to use for source maps for the node.
+         */
+        getSourceMapRange(node: Node): TextRange;
+
+        /**
+         * Sets the TextRange to use for source maps for the node.
+         */
+        setSourceMapRange<T extends Node>(node: T, range: TextRange): T;
+
+        /**
+         * Gets the TextRange to use for source maps for a token of a node.
+         */
+        getTokenSourceMapRange(node: Node, token: SyntaxKind): TextRange;
+
+        /**
+         * Sets the TextRange to use for source maps for a token of a node.
+         */
+        setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange): T;
+
+        /**
+         * Gets the TextRange to use for comments for the node.
+         */
+        getCommentRange(node: Node): TextRange;
+
+        /**
+         * Sets the TextRange to use for comments for the node.
+         */
+        setCommentRange<T extends Node>(node: T, range: TextRange): T;
+
+        /**
+         * Hoists a function declaration to the containing scope.
+         */
+        hoistFunctionDeclaration(node: FunctionDeclaration): void;
+
+        /**
+         * Hoists a variable declaration to the containing scope.
+         */
+        hoistVariableDeclaration(node: Identifier): void;
+
+        /**
+         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
+         */
+        enableSubstitution(kind: SyntaxKind): void;
+
+        /**
+         * Determines whether expression substitutions are enabled for the provided node.
+         */
+        isSubstitutionEnabled(node: Node): boolean;
+
+        /**
+         * Hook used by transformers to substitute expressions just before they
+         * are emitted by the pretty printer.
+         */
+        onSubstituteNode?: (node: Node, isExpression: boolean) => Node;
+
+        /**
+         * Enables before/after emit notifications in the pretty printer for the provided
+         * SyntaxKind.
+         */
+        enableEmitNotification(kind: SyntaxKind): void;
+
+        /**
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
+         */
+        isEmitNotificationEnabled(node: Node): boolean;
+
+        /**
+         * Hook used to allow transformers to capture state before or after
+         * the printer emits a node.
+         */
+        onEmitNode?: (node: Node, emit: (node: Node) => void) => void;
+    }
+
+    /* @internal */
+    export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
+
+    export function getTransformers(compilerOptions: CompilerOptions) {
+        const jsx = compilerOptions.jsx;
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const moduleKind = getEmitModuleKind(compilerOptions);
+        const transformers: Transformer[] = [];
+
+        transformers.push(transformTypeScript);
+        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ModuleKind.None]);
+
+        if (jsx === JsxEmit.React) {
+            transformers.push(transformJsx);
+        }
+
+        transformers.push(transformES7);
+
+        if (languageVersion < ScriptTarget.ES6) {
+            transformers.push(transformES6);
+            transformers.push(transformGenerators);
+        }
+
+        return transformers;
+    }
+
+    /**
+     * Tracks a monotonically increasing transformation id used to associate a node with a specific
+     * transformation. This ensures transient properties related to transformations can be safely
+     * stored on source tree nodes that may be reused across multiple transformations (such as
+     * with compile-on-save).
+     */
+    let nextTransformId = 1;
+
+    /**
+     * Transforms an array of SourceFiles by passing them through each transformer.
+     *
+     * @param resolver The emit resolver provided by the checker.
+     * @param host The emit host.
+     * @param sourceFiles An array of source files
+     * @param transforms An array of Transformers.
+     */
+    export function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]): TransformationResult {
+        const transformId = nextTransformId;
+        nextTransformId++;
+
+        const tokenSourceMapRanges = createMap<TextRange>();
+        const lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = [];
+        const lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = [];
+        const enabledSyntaxKindFeatures = new Array<SyntaxKindFeatureFlags>(SyntaxKind.Count);
+        const parseTreeNodesWithAnnotations: Node[] = [];
+
+        let lastTokenSourceMapRangeNode: Node;
+        let lastTokenSourceMapRangeToken: SyntaxKind;
+        let lastTokenSourceMapRange: TextRange;
+        let lexicalEnvironmentStackOffset = 0;
+        let hoistedVariableDeclarations: VariableDeclaration[];
+        let hoistedFunctionDeclarations: FunctionDeclaration[];
+        let lexicalEnvironmentDisabled: boolean;
+
+        // The transformation context is provided to each transformer as part of transformer
+        // initialization.
+        const context: TransformationContext = {
+            getCompilerOptions: () => host.getCompilerOptions(),
+            getEmitResolver: () => resolver,
+            getEmitHost: () => host,
+            getNodeEmitFlags,
+            setNodeEmitFlags,
+            getSourceMapRange,
+            setSourceMapRange,
+            getTokenSourceMapRange,
+            setTokenSourceMapRange,
+            getCommentRange,
+            setCommentRange,
+            hoistVariableDeclaration,
+            hoistFunctionDeclaration,
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            onSubstituteNode,
+            enableSubstitution,
+            isSubstitutionEnabled,
+            onEmitNode,
+            enableEmitNotification,
+            isEmitNotificationEnabled
+        };
+
+        // Chain together and initialize each transformer.
+        const transformation = chain(...transformers)(context);
+
+        // Transform each source file.
+        const transformed = map(sourceFiles, transformSourceFile);
+
+        // Disable modification of the lexical environment.
+        lexicalEnvironmentDisabled = true;
+
+        return {
+            getSourceFiles: () => transformed,
+            getTokenSourceMapRange,
+            isSubstitutionEnabled,
+            isEmitNotificationEnabled,
+            onSubstituteNode: context.onSubstituteNode,
+            onEmitNode: context.onEmitNode,
+            dispose() {
+                // During transformation we may need to annotate a parse tree node with transient
+                // transformation properties. As parse tree nodes live longer than transformation
+                // nodes, we need to make sure we reclaim any memory allocated for custom ranges
+                // from these nodes to ensure we do not hold onto entire subtrees just for position
+                // information. We also need to reset these nodes to a pre-transformation state
+                // for incremental parsing scenarios so that we do not impact later emit.
+                for (const node of parseTreeNodesWithAnnotations) {
+                    if (node.transformId === transformId) {
+                        node.transformId = 0;
+                        node.emitFlags = 0;
+                        node.commentRange = undefined;
+                        node.sourceMapRange = undefined;
+                    }
+                }
+
+                parseTreeNodesWithAnnotations.length = 0;
+            }
+        };
+
+        /**
+         * Transforms a source file.
+         *
+         * @param sourceFile The source file to transform.
+         */
+        function transformSourceFile(sourceFile: SourceFile) {
+            if (isDeclarationFile(sourceFile)) {
+                return sourceFile;
+            }
+
+            return transformation(sourceFile);
+        }
+
+        /**
+         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
+         */
+        function enableSubstitution(kind: SyntaxKind) {
+            enabledSyntaxKindFeatures[kind] |= SyntaxKindFeatureFlags.Substitution;
+        }
+
+        /**
+         * Determines whether expression substitutions are enabled for the provided node.
+         */
+        function isSubstitutionEnabled(node: Node) {
+            return (enabledSyntaxKindFeatures[node.kind] & SyntaxKindFeatureFlags.Substitution) !== 0;
+        }
+
+        /**
+         * Default hook for node substitutions.
+         *
+         * @param node The node to substitute.
+         * @param isExpression A value indicating whether the node is to be used in an expression
+         *                     position.
+         */
+        function onSubstituteNode(node: Node, isExpression: boolean) {
+            return node;
+        }
+
+        /**
+         * Enables before/after emit notifications in the pretty printer for the provided SyntaxKind.
+         */
+        function enableEmitNotification(kind: SyntaxKind) {
+            enabledSyntaxKindFeatures[kind] |= SyntaxKindFeatureFlags.EmitNotifications;
+        }
+
+        /**
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
+         */
+        function isEmitNotificationEnabled(node: Node) {
+            return (enabledSyntaxKindFeatures[node.kind] & SyntaxKindFeatureFlags.EmitNotifications) !== 0
+                || (getNodeEmitFlags(node) & NodeEmitFlags.AdviseOnEmitNode) !== 0;
+        }
+
+        /**
+         * Default hook for node emit.
+         *
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(node: Node, emit: (node: Node) => void) {
+            emit(node);
+        }
+
+        /**
+         * Associates a node with the current transformation, initializing
+         * various transient transformation properties.
+         *
+         * @param node The node.
+         */
+        function beforeSetAnnotation(node: Node) {
+            if ((node.flags & NodeFlags.Synthesized) === 0 && node.transformId !== transformId) {
+                // To avoid holding onto transformation artifacts, we keep track of any
+                // parse tree node we are annotating. This allows us to clean them up after
+                // all transformations have completed.
+                parseTreeNodesWithAnnotations.push(node);
+                node.transformId = transformId;
+            }
+        }
+
+        /**
+         * Gets flags that control emit behavior of a node.
+         *
+         * If the node does not have its own NodeEmitFlags set, the node emit flags of its
+         * original pointer are used.
+         *
+         * @param node The node.
+         */
+        function getNodeEmitFlags(node: Node) {
+            return node.emitFlags;
+        }
+
+        /**
+         * Sets flags that control emit behavior of a node.
+         *
+         * @param node The node.
+         * @param emitFlags The NodeEmitFlags for the node.
+         */
+        function setNodeEmitFlags<T extends Node>(node: T, emitFlags: NodeEmitFlags) {
+            beforeSetAnnotation(node);
+            node.emitFlags = emitFlags;
+            return node;
+        }
+
+        /**
+         * Gets a custom text range to use when emitting source maps.
+         *
+         * If a node does not have its own custom source map text range, the custom source map
+         * text range of its original pointer is used.
+         *
+         * @param node The node.
+         */
+        function getSourceMapRange(node: Node) {
+            return node.sourceMapRange || node;
+        }
+
+        /**
+         * Sets a custom text range to use when emitting source maps.
+         *
+         * @param node The node.
+         * @param range The text range.
+         */
+        function setSourceMapRange<T extends Node>(node: T, range: TextRange) {
+            beforeSetAnnotation(node);
+            node.sourceMapRange = range;
+            return node;
+        }
+
+        /**
+         * Gets the TextRange to use for source maps for a token of a node.
+         *
+         * If a node does not have its own custom source map text range for a token, the custom
+         * source map text range for the token of its original pointer is used.
+         *
+         * @param node The node.
+         * @param token The token.
+         */
+        function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
+            // As a performance optimization, use the cached value of the most recent node.
+            // This helps for cases where this function is called repeatedly for the same node.
+            if (lastTokenSourceMapRangeNode === node && lastTokenSourceMapRangeToken === token) {
+                return lastTokenSourceMapRange;
+            }
+
+            // Get the custom token source map range for a node or from one of its original nodes.
+            // Custom token ranges are not stored on the node to avoid the GC burden.
+            let range: TextRange;
+            let current = node;
+            while (current) {
+                range = current.id ? tokenSourceMapRanges[current.id + "-" + token] : undefined;
+                if (range !== undefined) {
+                    break;
+                }
+
+                current = current.original;
+            }
+
+            // Cache the most recently requested value.
+            lastTokenSourceMapRangeNode = node;
+            lastTokenSourceMapRangeToken = token;
+            lastTokenSourceMapRange = range;
+            return range;
+        }
+
+        /**
+         * Sets the TextRange to use for source maps for a token of a node.
+         *
+         * @param node The node.
+         * @param token The token.
+         * @param range The text range.
+         */
+        function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange) {
+            // Cache the most recently requested value.
+            lastTokenSourceMapRangeNode = node;
+            lastTokenSourceMapRangeToken = token;
+            lastTokenSourceMapRange = range;
+            tokenSourceMapRanges[getNodeId(node) + "-" + token] = range;
+            return node;
+        }
+
+        /**
+         * Gets a custom text range to use when emitting comments.
+         *
+         * If a node does not have its own custom source map text range, the custom source map
+         * text range of its original pointer is used.
+         *
+         * @param node The node.
+         */
+        function getCommentRange(node: Node) {
+            return node.commentRange || node;
+        }
+
+        /**
+         * Sets a custom text range to use when emitting comments.
+         */
+        function setCommentRange<T extends Node>(node: T, range: TextRange) {
+            beforeSetAnnotation(node);
+            node.commentRange = range;
+            return node;
+        }
+
+        /**
+         * Records a hoisted variable declaration for the provided name within a lexical environment.
+         */
+        function hoistVariableDeclaration(name: Identifier): void {
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
+            const decl = createVariableDeclaration(name);
+            if (!hoistedVariableDeclarations) {
+                hoistedVariableDeclarations = [decl];
+            }
+            else {
+                hoistedVariableDeclarations.push(decl);
+            }
+        }
+
+        /**
+         * Records a hoisted function declaration within a lexical environment.
+         */
+        function hoistFunctionDeclaration(func: FunctionDeclaration): void {
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
+            if (!hoistedFunctionDeclarations) {
+                hoistedFunctionDeclarations = [func];
+            }
+            else {
+                hoistedFunctionDeclarations.push(func);
+            }
+        }
+
+        /**
+         * Starts a new lexical environment. Any existing hoisted variable or function declarations
+         * are pushed onto a stack, and the related storage variables are reset.
+         */
+        function startLexicalEnvironment(): void {
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot start a lexical environment during the print phase.");
+
+            // Save the current lexical environment. Rather than resizing the array we adjust the
+            // stack size variable. This allows us to reuse existing array slots we've
+            // already allocated between transformations to avoid allocation and GC overhead during
+            // transformation.
+            lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset] = hoistedVariableDeclarations;
+            lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset] = hoistedFunctionDeclarations;
+            lexicalEnvironmentStackOffset++;
+            hoistedVariableDeclarations = undefined;
+            hoistedFunctionDeclarations = undefined;
+        }
+
+        /**
+         * Ends a lexical environment. The previous set of hoisted declarations are restored and
+         * any hoisted declarations added in this environment are returned.
+         */
+        function endLexicalEnvironment(): Statement[] {
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot end a lexical environment during the print phase.");
+
+            let statements: Statement[];
+            if (hoistedVariableDeclarations || hoistedFunctionDeclarations) {
+                if (hoistedFunctionDeclarations) {
+                    statements = [...hoistedFunctionDeclarations];
+                }
+
+                if (hoistedVariableDeclarations) {
+                    const statement = createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createVariableDeclarationList(hoistedVariableDeclarations)
+                    );
+
+                    if (!statements) {
+                        statements = [statement];
+                    }
+                    else {
+                        statements.push(statement);
+                    }
+                }
+            }
+
+            // Restore the previous lexical environment.
+            lexicalEnvironmentStackOffset--;
+            hoistedVariableDeclarations = lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset];
+            hoistedFunctionDeclarations = lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset];
+            return statements;
+        }
+    }
+
+    /**
+     * High-order function, creates a function that executes a function composition.
+     * For example, `chain(a, b)` is the equivalent of `x => ((a', b') => y => b'(a'(y)))(a(x), b(x))`
+     *
+     * @param args The functions to chain.
+     */
+    function chain<T, U>(...args: ((t: T) => (u: U) => U)[]): (t: T) => (u: U) => U;
+    function chain<T, U>(a: (t: T) => (u: U) => U, b: (t: T) => (u: U) => U, c: (t: T) => (u: U) => U, d: (t: T) => (u: U) => U, e: (t: T) => (u: U) => U): (t: T) => (u: U) => U {
+        if (e) {
+            const args: ((t: T) => (u: U) => U)[] = [];
+            for (let i = 0; i < arguments.length; i++) {
+                args[i] = arguments[i];
+            }
+
+            return t => compose(...map(args, f => f(t)));
+        }
+        else if (d) {
+            return t => compose(a(t), b(t), c(t), d(t));
+        }
+        else if (c) {
+            return t => compose(a(t), b(t), c(t));
+        }
+        else if (b) {
+            return t => compose(a(t), b(t));
+        }
+        else if (a) {
+            return t => compose(a(t));
+        }
+        else {
+            return t => u => u;
+        }
+    }
+
+    /**
+     * High-order function, composes functions. Note that functions are composed inside-out;
+     * for example, `compose(a, b)` is the equivalent of `x => b(a(x))`.
+     *
+     * @param args The functions to compose.
+     */
+    function compose<T>(...args: ((t: T) => T)[]): (t: T) => T;
+    function compose<T>(a: (t: T) => T, b: (t: T) => T, c: (t: T) => T, d: (t: T) => T, e: (t: T) => T): (t: T) => T {
+        if (e) {
+            const args: ((t: T) => T)[] = [];
+            for (let i = 0; i < arguments.length; i++) {
+                args[i] = arguments[i];
+            }
+
+            return t => reduceLeft<(t: T) => T, T>(args, (u, f) => f(u), t);
+        }
+        else if (d) {
+            return t => d(c(b(a(t))));
+        }
+        else if (c) {
+            return t => c(b(a(t)));
+        }
+        else if (b) {
+            return t => b(a(t));
+        }
+        else if (a) {
+            return t => a(t);
+        }
+        else {
+            return t => t;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
new file mode 100644
index 00000000000..e211ca61f36
--- /dev/null
+++ b/src/compiler/transformers/destructuring.ts
@@ -0,0 +1,423 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    /**
+     * Flattens a destructuring assignment expression.
+     *
+     * @param root The destructuring assignment expression.
+     * @param needsValue Indicates whether the value from the right-hand-side of the
+     *                   destructuring assignment is needed as part of a larger expression.
+     * @param recordTempVariable A callback used to record new temporary variables.
+     * @param visitor An optional visitor to use to visit expressions.
+     */
+    export function flattenDestructuringAssignment(
+        context: TransformationContext,
+        node: BinaryExpression,
+        needsValue: boolean,
+        recordTempVariable: (node: Identifier) => void,
+        visitor?: (node: Node) => VisitResult<Node>): Expression {
+
+        if (isEmptyObjectLiteralOrArrayLiteral(node.left)) {
+            const right = node.right;
+            if (isDestructuringAssignment(right)) {
+                return flattenDestructuringAssignment(context, right, needsValue, recordTempVariable, visitor);
+            }
+            else {
+                return node.right;
+            }
+        }
+
+        let location: TextRange = node;
+        let value = node.right;
+        const expressions: Expression[] = [];
+        if (needsValue) {
+            // If the right-hand value of the destructuring assignment needs to be preserved (as
+            // is the case when the destructuring assignmen) is part of a larger expression),
+            // then we need to cache the right-hand value.
+            //
+            // The source map location for the assignment should point to the entire binary
+            // expression.
+            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment, visitor);
+        }
+        else if (nodeIsSynthesized(node)) {
+            // Generally, the source map location for a destructuring assignment is the root
+            // expression.
+            //
+            // However, if the root expression is synthesized (as in the case
+            // of the initializer when transforming a ForOfStatement), then the source map
+            // location should point to the right-hand value of the expression.
+            location = value;
+        }
+
+        flattenDestructuring(context, node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+
+        if (needsValue) {
+            expressions.push(value);
+        }
+
+        const expression = inlineExpressions(expressions);
+        aggregateTransformFlags(expression);
+        return expression;
+
+        function emitAssignment(name: Identifier, value: Expression, location: TextRange) {
+            const expression = createAssignment(name, value, location);
+
+            // NOTE: this completely disables source maps, but aligns with the behavior of
+            //       `emitAssignment` in the old emitter.
+            context.setNodeEmitFlags(expression, NodeEmitFlags.NoNestedSourceMaps);
+
+            aggregateTransformFlags(expression);
+            expressions.push(expression);
+        }
+
+        function emitTempVariableAssignment(value: Expression, location: TextRange) {
+            const name = createTempVariable(recordTempVariable);
+            emitAssignment(name, value, location);
+            return name;
+        }
+    }
+
+    /**
+     * Flattens binding patterns in a parameter declaration.
+     *
+     * @param node The ParameterDeclaration to flatten.
+     * @param value The rhs value for the binding pattern.
+     * @param visitor An optional visitor to use to visit expressions.
+     */
+    export function flattenParameterDestructuring(
+        context: TransformationContext,
+        node: ParameterDeclaration,
+        value: Expression,
+        visitor?: (node: Node) => VisitResult<Node>) {
+        const declarations: VariableDeclaration[] = [];
+
+        flattenDestructuring(context, node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+
+        return declarations;
+
+        function emitAssignment(name: Identifier, value: Expression, location: TextRange) {
+            const declaration = createVariableDeclaration(name, /*type*/ undefined, value, location);
+
+            // NOTE: this completely disables source maps, but aligns with the behavior of
+            //       `emitAssignment` in the old emitter.
+            context.setNodeEmitFlags(declaration, NodeEmitFlags.NoNestedSourceMaps);
+
+            aggregateTransformFlags(declaration);
+            declarations.push(declaration);
+        }
+
+        function emitTempVariableAssignment(value: Expression, location: TextRange) {
+            const name = createTempVariable(/*recordTempVariable*/ undefined);
+            emitAssignment(name, value, location);
+            return name;
+        }
+    }
+
+    /**
+     * Flattens binding patterns in a variable declaration.
+     *
+     * @param node The VariableDeclaration to flatten.
+     * @param value An optional rhs value for the binding pattern.
+     * @param visitor An optional visitor to use to visit expressions.
+     */
+    export function flattenVariableDestructuring(
+        context: TransformationContext,
+        node: VariableDeclaration,
+        value?: Expression,
+        visitor?: (node: Node) => VisitResult<Node>) {
+        const declarations: VariableDeclaration[] = [];
+
+        flattenDestructuring(context, node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+
+        return declarations;
+
+        function emitAssignment(name: Identifier, value: Expression, location: TextRange, original: Node) {
+            const declaration = createVariableDeclaration(name, /*type*/ undefined, value, location);
+            declaration.original = original;
+
+            // NOTE: this completely disables source maps, but aligns with the behavior of
+            //       `emitAssignment` in the old emitter.
+            context.setNodeEmitFlags(declaration, NodeEmitFlags.NoNestedSourceMaps);
+
+            declarations.push(declaration);
+            aggregateTransformFlags(declaration);
+        }
+
+        function emitTempVariableAssignment(value: Expression, location: TextRange) {
+            const name = createTempVariable(/*recordTempVariable*/ undefined);
+            emitAssignment(name, value, location, /*original*/ undefined);
+            return name;
+        }
+    }
+
+    /**
+     * Flattens binding patterns in a variable declaration and transforms them into an expression.
+     *
+     * @param node The VariableDeclaration to flatten.
+     * @param recordTempVariable A callback used to record new temporary variables.
+     * @param nameSubstitution An optional callback used to substitute binding names.
+     * @param visitor An optional visitor to use to visit expressions.
+     */
+    export function flattenVariableDestructuringToExpression(
+        context: TransformationContext,
+        node: VariableDeclaration,
+        recordTempVariable: (name: Identifier) => void,
+        nameSubstitution?: (name: Identifier) => Expression,
+        visitor?: (node: Node) => VisitResult<Node>) {
+
+        const pendingAssignments: Expression[] = [];
+
+        flattenDestructuring(context, node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+
+        const expression = inlineExpressions(pendingAssignments);
+        aggregateTransformFlags(expression);
+        return expression;
+
+        function emitAssignment(name: Identifier, value: Expression, location: TextRange, original: Node) {
+            const left = nameSubstitution && nameSubstitution(name) || name;
+            emitPendingAssignment(left, value, location, original);
+        }
+
+        function emitTempVariableAssignment(value: Expression, location: TextRange) {
+            const name = createTempVariable(recordTempVariable);
+            emitPendingAssignment(name, value, location, /*original*/ undefined);
+            return name;
+        }
+
+        function emitPendingAssignment(name: Expression, value: Expression, location: TextRange, original: Node) {
+            const expression = createAssignment(name, value, location);
+            expression.original = original;
+
+            // NOTE: this completely disables source maps, but aligns with the behavior of
+            //       `emitAssignment` in the old emitter.
+            context.setNodeEmitFlags(expression, NodeEmitFlags.NoNestedSourceMaps);
+
+            pendingAssignments.push(expression);
+            return expression;
+        }
+    }
+
+    function flattenDestructuring(
+        context: TransformationContext,
+        root: BindingElement | BinaryExpression,
+        value: Expression,
+        location: TextRange,
+        emitAssignment: (name: Identifier, value: Expression, location: TextRange, original: Node) => void,
+        emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
+        visitor?: (node: Node) => VisitResult<Node>) {
+        if (value && visitor) {
+            value = visitNode(value, visitor, isExpression);
+        }
+
+        if (isBinaryExpression(root)) {
+            emitDestructuringAssignment(root.left, value, location);
+        }
+        else {
+            emitBindingElement(root, value);
+        }
+
+        function emitDestructuringAssignment(bindingTarget: Expression | ShorthandPropertyAssignment, value: Expression, location: TextRange) {
+            // When emitting target = value use source map node to highlight, including any temporary assignments needed for this
+            let target: Expression;
+            if (isShorthandPropertyAssignment(bindingTarget)) {
+                const initializer = visitor
+                    ? visitNode(bindingTarget.objectAssignmentInitializer, visitor, isExpression)
+                    : bindingTarget.objectAssignmentInitializer;
+
+                if (initializer) {
+                    value = createDefaultValueCheck(value, initializer, location);
+                }
+
+                target = bindingTarget.name;
+            }
+            else if (isBinaryExpression(bindingTarget) && bindingTarget.operatorToken.kind === SyntaxKind.EqualsToken) {
+                const initializer = visitor
+                    ? visitNode(bindingTarget.right, visitor, isExpression)
+                    : bindingTarget.right;
+
+                value = createDefaultValueCheck(value, initializer, location);
+                target = bindingTarget.left;
+            }
+            else {
+                target = bindingTarget;
+            }
+
+            if (target.kind === SyntaxKind.ObjectLiteralExpression) {
+                emitObjectLiteralAssignment(<ObjectLiteralExpression>target, value, location);
+            }
+            else if (target.kind === SyntaxKind.ArrayLiteralExpression) {
+                emitArrayLiteralAssignment(<ArrayLiteralExpression>target, value, location);
+            }
+            else {
+                const name = getMutableClone(<Identifier>target);
+                context.setSourceMapRange(name, target);
+                context.setCommentRange(name, target);
+                emitAssignment(name, value, location, /*original*/ undefined);
+            }
+        }
+
+        function emitObjectLiteralAssignment(target: ObjectLiteralExpression, value: Expression, location: TextRange) {
+            const properties = target.properties;
+            if (properties.length !== 1) {
+                // For anything but a single element destructuring we need to generate a temporary
+                // to ensure value is evaluated exactly once.
+                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
+                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            }
+
+            for (const p of properties) {
+                if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
+                    const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
+                    const target = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
+                    // Assignment for target = value.propName should highligh whole property, hence use p as source map node
+                    emitDestructuringAssignment(target, createDestructuringPropertyAccess(value, propName), p);
+                }
+            }
+        }
+
+        function emitArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
+            const elements = target.elements;
+            const numElements = elements.length;
+            if (numElements !== 1) {
+                // For anything but a single element destructuring we need to generate a temporary
+                // to ensure value is evaluated exactly once.
+                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
+                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            }
+
+            for (let i = 0; i < numElements; i++) {
+                const e = elements[i];
+                if (e.kind !== SyntaxKind.OmittedExpression) {
+                    // Assignment for target = value.propName should highligh whole property, hence use e as source map node
+                    if (e.kind !== SyntaxKind.SpreadElementExpression) {
+                        emitDestructuringAssignment(e, createElementAccess(value, createLiteral(i)), e);
+                    }
+                    else if (i === numElements - 1) {
+                        emitDestructuringAssignment((<SpreadElementExpression>e).expression, createArraySlice(value, i), e);
+                    }
+                }
+            }
+        }
+
+        function emitBindingElement(target: BindingElement, value: Expression) {
+            // Any temporary assignments needed to emit target = value should point to target
+            const initializer = visitor ? visitNode(target.initializer, visitor, isExpression) : target.initializer;
+            if (initializer) {
+                // Combine value and initializer
+                value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
+            }
+            else if (!value) {
+                // Use 'void 0' in absence of value and initializer
+                value = createVoidZero();
+            }
+
+            const name = target.name;
+            if (isBindingPattern(name)) {
+                const elements = name.elements;
+                const numElements = elements.length;
+                if (numElements !== 1) {
+                    // For anything other than a single-element destructuring we need to generate a temporary
+                    // to ensure value is evaluated exactly once. Additionally, if we have zero elements
+                    // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
+                    // so in that case, we'll intentionally create that temporary.
+                    value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
+                }
+                for (let i = 0; i < numElements; i++) {
+                    const element = elements[i];
+                    if (name.kind === SyntaxKind.ObjectBindingPattern) {
+                        // Rewrite element to a declaration with an initializer that fetches property
+                        const propName = element.propertyName || <Identifier>element.name;
+                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                    }
+                    else if (element.kind !== SyntaxKind.OmittedExpression) {
+                        if (!element.dotDotDotToken) {
+                            // Rewrite element to a declaration that accesses array element at index i
+                            emitBindingElement(element, createElementAccess(value, i));
+                        }
+                        else if (i === numElements - 1) {
+                            emitBindingElement(element, createArraySlice(value, i));
+                        }
+                    }
+                }
+            }
+            else {
+                emitAssignment(name, value, target, target);
+            }
+        }
+
+        function createDefaultValueCheck(value: Expression, defaultValue: Expression, location: TextRange): Expression {
+            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            return createConditional(
+                createStrictEquality(value, createVoidZero()),
+                createToken(SyntaxKind.QuestionToken),
+                defaultValue,
+                createToken(SyntaxKind.ColonToken),
+                value
+            );
+        }
+
+        /**
+         * Creates either a PropertyAccessExpression or an ElementAccessExpression for the
+         * right-hand side of a transformed destructuring assignment.
+         *
+         * @param expression The right-hand expression that is the source of the property.
+         * @param propertyName The destructuring property name.
+         */
+        function createDestructuringPropertyAccess(expression: Expression, propertyName: PropertyName): LeftHandSideExpression {
+            if (isComputedPropertyName(propertyName)) {
+                return createElementAccess(
+                    expression,
+                    ensureIdentifier(propertyName.expression, /*reuseIdentifierExpressions*/ false, /*location*/ propertyName, emitTempVariableAssignment)
+                );
+            }
+            else if (isLiteralExpression(propertyName)) {
+                const clone = getSynthesizedClone(propertyName);
+                clone.text = unescapeIdentifier(clone.text);
+                return createElementAccess(expression, clone);
+            }
+            else {
+                if (isGeneratedIdentifier(propertyName)) {
+                    const clone = getSynthesizedClone(propertyName);
+                    clone.text = unescapeIdentifier(clone.text);
+                    return createPropertyAccess(expression, clone);
+                }
+                else {
+                    return createPropertyAccess(expression, createIdentifier(unescapeIdentifier(propertyName.text)));
+                }
+            }
+        }
+    }
+
+    /**
+     * Ensures that there exists a declared identifier whose value holds the given expression.
+     * This function is useful to ensure that the expression's value can be read from in subsequent expressions.
+     * Unless 'reuseIdentifierExpressions' is false, 'value' will be returned if it is just an identifier.
+     *
+     * @param value the expression whose value needs to be bound.
+     * @param reuseIdentifierExpressions true if identifier expressions can simply be returned;
+     *                                   false if it is necessary to always emit an identifier.
+     * @param location The location to use for source maps and comments.
+     * @param emitTempVariableAssignment A callback used to emit a temporary variable.
+     * @param visitor An optional callback used to visit the value.
+     */
+    function ensureIdentifier(
+        value: Expression,
+        reuseIdentifierExpressions: boolean,
+        location: TextRange,
+        emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
+        visitor?: (node: Node) => VisitResult<Node>) {
+
+        if (isIdentifier(value) && reuseIdentifierExpressions) {
+            return value;
+        }
+        else {
+            if (visitor) {
+                value = visitNode(value, visitor, isExpression);
+            }
+
+            return emitTempVariableAssignment(value, location);
+        }
+    }
+}
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
new file mode 100644
index 00000000000..4e994c1acb0
--- /dev/null
+++ b/src/compiler/transformers/es6.ts
@@ -0,0 +1,3024 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+
+    const enum ES6SubstitutionFlags {
+        /** Enables substitutions for captured `this` */
+        CapturedThis = 1 << 0,
+        /** Enables substitutions for block-scoped bindings. */
+        BlockScopedBindings = 1 << 1,
+    }
+    /**
+     * If loop contains block scoped binding captured in some function then loop body is converted to a function.
+     * Lexical bindings declared in loop initializer will be passed into the loop body function as parameters,
+     * however if this binding is modified inside the body - this new value should be propagated back to the original binding.
+     * This is done by declaring new variable (out parameter holder) outside of the loop for every binding that is reassigned inside the body.
+     * On every iteration this variable is initialized with value of corresponding binding.
+     * At every point where control flow leaves the loop either explicitly (break/continue) or implicitly (at the end of loop body)
+     * we copy the value inside the loop to the out parameter holder.
+     *
+     * for (let x;;) {
+     *     let a = 1;
+     *     let b = () => a;
+     *     x++
+     *     if (...) break;
+     *     ...
+     * }
+     *
+     * will be converted to
+     *
+     * var out_x;
+     * var loop = function(x) {
+     *     var a = 1;
+     *     var b = function() { return a; }
+     *     x++;
+     *     if (...) return out_x = x, "break";
+     *     ...
+     *     out_x = x;
+     * }
+     * for (var x;;) {
+     *     out_x = x;
+     *     var state = loop(x);
+     *     x = out_x;
+     *     if (state === "break") break;
+     * }
+     *
+     * NOTE: values to out parameters are not copies if loop is abrupted with 'return' - in this case this will end the entire enclosing function
+     * so nobody can observe this new value.
+     */
+    interface LoopOutParameter {
+        originalName: Identifier;
+        outParamName: Identifier;
+    }
+
+    const enum CopyDirection {
+        ToOriginal,
+        ToOutParameter
+    }
+
+    const enum Jump {
+        Break       = 1 << 1,
+        Continue    = 1 << 2,
+        Return      = 1 << 3
+    }
+
+    interface ConvertedLoopState {
+        /*
+         * set of labels that occurred inside the converted loop
+         * used to determine if labeled jump can be emitted as is or it should be dispatched to calling code
+         */
+        labels?: Map<string>;
+        /*
+         * collection of labeled jumps that transfer control outside the converted loop.
+         * maps store association 'label -> labelMarker' where
+         * - label - value of label as it appear in code
+         * - label marker - return value that should be interpreted by calling code as 'jump to <label>'
+         */
+        labeledNonLocalBreaks?: Map<string>;
+        labeledNonLocalContinues?: Map<string>;
+
+        /*
+         * set of non-labeled jumps that transfer control outside the converted loop
+         * used to emit dispatching logic in the caller of converted loop
+         */
+        nonLocalJumps?: Jump;
+
+        /*
+         * set of non-labeled jumps that should be interpreted as local
+         * i.e. if converted loop contains normal loop or switch statement then inside this loop break should be treated as local jump
+         */
+        allowedNonLabeledJumps?: Jump;
+
+        /*
+         * alias for 'arguments' object from the calling code stack frame
+         * i.e.
+         * for (let x;;) <statement that captures x in closure and uses 'arguments'>
+         * should be converted to
+         * var loop = function(x) { <code where 'arguments' is replaced with 'arguments_1'> }
+         * var arguments_1 = arguments
+         * for (var x;;) loop(x);
+         * otherwise semantics of the code will be different since 'arguments' inside converted loop body
+         * will refer to function that holds converted loop.
+         * This value is set on demand.
+         */
+        argumentsName?: Identifier;
+
+        /*
+         * alias for 'this' from the calling code stack frame in case if this was used inside the converted loop
+         */
+        thisName?: Identifier;
+
+        /*
+         * set to true if node contains lexical 'this' so we can mark function that wraps convered loop body as 'CapturedThis' for subsequent substitution.
+         */
+        containsLexicalThis?: boolean;
+
+        /*
+         * list of non-block scoped variable declarations that appear inside converted loop
+         * such variable declarations should be moved outside the loop body
+         * for (let x;;) {
+         *     var y = 1;
+         *     ...
+         * }
+         * should be converted to
+         * var loop = function(x) {
+         *    y = 1;
+         *    ...
+         * }
+         * var y;
+         * for (var x;;) loop(x);
+         */
+        hoistedLocalVariables?: Identifier[];
+
+        /**
+         * List of loop out parameters - detailed descripion can be found in the comment to LoopOutParameter
+         */
+        loopOutParameters?: LoopOutParameter[];
+    }
+
+    export function transformES6(context: TransformationContext) {
+        const {
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            hoistVariableDeclaration,
+            getNodeEmitFlags,
+            setNodeEmitFlags,
+            getCommentRange,
+            setCommentRange,
+            getSourceMapRange,
+            setSourceMapRange,
+            setTokenSourceMapRange,
+        } = context;
+
+        const resolver = context.getEmitResolver();
+        const previousOnSubstituteNode = context.onSubstituteNode;
+        const previousOnEmitNode = context.onEmitNode;
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+
+        let currentSourceFile: SourceFile;
+        let currentText: string;
+        let currentParent: Node;
+        let currentNode: Node;
+        let enclosingBlockScopeContainer: Node;
+        let enclosingBlockScopeContainerParent: Node;
+        let containingNonArrowFunction: FunctionLikeDeclaration | ClassElement;
+
+        /**
+         * Used to track if we are emitting body of the converted loop
+         */
+        let convertedLoopState: ConvertedLoopState;
+
+        /**
+         * Keeps track of whether substitutions have been enabled for specific cases.
+         * They are persisted between each SourceFile transformation and should not
+         * be reset.
+         */
+        let enabledSubstitutions: ES6SubstitutionFlags;
+
+        /**
+         * This is used to determine whether we need to emit `_this` instead of `this`.
+         */
+        let useCapturedThis: boolean;
+
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            currentSourceFile = node;
+            currentText = node.text;
+            return visitNode(node, visitor, isSourceFile);
+        }
+
+        function visitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, dispatcher);
+        }
+
+        function dispatcher(node: Node): VisitResult<Node> {
+            return convertedLoopState
+                ? visitorForConvertedLoopWorker(node)
+                : visitorWorker(node);
+        }
+
+        function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {
+            const savedContainingNonArrowFunction = containingNonArrowFunction;
+            const savedCurrentParent = currentParent;
+            const savedCurrentNode = currentNode;
+            const savedEnclosingBlockScopeContainer = enclosingBlockScopeContainer;
+            const savedEnclosingBlockScopeContainerParent = enclosingBlockScopeContainerParent;
+
+            const savedConvertedLoopState = convertedLoopState;
+            if (nodeStartsNewLexicalEnvironment(node)) {
+                // don't treat content of nodes that start new lexical environment as part of converted loop copy
+                convertedLoopState = undefined;
+            }
+
+            onBeforeVisitNode(node);
+            const visited = f(node);
+
+            convertedLoopState = savedConvertedLoopState;
+            containingNonArrowFunction = savedContainingNonArrowFunction;
+            currentParent = savedCurrentParent;
+            currentNode = savedCurrentNode;
+            enclosingBlockScopeContainer = savedEnclosingBlockScopeContainer;
+            enclosingBlockScopeContainerParent = savedEnclosingBlockScopeContainerParent;
+            return visited;
+        }
+
+        function shouldCheckNode(node: Node): boolean {
+            return (node.transformFlags & TransformFlags.ES6) !== 0 ||
+                node.kind === SyntaxKind.LabeledStatement ||
+                (isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatementBody(node));
+        }
+
+        function visitorWorker(node: Node): VisitResult<Node> {
+            if (shouldCheckNode(node)) {
+                return visitJavaScript(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsES6) {
+                return visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+
+        function visitorForConvertedLoopWorker(node: Node): VisitResult<Node> {
+            const savedUseCapturedThis = useCapturedThis;
+
+            if (nodeStartsNewLexicalEnvironment(node)) {
+                useCapturedThis = false;
+            }
+
+            let result: VisitResult<Node>;
+
+            if (shouldCheckNode(node)) {
+                result = visitJavaScript(node);
+            }
+            else {
+                result = visitNodesInConvertedLoop(node);
+            }
+
+            useCapturedThis = savedUseCapturedThis;
+            return result;
+        }
+
+        function visitNodesInConvertedLoop(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ReturnStatement:
+                    return visitReturnStatement(<ReturnStatement>node);
+
+                case SyntaxKind.VariableStatement:
+                    return visitVariableStatement(<VariableStatement>node);
+
+                case SyntaxKind.SwitchStatement:
+                    return visitSwitchStatement(<SwitchStatement>node);
+
+                case SyntaxKind.BreakStatement:
+                case SyntaxKind.ContinueStatement:
+                    return visitBreakOrContinueStatement(<BreakOrContinueStatement>node);
+
+                case SyntaxKind.ThisKeyword:
+                    return visitThisKeyword(node);
+
+                case SyntaxKind.Identifier:
+                    return visitIdentifier(<Identifier>node);
+
+                default:
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function visitJavaScript(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ExportKeyword:
+                    return node;
+
+                case SyntaxKind.ClassDeclaration:
+                    return visitClassDeclaration(<ClassDeclaration>node);
+
+                case SyntaxKind.ClassExpression:
+                    return visitClassExpression(<ClassExpression>node);
+
+                case SyntaxKind.Parameter:
+                    return visitParameter(<ParameterDeclaration>node);
+
+                case SyntaxKind.FunctionDeclaration:
+                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+
+                case SyntaxKind.ArrowFunction:
+                    return visitArrowFunction(<ArrowFunction>node);
+
+                case SyntaxKind.FunctionExpression:
+                    return visitFunctionExpression(<FunctionExpression>node);
+
+                case SyntaxKind.VariableDeclaration:
+                    return visitVariableDeclaration(<VariableDeclaration>node, /*offset*/ undefined);
+
+                case SyntaxKind.Identifier:
+                    return visitIdentifier(<Identifier>node);
+
+                case SyntaxKind.VariableDeclarationList:
+                    return visitVariableDeclarationList(<VariableDeclarationList>node);
+
+                case SyntaxKind.LabeledStatement:
+                    return visitLabeledStatement(<LabeledStatement>node);
+
+                case SyntaxKind.DoStatement:
+                    return visitDoStatement(<DoStatement>node);
+
+                case SyntaxKind.WhileStatement:
+                    return visitWhileStatement(<WhileStatement>node);
+
+                case SyntaxKind.ForStatement:
+                    return visitForStatement(<ForStatement>node);
+
+                case SyntaxKind.ForInStatement:
+                    return visitForInStatement(<ForInStatement>node);
+
+                case SyntaxKind.ForOfStatement:
+                    return visitForOfStatement(<ForOfStatement>node);
+
+                case SyntaxKind.ExpressionStatement:
+                    return visitExpressionStatement(<ExpressionStatement>node);
+
+                case SyntaxKind.ObjectLiteralExpression:
+                    return visitObjectLiteralExpression(<ObjectLiteralExpression>node);
+
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    return visitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
+
+                case SyntaxKind.ArrayLiteralExpression:
+                    return visitArrayLiteralExpression(<ArrayLiteralExpression>node);
+
+                case SyntaxKind.CallExpression:
+                    return visitCallExpression(<CallExpression>node);
+
+                case SyntaxKind.NewExpression:
+                    return visitNewExpression(<NewExpression>node);
+
+                case SyntaxKind.ParenthesizedExpression:
+                    return visitParenthesizedExpression(<ParenthesizedExpression>node, /*needsDestructuringValue*/ true);
+
+                case SyntaxKind.BinaryExpression:
+                    return visitBinaryExpression(<BinaryExpression>node, /*needsDestructuringValue*/ true);
+
+                case SyntaxKind.NoSubstitutionTemplateLiteral:
+                case SyntaxKind.TemplateHead:
+                case SyntaxKind.TemplateMiddle:
+                case SyntaxKind.TemplateTail:
+                    return visitTemplateLiteral(<LiteralExpression>node);
+
+                case SyntaxKind.TaggedTemplateExpression:
+                    return visitTaggedTemplateExpression(<TaggedTemplateExpression>node);
+
+                case SyntaxKind.TemplateExpression:
+                    return visitTemplateExpression(<TemplateExpression>node);
+
+                case SyntaxKind.YieldExpression:
+                    return visitYieldExpression(<YieldExpression>node);
+
+                case SyntaxKind.SuperKeyword:
+                    return visitSuperKeyword(<PrimaryExpression>node);
+
+                case SyntaxKind.YieldExpression:
+                    // `yield` will be handled by a generators transform.
+                    return visitEachChild(node, visitor, context);
+
+                case SyntaxKind.MethodDeclaration:
+                    return visitMethodDeclaration(<MethodDeclaration>node);
+
+                case SyntaxKind.SourceFile:
+                    return visitSourceFileNode(<SourceFile>node);
+
+                case SyntaxKind.VariableStatement:
+                    return visitVariableStatement(<VariableStatement>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
+
+        }
+
+        function onBeforeVisitNode(node: Node) {
+            const currentGrandparent = currentParent;
+            currentParent = currentNode;
+            currentNode = node;
+
+            if (currentParent) {
+                if (isBlockScope(currentParent, currentGrandparent)) {
+                    enclosingBlockScopeContainer = currentParent;
+                    enclosingBlockScopeContainerParent = currentGrandparent;
+                }
+
+                switch (currentParent.kind) {
+                    case SyntaxKind.Constructor:
+                    case SyntaxKind.MethodDeclaration:
+                    case SyntaxKind.GetAccessor:
+                    case SyntaxKind.SetAccessor:
+                    case SyntaxKind.FunctionDeclaration:
+                    case SyntaxKind.FunctionExpression:
+                        containingNonArrowFunction = <FunctionLikeDeclaration>currentParent;
+                        break;
+                }
+            }
+        }
+
+        function visitSwitchStatement(node: SwitchStatement): SwitchStatement {
+            Debug.assert(convertedLoopState !== undefined);
+
+            const savedAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+            // for switch statement allow only non-labeled break
+            convertedLoopState.allowedNonLabeledJumps |= Jump.Break;
+
+            const result = visitEachChild(node, visitor, context);
+
+            convertedLoopState.allowedNonLabeledJumps = savedAllowedNonLabeledJumps;
+            return result;
+        }
+
+        function visitReturnStatement(node: ReturnStatement): Statement {
+            Debug.assert(convertedLoopState !== undefined);
+
+            convertedLoopState.nonLocalJumps |= Jump.Return;
+            return createReturn(
+                createObjectLiteral(
+                    [
+                        createPropertyAssignment(
+                            createIdentifier("value"),
+                            node.expression
+                                ? visitNode(node.expression, visitor, isExpression)
+                                : createVoidZero()
+                        )
+                    ]
+                )
+            );
+        }
+
+        function visitThisKeyword(node: Node): Node {
+            Debug.assert(convertedLoopState !== undefined);
+
+            if (useCapturedThis) {
+                // if useCapturedThis is true then 'this' keyword is contained inside an arrow function.
+                convertedLoopState.containsLexicalThis = true;
+                return node;
+            }
+            return convertedLoopState.thisName || (convertedLoopState.thisName = createUniqueName("this"));
+        }
+
+        function visitIdentifier(node: Identifier): Identifier {
+            if (!convertedLoopState) {
+                return node;
+            }
+            if (isGeneratedIdentifier(node)) {
+                return node;
+            }
+            if (node.text !== "arguments" && !resolver.isArgumentsLocalBinding(node)) {
+                return node;
+            }
+            return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = createUniqueName("arguments"));
+        }
+
+        function visitBreakOrContinueStatement(node: BreakOrContinueStatement): Statement {
+            if (convertedLoopState) {
+                // check if we can emit break/continue as is
+                // it is possible if either
+                //   - break/continue is labeled and label is located inside the converted loop
+                //   - break/continue is non-labeled and located in non-converted loop/switch statement
+                const jump = node.kind === SyntaxKind.BreakStatement ? Jump.Break : Jump.Continue;
+                const canUseBreakOrContinue =
+                    (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
+                    (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+
+                if (!canUseBreakOrContinue) {
+                    let labelMarker: string;
+                    if (!node.label) {
+                        if (node.kind === SyntaxKind.BreakStatement) {
+                            convertedLoopState.nonLocalJumps |= Jump.Break;
+                            labelMarker = "break";
+                        }
+                        else {
+                            convertedLoopState.nonLocalJumps |= Jump.Continue;
+                            // note: return value is emitted only to simplify debugging, call to converted loop body does not do any dispatching on it.
+                            labelMarker = "continue";
+                        }
+                    }
+                    else {
+                        if (node.kind === SyntaxKind.BreakStatement) {
+                            labelMarker = `break-${node.label.text}`;
+                            setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
+                        }
+                        else {
+                            labelMarker = `continue-${node.label.text}`;
+                            setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
+                        }
+                    }
+                    let returnExpression: Expression = createLiteral(labelMarker);
+                    if (convertedLoopState.loopOutParameters.length) {
+                        const outParams = convertedLoopState.loopOutParameters;
+                        let expr: Expression;
+                        for (let i = 0; i < outParams.length; i++) {
+                            const copyExpr = copyOutParameter(outParams[i], CopyDirection.ToOutParameter);
+                            if (i === 0) {
+                                expr = copyExpr;
+                            }
+                            else {
+                                expr = createBinary(expr, SyntaxKind.CommaToken, copyExpr);
+                            }
+                        }
+                        returnExpression = createBinary(expr, SyntaxKind.CommaToken, returnExpression);
+                    }
+                    return createReturn(returnExpression);
+                }
+            }
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a ClassDeclaration and transforms it into a variable statement.
+         *
+         * @param node A ClassDeclaration node.
+         */
+        function visitClassDeclaration(node: ClassDeclaration): Statement {
+            // [source]
+            //      class C { }
+            //
+            // [output]
+            //      var C = (function () {
+            //          function C() {
+            //          }
+            //          return C;
+            //      }());
+
+            const statement = createVariableStatement(
+                /*modifiers*/ undefined,
+                createVariableDeclarationList([
+                    createVariableDeclaration(
+                        getDeclarationName(node, /*allowComments*/ true),
+                        /*type*/ undefined,
+                        transformClassLikeDeclarationToExpression(node)
+                    )
+                ]),
+                /*location*/ node
+            );
+
+            setOriginalNode(statement, node);
+            startOnNewLine(statement);
+            return statement;
+        }
+
+        /**
+         * Visits a ClassExpression and transforms it into an expression.
+         *
+         * @param node A ClassExpression node.
+         */
+        function visitClassExpression(node: ClassExpression): Expression {
+            // [source]
+            //      C = class { }
+            //
+            // [output]
+            //      C = (function () {
+            //          function class_1() {
+            //          }
+            //          return class_1;
+            //      }())
+
+            return transformClassLikeDeclarationToExpression(node);
+        }
+
+        /**
+         * Transforms a ClassExpression or ClassDeclaration into an expression.
+         *
+         * @param node A ClassExpression or ClassDeclaration node.
+         */
+        function transformClassLikeDeclarationToExpression(node: ClassExpression | ClassDeclaration): Expression {
+            // [source]
+            //      class C extends D {
+            //          constructor() {}
+            //          method() {}
+            //          get prop() {}
+            //          set prop(v) {}
+            //      }
+            //
+            // [output]
+            //      (function (_super) {
+            //          __extends(C, _super);
+            //          function C() {
+            //          }
+            //          C.prototype.method = function () {}
+            //          Object.defineProperty(C.prototype, "prop", {
+            //              get: function() {},
+            //              set: function() {},
+            //              enumerable: true,
+            //              configurable: true
+            //          });
+            //          return C;
+            //      }(D))
+
+            if (node.name) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+
+            const extendsClauseElement = getClassExtendsHeritageClauseElement(node);
+            const classFunction = createFunctionExpression(
+                /*asteriskToken*/ undefined,
+                /*name*/ undefined,
+                /*typeParameters*/ undefined,
+                extendsClauseElement ? [createParameter("_super")] : [],
+                /*type*/ undefined,
+                transformClassBody(node, extendsClauseElement)
+            );
+
+            // To preserve the behavior of the old emitter, we explicitly indent
+            // the body of the function here if it was requested in an earlier
+            // transformation.
+            if (getNodeEmitFlags(node) & NodeEmitFlags.Indented) {
+                setNodeEmitFlags(classFunction, NodeEmitFlags.Indented);
+            }
+
+            // "inner" and "outer" below are added purely to preserve source map locations from
+            // the old emitter
+            const inner = createPartiallyEmittedExpression(classFunction);
+            inner.end = node.end;
+            setNodeEmitFlags(inner, NodeEmitFlags.NoComments);
+
+            const outer = createPartiallyEmittedExpression(inner);
+            outer.end = skipTrivia(currentText, node.pos);
+            setNodeEmitFlags(outer, NodeEmitFlags.NoComments);
+
+            return createParen(
+                createCall(
+                    outer,
+                    /*typeArguments*/ undefined,
+                    extendsClauseElement
+                        ? [visitNode(extendsClauseElement.expression, visitor, isExpression)]
+                        : []
+                )
+            );
+        }
+
+        /**
+         * Transforms a ClassExpression or ClassDeclaration into a function body.
+         *
+         * @param node A ClassExpression or ClassDeclaration node.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         */
+        function transformClassBody(node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): Block {
+            const statements: Statement[] = [];
+            startLexicalEnvironment();
+            addExtendsHelperIfNeeded(statements, node, extendsClauseElement);
+            addConstructor(statements, node, extendsClauseElement);
+            addClassMembers(statements, node);
+
+            // Create a synthetic text range for the return statement.
+            const closingBraceLocation = createTokenRange(skipTrivia(currentText, node.members.end), SyntaxKind.CloseBraceToken);
+            const localName = getLocalName(node);
+
+            // The following partially-emitted expression exists purely to align our sourcemap
+            // emit with the original emitter.
+            const outer = createPartiallyEmittedExpression(localName);
+            outer.end = closingBraceLocation.end;
+            setNodeEmitFlags(outer, NodeEmitFlags.NoComments);
+
+            const statement = createReturn(outer);
+            statement.pos = closingBraceLocation.pos;
+            setNodeEmitFlags(statement, NodeEmitFlags.NoComments | NodeEmitFlags.NoTokenSourceMaps);
+            statements.push(statement);
+
+            addRange(statements, endLexicalEnvironment());
+
+            const block = createBlock(createNodeArray(statements, /*location*/ node.members), /*location*/ undefined, /*multiLine*/ true);
+            setNodeEmitFlags(block, NodeEmitFlags.NoComments);
+            return block;
+        }
+
+        /**
+         * Adds a call to the `__extends` helper if needed for a class.
+         *
+         * @param statements The statements of the class body function.
+         * @param node The ClassExpression or ClassDeclaration node.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         */
+        function addExtendsHelperIfNeeded(statements: Statement[], node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): void {
+            if (extendsClauseElement) {
+                statements.push(
+                    createStatement(
+                        createExtendsHelper(currentSourceFile.externalHelpersModuleName, getDeclarationName(node)),
+                        /*location*/ extendsClauseElement
+                    )
+                );
+            }
+        }
+
+        /**
+         * Adds the constructor of the class to a class body function.
+         *
+         * @param statements The statements of the class body function.
+         * @param node The ClassExpression or ClassDeclaration node.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         */
+        function addConstructor(statements: Statement[], node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): void {
+            const constructor = getFirstConstructorWithBody(node);
+            const hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
+            statements.push(
+                createFunctionDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    /*asteriskToken*/ undefined,
+                    getDeclarationName(node),
+                    /*typeParameters*/ undefined,
+                    transformConstructorParameters(constructor, hasSynthesizedSuper),
+                    /*type*/ undefined,
+                    transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper),
+                    /*location*/ constructor || node
+                )
+            );
+        }
+
+        /**
+         * Transforms the parameters of the constructor declaration of a class.
+         *
+         * @param constructor The constructor for the class.
+         * @param hasSynthesizedSuper A value indicating whether the constructor starts with a
+         *                            synthesized `super` call.
+         */
+        function transformConstructorParameters(constructor: ConstructorDeclaration, hasSynthesizedSuper: boolean): ParameterDeclaration[] {
+            // If the TypeScript transformer needed to synthesize a constructor for property
+            // initializers, it would have also added a synthetic `...args` parameter and
+            // `super` call.
+            // If this is the case, we do not include the synthetic `...args` parameter and
+            // will instead use the `arguments` object in ES5/3.
+            if (constructor && !hasSynthesizedSuper) {
+                return visitNodes(constructor.parameters, visitor, isParameter);
+            }
+
+            return [];
+        }
+
+        /**
+         * Transforms the body of a constructor declaration of a class.
+         *
+         * @param constructor The constructor for the class.
+         * @param node The node which contains the constructor.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         * @param hasSynthesizedSuper A value indicating whether the constructor starts with a
+         *                            synthesized `super` call.
+         */
+        function transformConstructorBody(constructor: ConstructorDeclaration, node: ClassDeclaration | ClassExpression, extendsClauseElement: ExpressionWithTypeArguments, hasSynthesizedSuper: boolean) {
+            const statements: Statement[] = [];
+            startLexicalEnvironment();
+            if (constructor) {
+                addCaptureThisForNodeIfNeeded(statements, constructor);
+                addDefaultValueAssignmentsIfNeeded(statements, constructor);
+                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+            }
+
+            addDefaultSuperCallIfNeeded(statements, constructor, extendsClauseElement, hasSynthesizedSuper);
+
+            if (constructor) {
+                const body = saveStateAndInvoke(constructor, hasSynthesizedSuper ? transformConstructorBodyWithSynthesizedSuper : transformConstructorBodyWithoutSynthesizedSuper);
+                addRange(statements, body);
+            }
+
+            addRange(statements, endLexicalEnvironment());
+            const block = createBlock(
+                createNodeArray(
+                    statements,
+                    /*location*/ constructor ? constructor.body.statements : node.members
+                ),
+                /*location*/ constructor ? constructor.body : node,
+                /*multiLine*/ true
+            );
+
+            if (!constructor) {
+                setNodeEmitFlags(block, NodeEmitFlags.NoComments);
+            }
+
+            return block;
+        }
+
+        function transformConstructorBodyWithSynthesizedSuper(node: ConstructorDeclaration) {
+            return visitNodes(node.body.statements, visitor, isStatement, 1);
+        }
+
+        function transformConstructorBodyWithoutSynthesizedSuper(node: ConstructorDeclaration) {
+            return visitNodes(node.body.statements, visitor, isStatement, 0);
+        }
+
+        /**
+         * Adds a synthesized call to `_super` if it is needed.
+         *
+         * @param statements The statements for the new constructor body.
+         * @param constructor The constructor for the class.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         * @param hasSynthesizedSuper A value indicating whether the constructor starts with a
+         *                            synthesized `super` call.
+         */
+        function addDefaultSuperCallIfNeeded(statements: Statement[], constructor: ConstructorDeclaration, extendsClauseElement: ExpressionWithTypeArguments, hasSynthesizedSuper: boolean) {
+            // If the TypeScript transformer needed to synthesize a constructor for property
+            // initializers, it would have also added a synthetic `...args` parameter and
+            // `super` call.
+            // If this is the case, or if the class has an `extends` clause but no
+            // constructor, we emit a synthesized call to `_super`.
+            if (constructor ? hasSynthesizedSuper : extendsClauseElement) {
+                statements.push(
+                    createStatement(
+                        createFunctionApply(
+                            createIdentifier("_super"),
+                            createThis(),
+                            createIdentifier("arguments")
+                        ),
+                        /*location*/ extendsClauseElement
+                    )
+                );
+            }
+        }
+
+        /**
+         * Visits a parameter declaration.
+         *
+         * @param node A ParameterDeclaration node.
+         */
+        function visitParameter(node: ParameterDeclaration): ParameterDeclaration {
+            if (node.dotDotDotToken) {
+                // rest parameters are elided
+                return undefined;
+            }
+            else if (isBindingPattern(node.name)) {
+                // Binding patterns are converted into a generated name and are
+                // evaluated inside the function body.
+                return setOriginalNode(
+                    createParameter(
+                        getGeneratedNameForNode(node),
+                        /*initializer*/ undefined,
+                        /*location*/ node
+                    ),
+                    /*original*/ node
+                );
+            }
+            else if (node.initializer) {
+                // Initializers are elided
+                return setOriginalNode(
+                    createParameter(
+                        node.name,
+                        /*initializer*/ undefined,
+                        /*location*/ node
+                    ),
+                    /*original*/ node
+                );
+            }
+            else {
+                return node;
+            }
+        }
+
+        /**
+         * Gets a value indicating whether we need to add default value assignments for a
+         * function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
+            return (node.transformFlags & TransformFlags.ContainsDefaultValueAssignments) !== 0;
+        }
+
+        /**
+         * Adds statements to the body of a function-like node if it contains parameters with
+         * binding patterns or initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         */
+        function addDefaultValueAssignmentsIfNeeded(statements: Statement[], node: FunctionLikeDeclaration): void {
+            if (!shouldAddDefaultValueAssignments(node)) {
+                return;
+            }
+
+            for (const parameter of node.parameters) {
+                const { name, initializer, dotDotDotToken } = parameter;
+
+                // A rest parameter cannot have a binding pattern or an initializer,
+                // so let's just ignore it.
+                if (dotDotDotToken) {
+                    continue;
+                }
+
+                if (isBindingPattern(name)) {
+                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer);
+                }
+                else if (initializer) {
+                    addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer);
+                }
+            }
+        }
+
+        /**
+         * Adds statements to the body of a function-like node for parameters with binding patterns
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         * @param name The name of the parameter.
+         * @param initializer The initializer for the parameter.
+         */
+        function addDefaultValueAssignmentForBindingPattern(statements: Statement[], parameter: ParameterDeclaration, name: BindingPattern, initializer: Expression): void {
+            const temp = getGeneratedNameForNode(parameter);
+
+            // In cases where a binding pattern is simply '[]' or '{}',
+            // we usually don't want to emit a var declaration; however, in the presence
+            // of an initializer, we must emit that expression to preserve side effects.
+            if (name.elements.length > 0) {
+                statements.push(
+                    setNodeEmitFlags(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList(
+                                flattenParameterDestructuring(context, parameter, temp, visitor)
+                            )
+                        ),
+                        NodeEmitFlags.CustomPrologue
+                    )
+                );
+            }
+            else if (initializer) {
+                statements.push(
+                    setNodeEmitFlags(
+                        createStatement(
+                            createAssignment(
+                                temp,
+                                visitNode(initializer, visitor, isExpression)
+                            )
+                        ),
+                        NodeEmitFlags.CustomPrologue
+                    )
+                );
+            }
+        }
+
+        /**
+         * Adds statements to the body of a function-like node for parameters with initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         * @param name The name of the parameter.
+         * @param initializer The initializer for the parameter.
+         */
+        function addDefaultValueAssignmentForInitializer(statements: Statement[], parameter: ParameterDeclaration, name: Identifier, initializer: Expression): void {
+            initializer = visitNode(initializer, visitor, isExpression);
+            const statement = createIf(
+                createStrictEquality(
+                    getSynthesizedClone(name),
+                    createVoidZero()
+                ),
+                setNodeEmitFlags(
+                    createBlock([
+                        createStatement(
+                            createAssignment(
+                                setNodeEmitFlags(getMutableClone(name), NodeEmitFlags.NoSourceMap),
+                                setNodeEmitFlags(initializer, NodeEmitFlags.NoSourceMap | getNodeEmitFlags(initializer)),
+                                /*location*/ parameter
+                            )
+                        )
+                    ], /*location*/ parameter),
+                    NodeEmitFlags.SingleLine | NodeEmitFlags.NoTrailingSourceMap | NodeEmitFlags.NoTokenSourceMaps
+                ),
+                /*elseStatement*/ undefined,
+                /*location*/ parameter
+            );
+            statement.startsOnNewLine = true;
+            setNodeEmitFlags(statement, NodeEmitFlags.NoTokenSourceMaps | NodeEmitFlags.NoTrailingSourceMap | NodeEmitFlags.CustomPrologue);
+            statements.push(statement);
+        }
+
+        /**
+         * Gets a value indicating whether we need to add statements to handle a rest parameter.
+         *
+         * @param node A ParameterDeclaration node.
+         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+         *                                          part of a constructor declaration with a
+         *                                          synthesized call to `super`
+         */
+        function shouldAddRestParameter(node: ParameterDeclaration, inConstructorWithSynthesizedSuper: boolean) {
+            return node && node.dotDotDotToken && node.name.kind === SyntaxKind.Identifier && !inConstructorWithSynthesizedSuper;
+        }
+
+        /**
+         * Adds statements to the body of a function-like node if it contains a rest parameter.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+         *                                          part of a constructor declaration with a
+         *                                          synthesized call to `super`
+         */
+        function addRestParameterIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, inConstructorWithSynthesizedSuper: boolean): void {
+            const parameter = lastOrUndefined(node.parameters);
+            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+                return;
+            }
+
+            // `declarationName` is the name of the local declaration for the parameter.
+            const declarationName = getMutableClone(<Identifier>parameter.name);
+            setNodeEmitFlags(declarationName, NodeEmitFlags.NoSourceMap);
+
+            // `expressionName` is the name of the parameter used in expressions.
+            const expressionName = getSynthesizedClone(<Identifier>parameter.name);
+            const restIndex = node.parameters.length - 1;
+            const temp = createLoopVariable();
+
+            // var param = [];
+            statements.push(
+                setNodeEmitFlags(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createVariableDeclarationList([
+                            createVariableDeclaration(
+                                declarationName,
+                                /*type*/ undefined,
+                                createArrayLiteral([])
+                            )
+                        ]),
+                        /*location*/ parameter
+                    ),
+                    NodeEmitFlags.CustomPrologue
+                )
+            );
+
+            // for (var _i = restIndex; _i < arguments.length; _i++) {
+            //   param[_i - restIndex] = arguments[_i];
+            // }
+            const forStatement = createFor(
+                createVariableDeclarationList([
+                    createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
+                ], /*location*/ parameter),
+                createLessThan(
+                    temp,
+                    createPropertyAccess(createIdentifier("arguments"), "length"),
+                    /*location*/ parameter
+                ),
+                createPostfixIncrement(temp, /*location*/ parameter),
+                createBlock([
+                    startOnNewLine(
+                        createStatement(
+                            createAssignment(
+                                createElementAccess(
+                                    expressionName,
+                                    createSubtract(temp, createLiteral(restIndex))
+                                ),
+                                createElementAccess(createIdentifier("arguments"), temp)
+                            ),
+                            /*location*/ parameter
+                        )
+                    )
+                ])
+            );
+
+            setNodeEmitFlags(forStatement, NodeEmitFlags.CustomPrologue);
+            startOnNewLine(forStatement);
+            statements.push(forStatement);
+        }
+
+        /**
+         * Adds a statement to capture the `this` of a function declaration if it is needed.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A node.
+         */
+        function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node): void {
+            if (node.transformFlags & TransformFlags.ContainsCapturedLexicalThis && node.kind !== SyntaxKind.ArrowFunction) {
+                enableSubstitutionsForCapturedThis();
+                const captureThisStatement = createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            "_this",
+                            /*type*/ undefined,
+                            createThis()
+                        )
+                    ])
+                );
+
+                setNodeEmitFlags(captureThisStatement, NodeEmitFlags.NoComments | NodeEmitFlags.CustomPrologue);
+                setSourceMapRange(captureThisStatement, node);
+                statements.push(captureThisStatement);
+            }
+        }
+
+        /**
+         * Adds statements to the class body function for a class to define the members of the
+         * class.
+         *
+         * @param statements The statements for the class body function.
+         * @param node The ClassExpression or ClassDeclaration node.
+         */
+        function addClassMembers(statements: Statement[], node: ClassExpression | ClassDeclaration): void {
+            for (const member of node.members) {
+                switch (member.kind) {
+                    case SyntaxKind.SemicolonClassElement:
+                        statements.push(transformSemicolonClassElementToStatement(<SemicolonClassElement>member));
+                        break;
+
+                    case SyntaxKind.MethodDeclaration:
+                        statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), <MethodDeclaration>member));
+                        break;
+
+                    case SyntaxKind.GetAccessor:
+                    case SyntaxKind.SetAccessor:
+                        const accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
+                        if (member === accessors.firstAccessor) {
+                            statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors));
+                        }
+
+                        break;
+
+                    case SyntaxKind.Constructor:
+                        // Constructors are handled in visitClassExpression/visitClassDeclaration
+                        break;
+
+                    default:
+                        Debug.failBadSyntaxKind(node);
+                        break;
+                }
+            }
+        }
+
+        /**
+         * Transforms a SemicolonClassElement into a statement for a class body function.
+         *
+         * @param member The SemicolonClassElement node.
+         */
+        function transformSemicolonClassElementToStatement(member: SemicolonClassElement) {
+            return createEmptyStatement(/*location*/ member);
+        }
+
+        /**
+         * Transforms a MethodDeclaration into a statement for a class body function.
+         *
+         * @param receiver The receiver for the member.
+         * @param member The MethodDeclaration node.
+         */
+        function transformClassMethodDeclarationToStatement(receiver: LeftHandSideExpression, member: MethodDeclaration) {
+            const commentRange = getCommentRange(member);
+            const sourceMapRange = getSourceMapRange(member);
+
+            const func = transformFunctionLikeToExpression(member, /*location*/ member, /*name*/ undefined);
+            setNodeEmitFlags(func, NodeEmitFlags.NoComments);
+            setSourceMapRange(func, sourceMapRange);
+
+            const statement = createStatement(
+                createAssignment(
+                    createMemberAccessForPropertyName(
+                        receiver,
+                        visitNode(member.name, visitor, isPropertyName),
+                        /*location*/ member.name
+                    ),
+                    func
+                ),
+                /*location*/ member
+            );
+
+            setOriginalNode(statement, member);
+            setCommentRange(statement, commentRange);
+
+            // The location for the statement is used to emit comments only.
+            // No source map should be emitted for this statement to align with the
+            // old emitter.
+            setNodeEmitFlags(statement, NodeEmitFlags.NoSourceMap);
+            return statement;
+        }
+
+        /**
+         * Transforms a set of related of get/set accessors into a statement for a class body function.
+         *
+         * @param receiver The receiver for the member.
+         * @param accessors The set of related get/set accessors.
+         */
+        function transformAccessorsToStatement(receiver: LeftHandSideExpression, accessors: AllAccessorDeclarations): Statement {
+            const statement = createStatement(
+                transformAccessorsToExpression(receiver, accessors, /*startsOnNewLine*/ false),
+                /*location*/ getSourceMapRange(accessors.firstAccessor)
+            );
+
+            // The location for the statement is used to emit source maps only.
+            // No comments should be emitted for this statement to align with the
+            // old emitter.
+            setNodeEmitFlags(statement, NodeEmitFlags.NoComments);
+            return statement;
+        }
+
+        /**
+         * Transforms a set of related get/set accessors into an expression for either a class
+         * body function or an ObjectLiteralExpression with computed properties.
+         *
+         * @param receiver The receiver for the member.
+         */
+        function transformAccessorsToExpression(receiver: LeftHandSideExpression, { firstAccessor, getAccessor, setAccessor }: AllAccessorDeclarations, startsOnNewLine: boolean): Expression {
+            // To align with source maps in the old emitter, the receiver and property name
+            // arguments are both mapped contiguously to the accessor name.
+            const target = getMutableClone(receiver);
+            setNodeEmitFlags(target, NodeEmitFlags.NoComments | NodeEmitFlags.NoTrailingSourceMap);
+            setSourceMapRange(target, firstAccessor.name);
+
+            const propertyName = createExpressionForPropertyName(visitNode(firstAccessor.name, visitor, isPropertyName));
+            setNodeEmitFlags(propertyName, NodeEmitFlags.NoComments | NodeEmitFlags.NoLeadingSourceMap);
+            setSourceMapRange(propertyName, firstAccessor.name);
+
+            const properties: ObjectLiteralElement[] = [];
+            if (getAccessor) {
+                const getterFunction = transformFunctionLikeToExpression(getAccessor, /*location*/ undefined, /*name*/ undefined);
+                setSourceMapRange(getterFunction, getSourceMapRange(getAccessor));
+                const getter = createPropertyAssignment("get", getterFunction);
+                setCommentRange(getter, getCommentRange(getAccessor));
+                properties.push(getter);
+            }
+
+            if (setAccessor) {
+                const setterFunction = transformFunctionLikeToExpression(setAccessor, /*location*/ undefined, /*name*/ undefined);
+                setSourceMapRange(setterFunction, getSourceMapRange(setAccessor));
+                const setter = createPropertyAssignment("set", setterFunction);
+                setCommentRange(setter, getCommentRange(setAccessor));
+                properties.push(setter);
+            }
+
+            properties.push(
+                createPropertyAssignment("enumerable", createLiteral(true)),
+                createPropertyAssignment("configurable", createLiteral(true))
+            );
+
+            const call = createCall(
+                createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                /*typeArguments*/ undefined,
+                [
+                    target,
+                    propertyName,
+                    createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)
+                ]
+            );
+            if (startsOnNewLine) {
+                call.startsOnNewLine = true;
+            }
+            return call;
+        }
+
+        /**
+         * Visits an ArrowFunction and transforms it into a FunctionExpression.
+         *
+         * @param node An ArrowFunction node.
+         */
+        function visitArrowFunction(node: ArrowFunction) {
+            if (node.transformFlags & TransformFlags.ContainsLexicalThis) {
+                enableSubstitutionsForCapturedThis();
+            }
+
+            const savedUseCapturedThis = useCapturedThis;
+            useCapturedThis = true;
+
+            const func = transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
+
+            useCapturedThis = savedUseCapturedThis;
+            setNodeEmitFlags(func, NodeEmitFlags.CapturesThis);
+            return func;
+        }
+
+        /**
+         * Visits a FunctionExpression node.
+         *
+         * @param node a FunctionExpression node.
+         */
+        function visitFunctionExpression(node: FunctionExpression): Expression {
+            return transformFunctionLikeToExpression(node, /*location*/ node, node.name);
+        }
+
+        /**
+         * Visits a FunctionDeclaration node.
+         *
+         * @param node a FunctionDeclaration node.
+         */
+        function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
+            return setOriginalNode(
+                createFunctionDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    node.asteriskToken,
+                    node.name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.parameters, visitor, isParameter),
+                    /*type*/ undefined,
+                    transformFunctionBody(node),
+                    /*location*/ node
+                ),
+                /*original*/ node);
+        }
+
+        /**
+         * Transforms a function-like node into a FunctionExpression.
+         *
+         * @param node The function-like node to transform.
+         * @param location The source-map location for the new FunctionExpression.
+         * @param name The name of the new FunctionExpression.
+         */
+        function transformFunctionLikeToExpression(node: FunctionLikeDeclaration, location: TextRange, name: Identifier): FunctionExpression {
+            const savedContainingNonArrowFunction = containingNonArrowFunction;
+            if (node.kind !== SyntaxKind.ArrowFunction) {
+                containingNonArrowFunction = node;
+            }
+
+            const expression = setOriginalNode(
+                createFunctionExpression(
+                    node.asteriskToken,
+                    name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.parameters, visitor, isParameter),
+                    /*type*/ undefined,
+                    saveStateAndInvoke(node, transformFunctionBody),
+                    location
+                ),
+                /*original*/ node
+            );
+
+            containingNonArrowFunction = savedContainingNonArrowFunction;
+            return expression;
+        }
+
+        /**
+         * Transforms the body of a function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function transformFunctionBody(node: FunctionLikeDeclaration) {
+            let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+            let singleLine = false; // indicates whether the block *may* be emitted as a single line
+            let statementsLocation: TextRange;
+            let closeBraceLocation: TextRange;
+
+            const statements: Statement[] = [];
+            const body = node.body;
+            let statementOffset: number;
+
+            startLexicalEnvironment();
+            if (isBlock(body)) {
+                // ensureUseStrict is false because no new prologue-directive should be added.
+                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
+                statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+            }
+
+            addCaptureThisForNodeIfNeeded(statements, node);
+            addDefaultValueAssignmentsIfNeeded(statements, node);
+            addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
+
+            // If we added any generated statements, this must be a multi-line block.
+            if (!multiLine && statements.length > 0) {
+                multiLine = true;
+            }
+
+            if (isBlock(body)) {
+                statementsLocation = body.statements;
+                addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
+
+                // If the original body was a multi-line block, this must be a multi-line block.
+                if (!multiLine && body.multiLine) {
+                    multiLine = true;
+                }
+            }
+            else {
+                Debug.assert(node.kind === SyntaxKind.ArrowFunction);
+
+                // To align with the old emitter, we use a synthetic end position on the location
+                // for the statement list we synthesize when we down-level an arrow function with
+                // an expression function body. This prevents both comments and source maps from
+                // being emitted for the end position only.
+                statementsLocation = moveRangeEnd(body, -1);
+
+                const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
+                if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
+                    if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                        singleLine = true;
+                    }
+                    else {
+                        multiLine = true;
+                    }
+                }
+
+                const expression = visitNode(body, visitor, isExpression);
+                const returnStatement = createReturn(expression, /*location*/ body);
+                setNodeEmitFlags(returnStatement, NodeEmitFlags.NoTokenSourceMaps | NodeEmitFlags.NoTrailingSourceMap | NodeEmitFlags.NoTrailingComments);
+                statements.push(returnStatement);
+
+                // To align with the source map emit for the old emitter, we set a custom
+                // source map location for the close brace.
+                closeBraceLocation = body;
+            }
+
+            const lexicalEnvironment = endLexicalEnvironment();
+            addRange(statements, lexicalEnvironment);
+
+            // If we added any final generated statements, this must be a multi-line block
+            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+                multiLine = true;
+            }
+
+            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+            if (!multiLine && singleLine) {
+                setNodeEmitFlags(block, NodeEmitFlags.SingleLine);
+            }
+
+            if (closeBraceLocation) {
+                setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
+            }
+
+            setOriginalNode(block, node.body);
+            return block;
+        }
+
+        /**
+         * Visits an ExpressionStatement that contains a destructuring assignment.
+         *
+         * @param node An ExpressionStatement node.
+         */
+        function visitExpressionStatement(node: ExpressionStatement): ExpressionStatement {
+            // If we are here it is most likely because our expression is a destructuring assignment.
+            switch (node.expression.kind) {
+                case SyntaxKind.ParenthesizedExpression:
+                    return updateStatement(node,
+                        visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false)
+                    );
+
+                case SyntaxKind.BinaryExpression:
+                    return updateStatement(node,
+                        visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false)
+                    );
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a ParenthesizedExpression that may contain a destructuring assignment.
+         *
+         * @param node A ParenthesizedExpression node.
+         * @param needsDestructuringValue A value indicating whether we need to hold onto the rhs
+         *                                of a destructuring assignment.
+         */
+        function visitParenthesizedExpression(node: ParenthesizedExpression, needsDestructuringValue: boolean): ParenthesizedExpression {
+            // If we are here it is most likely because our expression is a destructuring assignment.
+            if (needsDestructuringValue) {
+                switch (node.expression.kind) {
+                    case SyntaxKind.ParenthesizedExpression:
+                        return createParen(
+                            visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ true),
+                            /*location*/ node
+                        );
+
+                    case SyntaxKind.BinaryExpression:
+                        return createParen(
+                            visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ true),
+                            /*location*/ node
+                        );
+                }
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a BinaryExpression that contains a destructuring assignment.
+         *
+         * @param node A BinaryExpression node.
+         * @param needsDestructuringValue A value indicating whether we need to hold onto the rhs
+         *                                of a destructuring assignment.
+         */
+        function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
+            // If we are here it is because this is a destructuring assignment.
+            Debug.assert(isDestructuringAssignment(node));
+            return flattenDestructuringAssignment(context, node, needsDestructuringValue, hoistVariableDeclaration, visitor);
+        }
+
+        function visitVariableStatement(node: VariableStatement): Statement {
+            if (convertedLoopState && (getCombinedNodeFlags(node.declarationList) & NodeFlags.BlockScoped) == 0) {
+                // we are inside a converted loop - hoist variable declarations
+                let assignments: Expression[];
+                for (const decl of node.declarationList.declarations) {
+                    hoistVariableDeclarationDeclaredInConvertedLoop(convertedLoopState, decl);
+                    if (decl.initializer) {
+                        let assignment: Expression;
+                        if (isBindingPattern(decl.name)) {
+                            assignment = flattenVariableDestructuringToExpression(context, decl, hoistVariableDeclaration, /*nameSubstitution*/ undefined, visitor);
+                        }
+                        else {
+                            assignment = createBinary(<Identifier>decl.name, SyntaxKind.EqualsToken, decl.initializer);
+                        }
+                        (assignments || (assignments = [])).push(assignment);
+                    }
+                }
+                if (assignments) {
+                    return createStatement(reduceLeft(assignments, (acc, v) => createBinary(v, SyntaxKind.CommaToken, acc)), node);
+                }
+                else {
+                    // none of declarations has initializer - the entire variable statement can be deleted
+                    return undefined;
+                }
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a VariableDeclarationList that is block scoped (e.g. `let` or `const`).
+         *
+         * @param node A VariableDeclarationList node.
+         */
+        function visitVariableDeclarationList(node: VariableDeclarationList): VariableDeclarationList {
+            if (node.flags & NodeFlags.BlockScoped) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+
+            const declarations = flatten(map(node.declarations, node.flags & NodeFlags.Let
+                ? visitVariableDeclarationInLetDeclarationList
+                : visitVariableDeclaration));
+
+            const declarationList = createVariableDeclarationList(declarations, /*location*/ node);
+            setOriginalNode(declarationList, node);
+            setCommentRange(declarationList, node);
+
+            if (node.transformFlags & TransformFlags.ContainsBindingPattern
+                && (isBindingPattern(node.declarations[0].name)
+                    || isBindingPattern(lastOrUndefined(node.declarations).name))) {
+                // If the first or last declaration is a binding pattern, we need to modify
+                // the source map range for the declaration list.
+                const firstDeclaration = firstOrUndefined(declarations);
+                const lastDeclaration = lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
+            }
+
+            return declarationList;
+        }
+
+        /**
+         * Gets a value indicating whether we should emit an explicit initializer for a variable
+         * declaration in a `let` declaration list.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function shouldEmitExplicitInitializerForLetDeclaration(node: VariableDeclaration) {
+            // Nested let bindings might need to be initialized explicitly to preserve
+            // ES6 semantic:
+            //
+            //  { let x = 1; }
+            //  { let x; } // x here should be undefined. not 1
+            //
+            // Top level bindings never collide with anything and thus don't require
+            // explicit initialization. As for nested let bindings there are two cases:
+            //
+            // - Nested let bindings that were not renamed definitely should be
+            //   initialized explicitly:
+            //
+            //    { let x = 1; }
+            //    { let x; if (some-condition) { x = 1}; if (x) { /*1*/ } }
+            //
+            //   Without explicit initialization code in /*1*/ can be executed even if
+            //   some-condition is evaluated to false.
+            //
+            // - Renaming introduces fresh name that should not collide with any
+            //   existing names, however renamed bindings sometimes also should be
+            //   explicitly initialized. One particular case: non-captured binding
+            //   declared inside loop body (but not in loop initializer):
+            //
+            //    let x;
+            //    for (;;) {
+            //        let x;
+            //    }
+            //
+            //   In downlevel codegen inner 'x' will be renamed so it won't collide
+            //   with outer 'x' however it will should be reset on every iteration as
+            //   if it was declared anew.
+            //
+            //   * Why non-captured binding?
+            //     - Because if loop contains block scoped binding captured in some
+            //       function then loop body will be rewritten to have a fresh scope
+            //       on every iteration so everything will just work.
+            //
+            //   * Why loop initializer is excluded?
+            //     - Since we've introduced a fresh name it already will be undefined.
+
+            const flags = resolver.getNodeCheckFlags(node);
+            const isCapturedInFunction = flags & NodeCheckFlags.CapturedBlockScopedBinding;
+            const isDeclaredInLoop = flags & NodeCheckFlags.BlockScopedBindingInLoop;
+            const emittedAsTopLevel =
+                isBlockScopedContainerTopLevel(enclosingBlockScopeContainer)
+                || (isCapturedInFunction
+                    && isDeclaredInLoop
+                    && isBlock(enclosingBlockScopeContainer)
+                    && isIterationStatement(enclosingBlockScopeContainerParent, /*lookInLabeledStatements*/ false));
+
+            const emitExplicitInitializer =
+                !emittedAsTopLevel
+                && enclosingBlockScopeContainer.kind !== SyntaxKind.ForInStatement
+                && enclosingBlockScopeContainer.kind !== SyntaxKind.ForOfStatement
+                && (!resolver.isDeclarationWithCollidingName(node)
+                    || (isDeclaredInLoop
+                        && !isCapturedInFunction
+                        && !isIterationStatement(enclosingBlockScopeContainer, /*lookInLabeledStatements*/ false)));
+
+            return emitExplicitInitializer;
+        }
+
+        /**
+         * Visits a VariableDeclaration in a `let` declaration list.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclarationInLetDeclarationList(node: VariableDeclaration, offset: number) {
+            // For binding pattern names that lack initializers there is no point to emit
+            // explicit initializer since downlevel codegen for destructuring will fail
+            // in the absence of initializer so all binding elements will say uninitialized
+            const name = node.name;
+            if (isBindingPattern(name)) {
+                return visitVariableDeclaration(node, offset);
+            }
+
+            if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
+                const clone = getMutableClone(node);
+                clone.initializer = createVoidZero();
+                return clone;
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a VariableDeclaration node with a binding pattern.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclaration(node: VariableDeclaration, offset: number): VisitResult<VariableDeclaration> {
+            // If we are here it is because the name contains a binding pattern.
+            if (isBindingPattern(node.name)) {
+                return flattenVariableDestructuring(context, node, /*value*/ undefined, visitor);
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitLabeledStatement(node: LabeledStatement): VisitResult<Statement> {
+            if (convertedLoopState) {
+                if (!convertedLoopState.labels) {
+                    convertedLoopState.labels = createMap<string>();
+                }
+                convertedLoopState.labels[node.label.text] = node.label.text;
+            }
+
+            let result: VisitResult<Statement>;
+            if (isIterationStatement(node.statement, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatementBody(<IterationStatement>node.statement)) {
+                result = visitNodes(createNodeArray([node.statement]), visitor, isStatement);
+            }
+            else {
+                result = visitEachChild(node, visitor, context);
+            }
+
+            if (convertedLoopState) {
+                convertedLoopState.labels[node.label.text] = undefined;
+            }
+
+            return result;
+        }
+
+        function visitDoStatement(node: DoStatement) {
+            return convertIterationStatementBodyIfNecessary(node);
+        }
+
+        function visitWhileStatement(node: WhileStatement) {
+            return convertIterationStatementBodyIfNecessary(node);
+        }
+
+        function visitForStatement(node: ForStatement) {
+            return convertIterationStatementBodyIfNecessary(node);
+        }
+
+        function visitForInStatement(node: ForInStatement) {
+            return convertIterationStatementBodyIfNecessary(node);
+        }
+
+        /**
+         * Visits a ForOfStatement and converts it into a compatible ForStatement.
+         *
+         * @param node A ForOfStatement.
+         */
+        function visitForOfStatement(node: ForOfStatement): VisitResult<Statement> {
+            return convertIterationStatementBodyIfNecessary(node, convertForOfToFor);
+        }
+
+        function convertForOfToFor(node: ForOfStatement, convertedLoopBodyStatements: Statement[]): ForStatement {
+            // The following ES6 code:
+            //
+            //    for (let v of expr) { }
+            //
+            // should be emitted as
+            //
+            //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
+            //        var v = _a[_i];
+            //    }
+            //
+            // where _a and _i are temps emitted to capture the RHS and the counter,
+            // respectively.
+            // When the left hand side is an expression instead of a let declaration,
+            // the "let v" is not emitted.
+            // When the left hand side is a let/const, the v is renamed if there is
+            // another v in scope.
+            // Note that all assignments to the LHS are emitted in the body, including
+            // all destructuring.
+            // Note also that because an extra statement is needed to assign to the LHS,
+            // for-of bodies are always emitted as blocks.
+
+            const expression = node.expression;
+            const initializer = node.initializer;
+            const statements: Statement[] = [];
+
+            // In the case where the user wrote an identifier as the RHS, like this:
+            //
+            //     for (let v of arr) { }
+            //
+            // we don't want to emit a temporary variable for the RHS, just use it directly.
+            const counter = createLoopVariable();
+            const rhsReference = expression.kind === SyntaxKind.Identifier
+                ? createUniqueName((<Identifier>expression).text)
+                : createTempVariable(/*recordTempVariable*/ undefined);
+
+            // Initialize LHS
+            // var v = _a[_i];
+            if (isVariableDeclarationList(initializer)) {
+                if (initializer.flags & NodeFlags.BlockScoped) {
+                    enableSubstitutionsForBlockScopedBindings();
+                }
+
+                const firstOriginalDeclaration = firstOrUndefined(initializer.declarations);
+                if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
+                    // This works whether the declaration is a var, let, or const.
+                    // It will use rhsIterationValue _a[_i] as the initializer.
+                    const declarations = flattenVariableDestructuring(
+                        context,
+                        firstOriginalDeclaration,
+                        createElementAccess(rhsReference, counter),
+                        visitor
+                    );
+
+                    const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                    setOriginalNode(declarationList, initializer);
+
+                    // Adjust the source map range for the first declaration to align with the old
+                    // emitter.
+                    const firstDeclaration = declarations[0];
+                    const lastDeclaration = lastOrUndefined(declarations);
+                    setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
+
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            declarationList
+                        )
+                    );
+                }
+                else {
+                    // The following call does not include the initializer, so we have
+                    // to emit it separately.
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
+                                    /*type*/ undefined,
+                                    createElementAccess(rhsReference, counter)
+                                )
+                            ], /*location*/ moveRangePos(initializer, -1)),
+                            /*location*/ moveRangeEnd(initializer, -1)
+                        )
+                    );
+                }
+            }
+            else {
+                // Initializer is an expression. Emit the expression in the body, so that it's
+                // evaluated on every iteration.
+                const assignment = createAssignment(initializer, createElementAccess(rhsReference, counter));
+                if (isDestructuringAssignment(assignment)) {
+                    // This is a destructuring pattern, so we flatten the destructuring instead.
+                    statements.push(
+                        createStatement(
+                            flattenDestructuringAssignment(
+                                context,
+                                assignment,
+                                /*needsValue*/ false,
+                                hoistVariableDeclaration,
+                                visitor
+                            )
+                        )
+                    );
+                }
+                else {
+                    // Currently there is not way to check that assignment is binary expression of destructing assignment
+                    // so we have to cast never type to binaryExpression
+                    (<BinaryExpression>assignment).end = initializer.end;
+                    statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
+                }
+            }
+
+            let bodyLocation: TextRange;
+            let statementsLocation: TextRange;
+            if (convertedLoopBodyStatements) {
+                addRange(statements, convertedLoopBodyStatements);
+            }
+            else {
+                const statement = visitNode(node.statement, visitor, isStatement);
+                if (isBlock(statement)) {
+                    addRange(statements, statement.statements);
+                    bodyLocation = statement;
+                    statementsLocation = statement.statements;
+                }
+                else {
+                    statements.push(statement);
+                }
+            }
+
+            // The old emitter does not emit source maps for the expression
+            setNodeEmitFlags(expression, NodeEmitFlags.NoSourceMap | getNodeEmitFlags(expression));
+
+            // The old emitter does not emit source maps for the block.
+            // We add the location to preserve comments.
+            const body = createBlock(
+                createNodeArray(statements, /*location*/ statementsLocation),
+                /*location*/ bodyLocation
+            );
+
+            setNodeEmitFlags(body, NodeEmitFlags.NoSourceMap | NodeEmitFlags.NoTokenSourceMaps);
+
+            const forStatement = createFor(
+                createVariableDeclarationList([
+                    createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
+                    createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
+                ], /*location*/ node.expression),
+                createLessThan(
+                    counter,
+                    createPropertyAccess(rhsReference, "length"),
+                    /*location*/ node.expression
+                ),
+                createPostfixIncrement(counter, /*location*/ node.expression),
+                body,
+                /*location*/ node
+            );
+
+            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+            setNodeEmitFlags(forStatement, NodeEmitFlags.NoTokenTrailingSourceMaps);
+            return forStatement;
+        }
+
+        /**
+         * Visits an ObjectLiteralExpression with computed propety names.
+         *
+         * @param node An ObjectLiteralExpression node.
+         */
+        function visitObjectLiteralExpression(node: ObjectLiteralExpression): Expression {
+            // We are here because a ComputedPropertyName was used somewhere in the expression.
+            const properties = node.properties;
+            const numProperties = properties.length;
+
+            // Find the first computed property.
+            // Everything until that point can be emitted as part of the initial object literal.
+            let numInitialProperties = numProperties;
+            for (let i = 0; i < numProperties; i++) {
+                const property = properties[i];
+                if (property.transformFlags & TransformFlags.ContainsYield
+                    || property.name.kind === SyntaxKind.ComputedPropertyName) {
+                    numInitialProperties = i;
+                    break;
+                }
+            }
+
+            Debug.assert(numInitialProperties !== numProperties);
+
+            // For computed properties, we need to create a unique handle to the object
+            // literal so we can modify it without risking internal assignments tainting the object.
+            const temp = createTempVariable(hoistVariableDeclaration);
+
+            // Write out the first non-computed properties, then emit the rest through indexing on the temp variable.
+            const expressions: Expression[] = [];
+            const assignment = createAssignment(
+                temp,
+                setNodeEmitFlags(
+                    createObjectLiteral(
+                        visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialProperties),
+                        /*location*/ undefined,
+                        node.multiLine
+                    ),
+                    NodeEmitFlags.Indented
+                )
+            );
+            if (node.multiLine) {
+                assignment.startsOnNewLine = true;
+            }
+            expressions.push(assignment);
+
+            addObjectLiteralMembers(expressions, node, temp, numInitialProperties);
+
+            // We need to clone the temporary identifier so that we can write it on a
+            // new line
+            expressions.push(node.multiLine ? startOnNewLine(getMutableClone(temp)) : temp);
+            return inlineExpressions(expressions);
+        }
+
+        function shouldConvertIterationStatementBody(node: IterationStatement): boolean {
+            return (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LoopWithCapturedBlockScopedBinding) !== 0;
+        }
+
+        /**
+         * Records constituents of name for the given variable to be hoisted in the outer scope.
+         */
+        function hoistVariableDeclarationDeclaredInConvertedLoop(state: ConvertedLoopState, node: VariableDeclaration): void {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+
+            visit(node.name);
+
+            function visit(node: Identifier | BindingPattern) {
+                if (node.kind === SyntaxKind.Identifier) {
+                    state.hoistedLocalVariables.push((<Identifier>node));
+                }
+                else {
+                    for (const element of (<BindingPattern>node).elements) {
+                        visit(element.name);
+                    }
+                }
+            }
+        }
+
+        function convertIterationStatementBodyIfNecessary(node: IterationStatement, convert?: (node: IterationStatement, convertedLoopBodyStatements: Statement[]) => IterationStatement): VisitResult<Statement> {
+            if (!shouldConvertIterationStatementBody(node)) {
+                let saveAllowedNonLabeledJumps: Jump;
+                if (convertedLoopState) {
+                    // we get here if we are trying to emit normal loop loop inside converted loop
+                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = Jump.Break | Jump.Continue;
+                }
+
+                const result = convert ? convert(node, /*convertedLoopBodyStatements*/ undefined) : visitEachChild(node, visitor, context);
+
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+                return result;
+            }
+
+            const functionName = createUniqueName("_loop");
+            let loopInitializer: VariableDeclarationList;
+            switch (node.kind) {
+                case SyntaxKind.ForStatement:
+                case SyntaxKind.ForInStatement:
+                case SyntaxKind.ForOfStatement:
+                    const initializer = (<ForStatement | ForInStatement | ForOfStatement>node).initializer;
+                    if (initializer && initializer.kind === SyntaxKind.VariableDeclarationList) {
+                        loopInitializer = <VariableDeclarationList>(<ForStatement | ForInStatement | ForOfStatement>node).initializer;
+                    }
+                    break;
+            }
+            // variables that will be passed to the loop as parameters
+            const loopParameters: ParameterDeclaration[] = [];
+            // variables declared in the loop initializer that will be changed inside the loop
+            const loopOutParameters: LoopOutParameter[] = [];
+            if (loopInitializer && (getCombinedNodeFlags(loopInitializer) & NodeFlags.BlockScoped)) {
+                for (const decl of loopInitializer.declarations) {
+                    processLoopVariableDeclaration(decl, loopParameters, loopOutParameters);
+                }
+            }
+
+            const outerConvertedLoopState = convertedLoopState;
+            convertedLoopState = { loopOutParameters };
+            if (outerConvertedLoopState) {
+                // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
+                // if outer converted loop has already accumulated some state - pass it through
+                if (outerConvertedLoopState.argumentsName) {
+                    // outer loop has already used 'arguments' so we've already have some name to alias it
+                    // use the same name in all nested loops
+                    convertedLoopState.argumentsName = outerConvertedLoopState.argumentsName;
+                }
+                if (outerConvertedLoopState.thisName) {
+                    // outer loop has already used 'this' so we've already have some name to alias it
+                    // use the same name in all nested loops
+                    convertedLoopState.thisName = outerConvertedLoopState.thisName;
+                }
+                if (outerConvertedLoopState.hoistedLocalVariables) {
+                    // we've already collected some non-block scoped variable declarations in enclosing loop
+                    // use the same storage in nested loop
+                    convertedLoopState.hoistedLocalVariables = outerConvertedLoopState.hoistedLocalVariables;
+                }
+            }
+
+            let loopBody = visitNode(node.statement, visitor, isStatement);
+
+            const currentState = convertedLoopState;
+            convertedLoopState = outerConvertedLoopState;
+
+            if (loopOutParameters.length) {
+                const statements = isBlock(loopBody) ? (<Block>loopBody).statements.slice() : [loopBody];
+                copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements);
+                loopBody = createBlock(statements, /*location*/ undefined, /*multiline*/ true);
+            }
+
+            if (!isBlock(loopBody)) {
+                loopBody = createBlock([loopBody], /*location*/ undefined, /*multiline*/ true);
+            }
+            const convertedLoopVariable =
+                createVariableStatement(
+                /*modifiers*/ undefined,
+                    createVariableDeclarationList(
+                        [
+                            createVariableDeclaration(
+                                functionName,
+                                /*type*/ undefined,
+                                setNodeEmitFlags(
+                                    createFunctionExpression(
+                                        /*asteriskToken*/ undefined,
+                                        /*name*/ undefined,
+                                        /*typeParameters*/ undefined,
+                                        loopParameters,
+                                        /*type*/ undefined,
+                                        <Block>loopBody
+                                    ),
+                                    currentState.containsLexicalThis
+                                        ? NodeEmitFlags.CapturesThis
+                                        : 0
+                                )
+                            )
+                        ]
+                    )
+                );
+
+            const statements: Statement[] = [convertedLoopVariable];
+
+            let extraVariableDeclarations: VariableDeclaration[];
+            // propagate state from the inner loop to the outer loop if necessary
+            if (currentState.argumentsName) {
+                // if alias for arguments is set
+                if (outerConvertedLoopState) {
+                    // pass it to outer converted loop
+                    outerConvertedLoopState.argumentsName = currentState.argumentsName;
+                }
+                else {
+                    // this is top level converted loop and we need to create an alias for 'arguments' object
+                    (extraVariableDeclarations || (extraVariableDeclarations = [])).push(
+                        createVariableDeclaration(
+                            currentState.argumentsName,
+                            /*type*/ undefined,
+                            createIdentifier("arguments")
+                        )
+                    );
+                }
+            }
+
+            if (currentState.thisName) {
+                // if alias for this is set
+                if (outerConvertedLoopState) {
+                    // pass it to outer converted loop
+                    outerConvertedLoopState.thisName = currentState.thisName;
+                }
+                else {
+                    // this is top level converted loop so we need to create an alias for 'this' here
+                    // NOTE:
+                    // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set.
+                    // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'.
+                    (extraVariableDeclarations || (extraVariableDeclarations = [])).push(
+                        createVariableDeclaration(
+                            currentState.thisName,
+                            /*type*/ undefined,
+                            createIdentifier("this")
+                        )
+                    );
+                }
+            }
+
+            if (currentState.hoistedLocalVariables) {
+                // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
+                if (outerConvertedLoopState) {
+                    // pass them to outer converted loop
+                    outerConvertedLoopState.hoistedLocalVariables = currentState.hoistedLocalVariables;
+                }
+                else {
+                    if (!extraVariableDeclarations) {
+                        extraVariableDeclarations = [];
+                    }
+                    // hoist collected variable declarations
+                    for (const name in currentState.hoistedLocalVariables) {
+                        const identifier = currentState.hoistedLocalVariables[name];
+                        extraVariableDeclarations.push(createVariableDeclaration(identifier));
+                    }
+                }
+            }
+
+            // add extra variables to hold out parameters if necessary
+            if (loopOutParameters.length) {
+                if (!extraVariableDeclarations) {
+                    extraVariableDeclarations = [];
+                }
+                for (const outParam of loopOutParameters) {
+                    extraVariableDeclarations.push(createVariableDeclaration(outParam.outParamName));
+                }
+            }
+
+            // create variable statement to hold all introduced variable declarations
+            if (extraVariableDeclarations) {
+                statements.push(createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList(extraVariableDeclarations)
+                ));
+            }
+
+            const convertedLoopBodyStatements = generateCallToConvertedLoop(functionName, loopParameters, currentState);
+            let loop: IterationStatement;
+            if (convert) {
+                loop = convert(node, convertedLoopBodyStatements);
+            }
+            else {
+                loop = <IterationStatement>getMutableClone(node);
+                // clean statement part
+                loop.statement = undefined;
+                // visit childnodes to transform initializer/condition/incrementor parts
+                loop = visitEachChild(loop, visitor, context);
+                // set loop statement
+                loop.statement = createBlock(
+                    generateCallToConvertedLoop(functionName, loopParameters, currentState),
+                    /*location*/ undefined,
+                    /*multiline*/ true
+                );
+            }
+
+            statements.push(
+                currentParent.kind === SyntaxKind.LabeledStatement
+                    ? createLabel((<LabeledStatement>currentParent).label, loop)
+                    : loop
+                );
+            return statements;
+        }
+
+        function copyOutParameter(outParam: LoopOutParameter, copyDirection: CopyDirection): BinaryExpression {
+            const source = copyDirection === CopyDirection.ToOriginal ? outParam.outParamName : outParam.originalName;
+            const target = copyDirection === CopyDirection.ToOriginal ? outParam.originalName : outParam.outParamName;
+            return createBinary(target, SyntaxKind.EqualsToken, source);
+        }
+
+        function copyOutParameters(outParams: LoopOutParameter[], copyDirection: CopyDirection, statements: Statement[]): void {
+            for (const outParam of outParams) {
+                statements.push(createStatement(copyOutParameter(outParam, copyDirection)));
+            }
+        }
+
+        function generateCallToConvertedLoop(loopFunctionExpressionName: Identifier, parameters: ParameterDeclaration[], state: ConvertedLoopState): Statement[] {
+            const outerConvertedLoopState = convertedLoopState;
+
+            const statements: Statement[] = [];
+            // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
+            // simple loops are emitted as just 'loop()';
+            // NOTE: if loop uses only 'continue' it still will be emitted as simple loop
+            const isSimpleLoop =
+                !(state.nonLocalJumps & ~Jump.Continue) &&
+                !state.labeledNonLocalBreaks &&
+                !state.labeledNonLocalContinues;
+
+            const call = createCall(loopFunctionExpressionName, /*typeArguments*/ undefined, map(parameters, p => <Identifier>p.name));
+            if (isSimpleLoop) {
+                statements.push(createStatement(call));
+                copyOutParameters(state.loopOutParameters, CopyDirection.ToOriginal, statements);
+            }
+            else {
+                const loopResultName = createUniqueName("state");
+                const stateVariable = createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList(
+                        [createVariableDeclaration(loopResultName, /*type*/ undefined, call)]
+                    )
+                );
+                statements.push(stateVariable);
+                copyOutParameters(state.loopOutParameters, CopyDirection.ToOriginal, statements);
+
+                if (state.nonLocalJumps & Jump.Return) {
+                    let returnStatement: ReturnStatement;
+                    if (outerConvertedLoopState) {
+                        outerConvertedLoopState.nonLocalJumps |= Jump.Return;
+                        returnStatement = createReturn(loopResultName);
+                    }
+                    else {
+                        returnStatement = createReturn(createPropertyAccess(loopResultName, "value"));
+                    }
+                    statements.push(
+                        createIf(
+                            createBinary(
+                                createTypeOf(loopResultName),
+                                SyntaxKind.EqualsEqualsEqualsToken,
+                                createLiteral("object")
+                            ),
+                            returnStatement
+                        )
+                    );
+                }
+
+                if (state.nonLocalJumps & Jump.Break) {
+                    statements.push(
+                        createIf(
+                            createBinary(
+                                loopResultName,
+                                SyntaxKind.EqualsEqualsEqualsToken,
+                                createLiteral("break")
+                            ),
+                            createBreak()
+                        )
+                    );
+                }
+
+                if (state.labeledNonLocalBreaks || state.labeledNonLocalContinues) {
+                    const caseClauses: CaseClause[] = [];
+                    processLabeledJumps(state.labeledNonLocalBreaks, /*isBreak*/ true, loopResultName, outerConvertedLoopState, caseClauses);
+                    processLabeledJumps(state.labeledNonLocalContinues, /*isBreak*/ false, loopResultName, outerConvertedLoopState, caseClauses);
+                    statements.push(
+                        createSwitch(
+                            loopResultName,
+                            createCaseBlock(caseClauses)
+                        )
+                    );
+                }
+            }
+            return statements;
+        }
+
+        function setLabeledJump(state: ConvertedLoopState, isBreak: boolean, labelText: string, labelMarker: string): void {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = createMap<string>();
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = createMap<string>();
+                }
+                state.labeledNonLocalContinues[labelText] = labelMarker;
+            }
+        }
+
+        function processLabeledJumps(table: Map<string>, isBreak: boolean, loopResultName: Identifier, outerLoop: ConvertedLoopState, caseClauses: CaseClause[]): void {
+            if (!table) {
+                return;
+            }
+            for (const labelText in table) {
+                const labelMarker = table[labelText];
+                const statements: Statement[] = [];
+                // if there are no outer converted loop or outer label in question is located inside outer converted loop
+                // then emit labeled break\continue
+                // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do
+                if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
+                    const label = createIdentifier(labelText);
+                    statements.push(isBreak ? createBreak(label) : createContinue(label));
+                }
+                else {
+                    setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                    statements.push(createReturn(loopResultName));
+                }
+                caseClauses.push(createCaseClause(createLiteral(labelMarker), statements));
+            }
+        }
+
+        function processLoopVariableDeclaration(decl: VariableDeclaration | BindingElement, loopParameters: ParameterDeclaration[], loopOutParameters: LoopOutParameter[]) {
+            const name = decl.name;
+            if (isBindingPattern(name)) {
+                for (const element of name.elements) {
+                    processLoopVariableDeclaration(element, loopParameters, loopOutParameters);
+                }
+            }
+            else {
+                loopParameters.push(createParameter(name));
+                if (resolver.getNodeCheckFlags(decl) & NodeCheckFlags.NeedsLoopOutParameter) {
+                    const outParamName = createUniqueName("out_" + name.text);
+                    loopOutParameters.push({ originalName: name, outParamName });
+                }
+            }
+        }
+
+        /**
+         * Adds the members of an object literal to an array of expressions.
+         *
+         * @param expressions An array of expressions.
+         * @param node An ObjectLiteralExpression node.
+         * @param receiver The receiver for members of the ObjectLiteralExpression.
+         * @param numInitialNonComputedProperties The number of initial properties without
+         *                                        computed property names.
+         */
+        function addObjectLiteralMembers(expressions: Expression[], node: ObjectLiteralExpression, receiver: Identifier, start: number) {
+            const properties = node.properties;
+            const numProperties = properties.length;
+            for (let i = start; i < numProperties; i++) {
+                const property = properties[i];
+                switch (property.kind) {
+                    case SyntaxKind.GetAccessor:
+                    case SyntaxKind.SetAccessor:
+                        const accessors = getAllAccessorDeclarations(node.properties, <AccessorDeclaration>property);
+                        if (property === accessors.firstAccessor) {
+                            expressions.push(transformAccessorsToExpression(receiver, accessors, node.multiLine));
+                        }
+
+                        break;
+
+                    case SyntaxKind.PropertyAssignment:
+                        expressions.push(transformPropertyAssignmentToExpression(node, <PropertyAssignment>property, receiver, node.multiLine));
+                        break;
+
+                    case SyntaxKind.ShorthandPropertyAssignment:
+                        expressions.push(transformShorthandPropertyAssignmentToExpression(node, <ShorthandPropertyAssignment>property, receiver, node.multiLine));
+                        break;
+
+                    case SyntaxKind.MethodDeclaration:
+                        expressions.push(transformObjectLiteralMethodDeclarationToExpression(node, <MethodDeclaration>property, receiver, node.multiLine));
+                        break;
+
+                    default:
+                        Debug.failBadSyntaxKind(node);
+                        break;
+                }
+            }
+        }
+
+        /**
+         * Transforms a PropertyAssignment node into an expression.
+         *
+         * @param node The ObjectLiteralExpression that contains the PropertyAssignment.
+         * @param property The PropertyAssignment node.
+         * @param receiver The receiver for the assignment.
+         */
+        function transformPropertyAssignmentToExpression(node: ObjectLiteralExpression, property: PropertyAssignment, receiver: Expression, startsOnNewLine: boolean) {
+            const expression = createAssignment(
+                createMemberAccessForPropertyName(
+                    receiver,
+                    visitNode(property.name, visitor, isPropertyName)
+                ),
+                visitNode(property.initializer, visitor, isExpression),
+                /*location*/ property
+            );
+            if (startsOnNewLine) {
+                expression.startsOnNewLine = true;
+            }
+            return expression;
+        }
+
+        /**
+         * Transforms a ShorthandPropertyAssignment node into an expression.
+         *
+         * @param node The ObjectLiteralExpression that contains the ShorthandPropertyAssignment.
+         * @param property The ShorthandPropertyAssignment node.
+         * @param receiver The receiver for the assignment.
+         */
+        function transformShorthandPropertyAssignmentToExpression(node: ObjectLiteralExpression, property: ShorthandPropertyAssignment, receiver: Expression, startsOnNewLine: boolean) {
+            const expression = createAssignment(
+                createMemberAccessForPropertyName(
+                    receiver,
+                    visitNode(property.name, visitor, isPropertyName)
+                ),
+                getSynthesizedClone(property.name),
+                /*location*/ property
+            );
+            if (startsOnNewLine) {
+                expression.startsOnNewLine = true;
+            }
+            return expression;
+        }
+
+        /**
+         * Transforms a MethodDeclaration of an ObjectLiteralExpression into an expression.
+         *
+         * @param node The ObjectLiteralExpression that contains the MethodDeclaration.
+         * @param method The MethodDeclaration node.
+         * @param receiver The receiver for the assignment.
+         */
+        function transformObjectLiteralMethodDeclarationToExpression(node: ObjectLiteralExpression, method: MethodDeclaration, receiver: Expression, startsOnNewLine: boolean) {
+            const expression = createAssignment(
+                createMemberAccessForPropertyName(
+                    receiver,
+                    visitNode(method.name, visitor, isPropertyName)
+                ),
+                transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined),
+                /*location*/ method
+            );
+            if (startsOnNewLine) {
+                expression.startsOnNewLine = true;
+            }
+            return expression;
+        }
+
+        /**
+         * Visits a MethodDeclaration of an ObjectLiteralExpression and transforms it into a
+         * PropertyAssignment.
+         *
+         * @param node A MethodDeclaration node.
+         */
+        function visitMethodDeclaration(node: MethodDeclaration): ObjectLiteralElement {
+            // We should only get here for methods on an object literal with regular identifier names.
+            // Methods on classes are handled in visitClassDeclaration/visitClassExpression.
+            // Methods with computed property names are handled in visitObjectLiteralExpression.
+            Debug.assert(!isComputedPropertyName(node.name));
+            const functionExpression = transformFunctionLikeToExpression(node, /*location*/ moveRangePos(node, -1), /*name*/ undefined);
+            setNodeEmitFlags(functionExpression, NodeEmitFlags.NoLeadingComments | getNodeEmitFlags(functionExpression));
+            return createPropertyAssignment(
+                node.name,
+                functionExpression,
+                /*location*/ node
+            );
+        }
+
+        /**
+         * Visits a ShorthandPropertyAssignment and transforms it into a PropertyAssignment.
+         *
+         * @param node A ShorthandPropertyAssignment node.
+         */
+        function visitShorthandPropertyAssignment(node: ShorthandPropertyAssignment): ObjectLiteralElement {
+            return createPropertyAssignment(
+                node.name,
+                getSynthesizedClone(node.name),
+                /*location*/ node
+            );
+        }
+
+        /**
+         * Visits a YieldExpression node.
+         *
+         * @param node A YieldExpression node.
+         */
+        function visitYieldExpression(node: YieldExpression): Expression {
+            // `yield` expressions are transformed using the generators transformer.
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits an ArrayLiteralExpression that contains a spread element.
+         *
+         * @param node An ArrayLiteralExpression node.
+         */
+        function visitArrayLiteralExpression(node: ArrayLiteralExpression): Expression {
+            // We are here because we contain a SpreadElementExpression.
+            return transformAndSpreadElements(node.elements, /*needsUniqueCopy*/ true, node.multiLine, /*hasTrailingComma*/ node.elements.hasTrailingComma);
+        }
+
+        /**
+         * Visits a CallExpression that contains either a spread element or `super`.
+         *
+         * @param node a CallExpression.
+         */
+        function visitCallExpression(node: CallExpression): LeftHandSideExpression {
+            // We are here either because SuperKeyword was used somewhere in the expression, or
+            // because we contain a SpreadElementExpression.
+
+            const { target, thisArg } = createCallBinding(node.expression, hoistVariableDeclaration);
+            if (node.transformFlags & TransformFlags.ContainsSpreadElementExpression) {
+                // [source]
+                //      f(...a, b)
+                //      x.m(...a, b)
+                //      super(...a, b)
+                //      super.m(...a, b) // in static
+                //      super.m(...a, b) // in instance
+                //
+                // [output]
+                //      f.apply(void 0, a.concat([b]))
+                //      (_a = x).m.apply(_a, a.concat([b]))
+                //      _super.apply(this, a.concat([b]))
+                //      _super.m.apply(this, a.concat([b]))
+                //      _super.prototype.m.apply(this, a.concat([b]))
+
+                return createFunctionApply(
+                    visitNode(target, visitor, isExpression),
+                    visitNode(thisArg, visitor, isExpression),
+                    transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)
+                );
+            }
+            else {
+                // [source]
+                //      super(a)
+                //      super.m(a) // in static
+                //      super.m(a) // in instance
+                //
+                // [output]
+                //      _super.call(this, a)
+                //      _super.m.call(this, a)
+                //      _super.prototype.m.call(this, a)
+
+                return createFunctionCall(
+                    visitNode(target, visitor, isExpression),
+                    visitNode(thisArg, visitor, isExpression),
+                    visitNodes(node.arguments, visitor, isExpression),
+                    /*location*/ node
+                );
+            }
+        }
+
+        /**
+         * Visits a NewExpression that contains a spread element.
+         *
+         * @param node A NewExpression node.
+         */
+        function visitNewExpression(node: NewExpression): LeftHandSideExpression {
+            // We are here because we contain a SpreadElementExpression.
+            Debug.assert((node.transformFlags & TransformFlags.ContainsSpreadElementExpression) !== 0);
+
+            // [source]
+            //      new C(...a)
+            //
+            // [output]
+            //      new ((_a = C).bind.apply(_a, [void 0].concat(a)))()
+
+            const { target, thisArg } = createCallBinding(createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration);
+            return createNew(
+                createFunctionApply(
+                    visitNode(target, visitor, isExpression),
+                    thisArg,
+                    transformAndSpreadElements(createNodeArray([createVoidZero(), ...node.arguments]), /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)
+                ),
+                /*typeArguments*/ undefined,
+                []
+            );
+        }
+
+        /**
+         * Transforms an array of Expression nodes that contains a SpreadElementExpression.
+         *
+         * @param elements The array of Expression nodes.
+         * @param needsUniqueCopy A value indicating whether to ensure that the result is a fresh array.
+         * @param multiLine A value indicating whether the result should be emitted on multiple lines.
+         */
+        function transformAndSpreadElements(elements: NodeArray<Expression>, needsUniqueCopy: boolean, multiLine: boolean, hasTrailingComma: boolean): Expression {
+            // [source]
+            //      [a, ...b, c]
+            //
+            // [output]
+            //      [a].concat(b, [c])
+
+            // Map spans of spread expressions into their expressions and spans of other
+            // expressions into an array literal.
+            const numElements = elements.length;
+            const segments = flatten(
+                spanMap(elements, partitionSpreadElement, (partition, visitPartition, start, end) =>
+                    visitPartition(partition, multiLine, hasTrailingComma && end === numElements)
+                )
+            );
+
+            if (segments.length === 1) {
+                const firstElement = elements[0];
+                return needsUniqueCopy && isSpreadElementExpression(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
+                    ? createArraySlice(segments[0])
+                    : segments[0];
+            }
+
+            // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
+            return createArrayConcat(segments.shift(), segments);
+        }
+
+        function partitionSpreadElement(node: Expression) {
+            return isSpreadElementExpression(node)
+                ? visitSpanOfSpreadElements
+                : visitSpanOfNonSpreadElements;
+        }
+
+        function visitSpanOfSpreadElements(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
+            return map(chunk, visitExpressionOfSpreadElement);
+        }
+
+        function visitSpanOfNonSpreadElements(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
+            return createArrayLiteral(
+                visitNodes(createNodeArray(chunk, /*location*/ undefined, hasTrailingComma), visitor, isExpression),
+                /*location*/ undefined,
+                multiLine
+            );
+        }
+
+        /**
+         * Transforms the expression of a SpreadElementExpression node.
+         *
+         * @param node A SpreadElementExpression node.
+         */
+        function visitExpressionOfSpreadElement(node: SpreadElementExpression) {
+            return visitNode(node.expression, visitor, isExpression);
+        }
+
+        /**
+         * Visits a template literal.
+         *
+         * @param node A template literal.
+         */
+        function visitTemplateLiteral(node: LiteralExpression): LeftHandSideExpression {
+            return createLiteral(node.text, /*location*/ node);
+        }
+
+        /**
+         * Visits a TaggedTemplateExpression node.
+         *
+         * @param node A TaggedTemplateExpression node.
+         */
+        function visitTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            // Visit the tag expression
+            const tag = visitNode(node.tag, visitor, isExpression);
+
+            // Allocate storage for the template site object
+            const temp = createTempVariable(hoistVariableDeclaration);
+
+            // Build up the template arguments and the raw and cooked strings for the template.
+            const templateArguments: Expression[] = [temp];
+            const cookedStrings: Expression[] = [];
+            const rawStrings: Expression[] = [];
+            const template = node.template;
+            if (isNoSubstitutionTemplateLiteral(template)) {
+                cookedStrings.push(createLiteral(template.text));
+                rawStrings.push(getRawLiteral(template));
+            }
+            else {
+                cookedStrings.push(createLiteral(template.head.text));
+                rawStrings.push(getRawLiteral(template.head));
+                for (const templateSpan of template.templateSpans) {
+                    cookedStrings.push(createLiteral(templateSpan.literal.text));
+                    rawStrings.push(getRawLiteral(templateSpan.literal));
+                    templateArguments.push(visitNode(templateSpan.expression, visitor, isExpression));
+                }
+            }
+
+            // NOTE: The parentheses here is entirely optional as we are now able to auto-
+            //       parenthesize when rebuilding the tree. This should be removed in a
+            //       future version. It is here for now to match our existing emit.
+            return createParen(
+                inlineExpressions([
+                    createAssignment(temp, createArrayLiteral(cookedStrings)),
+                    createAssignment(createPropertyAccess(temp, "raw"), createArrayLiteral(rawStrings)),
+                    createCall(tag, /*typeArguments*/ undefined, templateArguments)
+                ])
+            );
+        }
+
+        /**
+         * Creates an ES5 compatible literal from an ES6 template literal.
+         *
+         * @param node The ES6 template literal.
+         */
+        function getRawLiteral(node: LiteralLikeNode) {
+            // Find original source text, since we need to emit the raw strings of the tagged template.
+            // The raw strings contain the (escaped) strings of what the user wrote.
+            // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
+            let text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+
+            // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
+            // thus we need to remove those characters.
+            // First template piece starts with "`", others with "}"
+            // Last template piece ends with "`", others with "${"
+            const isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
+            text = text.substring(1, text.length - (isLast ? 1 : 2));
+
+            // Newline normalization:
+            // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's
+            // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for both TV and TRV.
+            text = text.replace(/\r\n?/g, "\n");
+            return createLiteral(text, /*location*/ node);
+        }
+
+        /**
+         * Visits a TemplateExpression node.
+         *
+         * @param node A TemplateExpression node.
+         */
+        function visitTemplateExpression(node: TemplateExpression): Expression {
+            const expressions: Expression[] = [];
+            addTemplateHead(expressions, node);
+            addTemplateSpans(expressions, node);
+
+            // createAdd will check if each expression binds less closely than binary '+'.
+            // If it does, it wraps the expression in parentheses. Otherwise, something like
+            //    `abc${ 1 << 2 }`
+            // becomes
+            //    "abc" + 1 << 2 + ""
+            // which is really
+            //    ("abc" + 1) << (2 + "")
+            // rather than
+            //    "abc" + (1 << 2) + ""
+            const expression = reduceLeft(expressions, createAdd);
+            if (nodeIsSynthesized(expression)) {
+                setTextRange(expression, node);
+            }
+
+            return expression;
+        }
+
+        /**
+         * Gets a value indicating whether we need to include the head of a TemplateExpression.
+         *
+         * @param node A TemplateExpression node.
+         */
+        function shouldAddTemplateHead(node: TemplateExpression) {
+            // If this expression has an empty head literal and the first template span has a non-empty
+            // literal, then emitting the empty head literal is not necessary.
+            //     `${ foo } and ${ bar }`
+            // can be emitted as
+            //     foo + " and " + bar
+            // This is because it is only required that one of the first two operands in the emit
+            // output must be a string literal, so that the other operand and all following operands
+            // are forced into strings.
+            //
+            // If the first template span has an empty literal, then the head must still be emitted.
+            //     `${ foo }${ bar }`
+            // must still be emitted as
+            //     "" + foo + bar
+
+            // There is always atleast one templateSpan in this code path, since
+            // NoSubstitutionTemplateLiterals are directly emitted via emitLiteral()
+            Debug.assert(node.templateSpans.length !== 0);
+
+            return node.head.text.length !== 0 || node.templateSpans[0].literal.text.length === 0;
+        }
+
+        /**
+         * Adds the head of a TemplateExpression to an array of expressions.
+         *
+         * @param expressions An array of expressions.
+         * @param node A TemplateExpression node.
+         */
+        function addTemplateHead(expressions: Expression[], node: TemplateExpression): void {
+            if (!shouldAddTemplateHead(node)) {
+                return;
+            }
+
+            expressions.push(createLiteral(node.head.text));
+        }
+
+        /**
+         * Visits and adds the template spans of a TemplateExpression to an array of expressions.
+         *
+         * @param expressions An array of expressions.
+         * @param node A TemplateExpression node.
+         */
+        function addTemplateSpans(expressions: Expression[], node: TemplateExpression): void {
+            for (const span of node.templateSpans) {
+                expressions.push(visitNode(span.expression, visitor, isExpression));
+
+                // Only emit if the literal is non-empty.
+                // The binary '+' operator is left-associative, so the first string concatenation
+                // with the head will force the result up to this point to be a string.
+                // Emitting a '+ ""' has no semantic effect for middles and tails.
+                if (span.literal.text.length !== 0) {
+                    expressions.push(createLiteral(span.literal.text));
+                }
+            }
+        }
+
+        /**
+         * Visits the `super` keyword
+         */
+        function visitSuperKeyword(node: PrimaryExpression): LeftHandSideExpression {
+            return containingNonArrowFunction
+                && isClassElement(containingNonArrowFunction)
+                && !hasModifier(containingNonArrowFunction, ModifierFlags.Static)
+                && currentParent.kind !== SyntaxKind.CallExpression
+                    ? createPropertyAccess(createIdentifier("_super"), "prototype")
+                    : createIdentifier("_super");
+        }
+
+        function visitSourceFileNode(node: SourceFile): SourceFile {
+            const [prologue, remaining] = span(node.statements, isPrologueDirective);
+            const statements: Statement[] = [];
+            startLexicalEnvironment();
+            addRange(statements, prologue);
+            addCaptureThisForNodeIfNeeded(statements, node);
+            addRange(statements, visitNodes(createNodeArray(remaining), visitor, isStatement));
+            addRange(statements, endLexicalEnvironment());
+            const clone = getMutableClone(node);
+            clone.statements = createNodeArray(statements, /*location*/ node.statements);
+            return clone;
+        }
+
+        /**
+         * Called by the printer just before a node is printed.
+         *
+         * @param node The node to be printed.
+         */
+        function onEmitNode(node: Node, emit: (node: Node) => void) {
+            const savedUseCapturedThis = useCapturedThis;
+
+            if (enabledSubstitutions & ES6SubstitutionFlags.CapturedThis && isFunctionLike(node)) {
+                // If we are tracking a captured `this`, push a bit that indicates whether the
+                // containing function is an arrow function.
+                useCapturedThis = (getNodeEmitFlags(node) & NodeEmitFlags.CapturesThis) !== 0;
+            }
+
+            previousOnEmitNode(node, emit);
+
+            useCapturedThis = savedUseCapturedThis;
+        }
+
+        /**
+         * Enables a more costly code path for substitutions when we determine a source file
+         * contains block-scoped bindings (e.g. `let` or `const`).
+         */
+        function enableSubstitutionsForBlockScopedBindings() {
+            if ((enabledSubstitutions & ES6SubstitutionFlags.BlockScopedBindings) === 0) {
+                enabledSubstitutions |= ES6SubstitutionFlags.BlockScopedBindings;
+                context.enableSubstitution(SyntaxKind.Identifier);
+            }
+        }
+
+        /**
+         * Enables a more costly code path for substitutions when we determine a source file
+         * contains a captured `this`.
+         */
+        function enableSubstitutionsForCapturedThis() {
+            if ((enabledSubstitutions & ES6SubstitutionFlags.CapturedThis) === 0) {
+                enabledSubstitutions |= ES6SubstitutionFlags.CapturedThis;
+                context.enableSubstitution(SyntaxKind.ThisKeyword);
+                context.enableEmitNotification(SyntaxKind.Constructor);
+                context.enableEmitNotification(SyntaxKind.MethodDeclaration);
+                context.enableEmitNotification(SyntaxKind.GetAccessor);
+                context.enableEmitNotification(SyntaxKind.SetAccessor);
+                context.enableEmitNotification(SyntaxKind.ArrowFunction);
+                context.enableEmitNotification(SyntaxKind.FunctionExpression);
+                context.enableEmitNotification(SyntaxKind.FunctionDeclaration);
+            }
+        }
+
+        /**
+         * Hooks node substitutions.
+         *
+         * @param node The node to substitute.
+         * @param isExpression A value indicating whether the node is to be used in an expression
+         *                     position.
+         */
+        function onSubstituteNode(node: Node, isExpression: boolean) {
+            node = previousOnSubstituteNode(node, isExpression);
+
+            if (isExpression) {
+                return substituteExpression(node);
+            }
+
+            if (isIdentifier(node)) {
+                return substituteIdentifier(node);
+            }
+
+            return node;
+        }
+
+        /**
+         * Hooks substitutions for non-expression identifiers.
+         */
+        function substituteIdentifier(node: Identifier) {
+            // Only substitute the identifier if we have enabled substitutions for block-scoped
+            // bindings.
+            if (enabledSubstitutions & ES6SubstitutionFlags.BlockScopedBindings) {
+                const original = getParseTreeNode(node, isIdentifier);
+                if (original && isNameOfDeclarationWithCollidingName(original)) {
+                    return getGeneratedNameForNode(original);
+                }
+            }
+
+            return node;
+        }
+
+        /**
+         * Determines whether a name is the name of a declaration with a colliding name.
+         * NOTE: This function expects to be called with an original source tree node.
+         *
+         * @param node An original source tree node.
+         */
+        function isNameOfDeclarationWithCollidingName(node: Identifier) {
+            const parent = node.parent;
+            switch (parent.kind) {
+                case SyntaxKind.BindingElement:
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.EnumDeclaration:
+                case SyntaxKind.VariableDeclaration:
+                    return (<Declaration>parent).name === node
+                        && resolver.isDeclarationWithCollidingName(<Declaration>parent);
+            }
+
+            return false;
+        }
+
+        /**
+         * Substitutes an expression.
+         *
+         * @param node An Expression node.
+         */
+        function substituteExpression(node: Node) {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return substituteExpressionIdentifier(<Identifier>node);
+
+                case SyntaxKind.ThisKeyword:
+                    return substituteThisKeyword(<PrimaryExpression>node);
+            }
+
+            return node;
+        }
+
+        /**
+         * Substitutes an expression identifier.
+         *
+         * @param node An Identifier node.
+         */
+        function substituteExpressionIdentifier(node: Identifier): Identifier {
+            if (enabledSubstitutions & ES6SubstitutionFlags.BlockScopedBindings) {
+                const declaration = resolver.getReferencedDeclarationWithCollidingName(node);
+                if (declaration) {
+                    return getGeneratedNameForNode(declaration.name);
+                }
+            }
+
+            return node;
+        }
+
+        /**
+         * Substitutes `this` when contained within an arrow function.
+         *
+         * @param node The ThisKeyword node.
+         */
+        function substituteThisKeyword(node: PrimaryExpression): PrimaryExpression {
+            if (enabledSubstitutions & ES6SubstitutionFlags.CapturedThis && useCapturedThis) {
+                return createIdentifier("_this", /*location*/ node);
+            }
+
+            return node;
+        }
+
+        /**
+         * Gets the local name for a declaration for use in expressions.
+         *
+         * A local name will *never* be prefixed with an module or namespace export modifier like
+         * "exports.".
+         *
+         * @param node The declaration.
+         * @param allowComments A value indicating whether comments may be emitted for the name.
+         * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+         */
+        function getLocalName(node: ClassDeclaration | ClassExpression | FunctionDeclaration, allowComments?: boolean, allowSourceMaps?: boolean) {
+            return getDeclarationName(node, allowComments, allowSourceMaps, NodeEmitFlags.LocalName);
+        }
+
+        /**
+         * Gets the name of a declaration, without source map or comments.
+         *
+         * @param node The declaration.
+         * @param allowComments Allow comments for the name.
+         */
+        function getDeclarationName(node: DeclarationStatement | ClassExpression, allowComments?: boolean, allowSourceMaps?: boolean, emitFlags?: NodeEmitFlags) {
+            if (node.name && !isGeneratedIdentifier(node.name)) {
+                const name = getMutableClone(node.name);
+                emitFlags |= getNodeEmitFlags(node.name);
+                if (!allowSourceMaps) {
+                    emitFlags |= NodeEmitFlags.NoSourceMap;
+                }
+                if (!allowComments) {
+                    emitFlags |= NodeEmitFlags.NoComments;
+                }
+                if (emitFlags) {
+                    setNodeEmitFlags(name, emitFlags);
+                }
+                return name;
+            }
+
+            return getGeneratedNameForNode(node);
+        }
+
+        function getClassMemberPrefix(node: ClassExpression | ClassDeclaration, member: ClassElement) {
+            const expression = getLocalName(node);
+            return hasModifier(member, ModifierFlags.Static) ? expression : createPropertyAccess(expression, "prototype");
+        }
+
+        function hasSynthesizedDefaultSuperCall(constructor: ConstructorDeclaration, hasExtendsClause: boolean) {
+            if (!constructor || !hasExtendsClause) {
+                return false;
+            }
+
+            const parameter = singleOrUndefined(constructor.parameters);
+            if (!parameter || !nodeIsSynthesized(parameter) || !parameter.dotDotDotToken) {
+                return false;
+            }
+
+            const statement = firstOrUndefined(constructor.body.statements);
+            if (!statement || !nodeIsSynthesized(statement) || statement.kind !== SyntaxKind.ExpressionStatement) {
+                return false;
+            }
+
+            const statementExpression = (<ExpressionStatement>statement).expression;
+            if (!nodeIsSynthesized(statementExpression) || statementExpression.kind !== SyntaxKind.CallExpression) {
+                return false;
+            }
+
+            const callTarget = (<CallExpression>statementExpression).expression;
+            if (!nodeIsSynthesized(callTarget) || callTarget.kind !== SyntaxKind.SuperKeyword) {
+                return false;
+            }
+
+            const callArgument = singleOrUndefined((<CallExpression>statementExpression).arguments);
+            if (!callArgument || !nodeIsSynthesized(callArgument) || callArgument.kind !== SyntaxKind.SpreadElementExpression) {
+                return false;
+            }
+
+            const expression = (<SpreadElementExpression>callArgument).expression;
+            return isIdentifier(expression) && expression === parameter.name;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/es7.ts b/src/compiler/transformers/es7.ts
new file mode 100644
index 00000000000..5d848bc608b
--- /dev/null
+++ b/src/compiler/transformers/es7.ts
@@ -0,0 +1,97 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    export function transformES7(context: TransformationContext) {
+        const { hoistVariableDeclaration } = context;
+
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitor(node: Node): VisitResult<Node> {
+            if (node.transformFlags & TransformFlags.ES7) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsES7) {
+                return visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+
+        function visitorWorker(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.BinaryExpression:
+                    return visitBinaryExpression(<BinaryExpression>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function visitBinaryExpression(node: BinaryExpression): Expression {
+            // We are here because ES7 adds support for the exponentiation operator.
+            const left = visitNode(node.left, visitor, isExpression);
+            const right = visitNode(node.right, visitor, isExpression);
+            if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken) {
+                let target: Expression;
+                let value: Expression;
+                if (isElementAccessExpression(left)) {
+                    // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)`
+                    const expressionTemp = createTempVariable(hoistVariableDeclaration);
+
+                    const argumentExpressionTemp = createTempVariable(hoistVariableDeclaration);
+
+                    target = createElementAccess(
+                        createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
+                        createAssignment(argumentExpressionTemp, left.argumentExpression, /*location*/ left.argumentExpression),
+                        /*location*/ left
+                    );
+
+                    value = createElementAccess(
+                        expressionTemp,
+                        argumentExpressionTemp,
+                        /*location*/ left
+                    );
+                }
+                else if (isPropertyAccessExpression(left)) {
+                    // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)`
+                    const expressionTemp = createTempVariable(hoistVariableDeclaration);
+
+                    target = createPropertyAccess(
+                        createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
+                        left.name,
+                        /*location*/ left
+                    );
+
+                    value = createPropertyAccess(
+                        expressionTemp,
+                        left.name,
+                        /*location*/ left
+                    );
+                }
+                else {
+                    // Transforms `a **= b` into `a = Math.pow(a, b)`
+                    target = left;
+                    value = left;
+                }
+
+                return createAssignment(target, createMathPow(value, right, /*location*/ node), /*location*/ node);
+            }
+            else if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskToken) {
+                // Transforms `a ** b` into `Math.pow(a, b)`
+                return createMathPow(left, right, /*location*/ node);
+            }
+            else {
+                Debug.failBadSyntaxKind(node);
+                return visitEachChild(node, visitor, context);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
new file mode 100644
index 00000000000..9a4b567cb80
--- /dev/null
+++ b/src/compiler/transformers/generators.ts
@@ -0,0 +1,3028 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+// Transforms generator functions into a compatible ES5 representation with similar runtime
+// semantics. This is accomplished by first transforming the body of each generator
+// function into an intermediate representation that is the compiled into a JavaScript
+// switch statement.
+//
+// Many functions in this transformer will contain comments indicating the expected
+// intermediate representation. For illustrative purposes, the following intermediate
+// language is used to define this intermediate representation:
+//
+//  .nop                            - Performs no operation.
+//  .local NAME, ...                - Define local variable declarations.
+//  .mark LABEL                     - Mark the location of a label.
+//  .br LABEL                       - Jump to a label. If jumping out of a protected
+//                                    region, all .finally blocks are executed.
+//  .brtrue LABEL, (x)              - Jump to a label IIF the expression `x` is truthy.
+//                                    If jumping out of a protected region, all .finally
+//                                    blocks are executed.
+//  .brfalse LABEL, (x)             - Jump to a label IIF the expression `x` is falsey.
+//                                    If jumping out of a protected region, all .finally
+//                                    blocks are executed.
+//  .yield RESUME, (x)              - Yield the value of the optional expression `x`.
+//                                    Resume at the label RESUME.
+//  .yieldstar RESUME, (x)          - Delegate yield to the value of the optional
+//                                    expression `x`. Resume at the label RESUME.
+//  .loop CONTINUE, BREAK           - Marks the beginning of a loop. Any "continue" or
+//                                    "break" abrupt completions jump to the CONTINUE or
+//                                    BREAK labels, respectively.
+//  .endloop                        - Marks the end of a loop.
+//  .with (x)                       - Marks the beginning of a WithStatement block, using
+//                                    the supplied expression.
+//  .endwith                        - Marks the end of a WithStatement.
+//  .switch                         - Marks the beginning of a SwitchStatement.
+//  .endswitch                      - Marks the end of a SwitchStatement.
+//  .labeled NAME                   - Marks the beginning of a LabeledStatement with the
+//                                    supplied name.
+//  .endlabeled                     - Marks the end of a LabeledStatement.
+//  .try TRY, CATCH, FINALLY, END   - Marks the beginning of a protected region, and the
+//                                    labels for each block.
+//  .catch (x)                      - Marks the beginning of a catch block.
+//  .finally                        - Marks the beginning of a finally block.
+//  .endfinally                     - Marks the end of a finally block.
+//  .endtry                         - Marks the end of a protected region.
+//  .throw (x)                      - Throws the value of the expression `x`.
+//  .return (x)                     - Returns the value of the expression `x`.
+//
+// In addition, the illustrative intermediate representation introduces some special
+// variables:
+//
+//  %sent%                          - Either returns the next value sent to the generator,
+//                                    returns the result of a delegated yield, or throws
+//                                    the exception sent to the generator.
+//  %error%                         - Returns the value of the current exception in a
+//                                    catch block.
+//
+// This intermediate representation is then compiled into JavaScript syntax. The resulting
+// compilation output looks something like the following:
+//
+//  function f() {
+//      var /*locals*/;
+//      /*functions*/
+//      return __generator(function (state) {
+//          switch (state.label) {
+//              /*cases per label*/
+//          }
+//      });
+//  }
+//
+// Each of the above instructions corresponds to JavaScript emit similar to the following:
+//
+//  .local NAME                   | var NAME;
+// -------------------------------|----------------------------------------------
+//  .mark LABEL                   | case LABEL:
+// -------------------------------|----------------------------------------------
+//  .br LABEL                     |     return [3 /*break*/, LABEL];
+// -------------------------------|----------------------------------------------
+//  .brtrue LABEL, (x)            |     if (x) return [3 /*break*/, LABEL];
+// -------------------------------|----------------------------------------------
+//  .brfalse LABEL, (x)           |     if (!(x)) return [3, /*break*/, LABEL];
+// -------------------------------|----------------------------------------------
+//  .yield RESUME, (x)            |     return [4 /*yield*/, x];
+//  .mark RESUME                  | case RESUME:
+//      a = %sent%;             |     a = state.sent();
+// -------------------------------|----------------------------------------------
+//  .yieldstar RESUME, (X)        |     return [5 /*yield**/, x];
+//  .mark RESUME                  | case RESUME:
+//      a = %sent%;             |     a = state.sent();
+// -------------------------------|----------------------------------------------
+//  .with (_a)                    |     with (_a) {
+//      a();                      |         a();
+//                                |     }
+//                                |     state.label = LABEL;
+//  .mark LABEL                   | case LABEL:
+//                                |     with (_a) {
+//      b();                      |         b();
+//                                |     }
+//  .endwith                      |
+// -------------------------------|----------------------------------------------
+//                                | case 0:
+//                                |     state.trys = [];
+//                                | ...
+//  .try TRY, CATCH, FINALLY, END |
+//  .mark TRY                     | case TRY:
+//                                |     state.trys.push([TRY, CATCH, FINALLY, END]);
+//  .nop                          |
+//      a();                      |     a();
+//  .br END                       |     return [3 /*break*/, END];
+//  .catch (e)                    |
+//  .mark CATCH                   | case CATCH:
+//                                |     e = state.error;
+//      b();                      |     b();
+//  .br END                       |     return [3 /*break*/, END];
+//  .finally                      |
+//  .mark FINALLY                 | case FINALLY:
+//      c();                      |     c();
+//  .endfinally                   |     return [7 /*endfinally*/];
+//  .endtry                       |
+//  .mark END                     | case END:
+
+/*@internal*/
+namespace ts {
+    type Label = number;
+
+    const enum OpCode {
+        Nop,                    // No operation, used to force a new case in the state machine
+        Statement,              // A regular javascript statement
+        Assign,                 // An assignment
+        Break,                  // A break instruction used to jump to a label
+        BreakWhenTrue,          // A break instruction used to jump to a label if a condition evaluates to true
+        BreakWhenFalse,         // A break instruction used to jump to a label if a condition evaluates to false
+        Yield,                  // A completion instruction for the `yield` keyword
+        YieldStar,              // A completion instruction for the `yield*` keyword (not implemented, but reserved for future use)
+        Return,                 // A completion instruction for the `return` keyword
+        Throw,                  // A completion instruction for the `throw` keyword
+        Endfinally              // Marks the end of a `finally` block
+    }
+
+    type OperationArguments = [Label] | [Label, Expression] | [Statement] | [Expression] | [Expression, Expression];
+
+    // whether a generated code block is opening or closing at the current operation for a FunctionBuilder
+    const enum BlockAction {
+        Open,
+        Close,
+    }
+
+    // the kind for a generated code block in a FunctionBuilder
+    const enum CodeBlockKind {
+        Exception,
+        With,
+        Switch,
+        Loop,
+        Labeled
+    }
+
+    // the state for a generated code exception block
+    const enum ExceptionBlockState {
+        Try,
+        Catch,
+        Finally,
+        Done
+    }
+
+    // A generated code block
+    interface CodeBlock {
+        kind: CodeBlockKind;
+    }
+
+    // a generated exception block, used for 'try' statements
+    interface ExceptionBlock extends CodeBlock {
+        state: ExceptionBlockState;
+        startLabel: Label;
+        catchVariable?: Identifier;
+        catchLabel?: Label;
+        finallyLabel?: Label;
+        endLabel: Label;
+    }
+
+    // A generated code that tracks the target for 'break' statements in a LabeledStatement.
+    interface LabeledBlock extends CodeBlock {
+        labelText: string;
+        isScript: boolean;
+        breakLabel: Label;
+    }
+
+    // a generated block that tracks the target for 'break' statements in a 'switch' statement
+    interface SwitchBlock extends CodeBlock {
+        isScript: boolean;
+        breakLabel: Label;
+    }
+
+    // a generated block that tracks the targets for 'break' and 'continue' statements, used for iteration statements
+    interface LoopBlock extends CodeBlock {
+        continueLabel: Label;
+        isScript: boolean;
+        breakLabel: Label;
+    }
+
+    // a generated block associated with a 'with' statement
+    interface WithBlock extends CodeBlock {
+        expression: Identifier;
+        startLabel: Label;
+        endLabel: Label;
+    }
+
+    // NOTE: changes to this enum should be reflected in the __generator helper.
+    const enum Instruction {
+        Next = 0,
+        Throw = 1,
+        Return = 2,
+        Break = 3,
+        Yield = 4,
+        YieldStar = 5,
+        Catch = 6,
+        Endfinally = 7,
+    }
+
+    const instructionNames = createMap<string>({
+        [Instruction.Return]: "return",
+        [Instruction.Break]: "break",
+        [Instruction.Yield]: "yield",
+        [Instruction.YieldStar]: "yield*",
+        [Instruction.Endfinally]: "endfinally",
+    });
+
+    export function transformGenerators(context: TransformationContext) {
+        const {
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            hoistFunctionDeclaration,
+            hoistVariableDeclaration,
+            setSourceMapRange,
+            setCommentRange,
+            setNodeEmitFlags
+        } = context;
+
+        const compilerOptions = context.getCompilerOptions();
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const resolver = context.getEmitResolver();
+        const previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+
+        let currentSourceFile: SourceFile;
+        let renamedCatchVariables: Map<boolean>;
+        let renamedCatchVariableDeclarations: Map<Identifier>;
+
+        let inGeneratorFunctionBody: boolean;
+        let inStatementContainingYield: boolean;
+
+        // The following three arrays store information about generated code blocks.
+        // All three arrays are correlated by their index. This approach is used over allocating
+        // objects to store the same information to avoid GC overhead.
+        //
+        let blocks: CodeBlock[]; // Information about the code block
+        let blockOffsets: number[]; // The operation offset at which a code block begins or ends
+        let blockActions: BlockAction[]; // Whether the code block is opened or closed
+        let blockStack: CodeBlock[]; // A stack of currently open code blocks
+
+        // Labels are used to mark locations in the code that can be the target of a Break (jump)
+        // operation. These are translated into case clauses in a switch statement.
+        // The following two arrays are correlated by their index. This approach is used over
+        // allocating objects to store the same information to avoid GC overhead.
+        //
+        let labelOffsets: number[]; // The operation offset at which the label is defined.
+        let labelExpressions: LiteralExpression[][]; // The NumericLiteral nodes bound to each label.
+        let nextLabelId = 1; // The next label id to use.
+
+        // Operations store information about generated code for the function body. This
+        // Includes things like statements, assignments, breaks (jumps), and yields.
+        // The following three arrays are correlated by their index. This approach is used over
+        // allocating objects to store the same information to avoid GC overhead.
+        //
+        let operations: OpCode[]; // The operation to perform.
+        let operationArguments: OperationArguments[]; // The arguments to the operation.
+        let operationLocations: TextRange[]; // The source map location for the operation.
+
+        let state: Identifier; // The name of the state object used by the generator at runtime.
+
+        // The following variables store information used by the `build` function:
+        //
+        let blockIndex = 0; // The index of the current block.
+        let labelNumber = 0; // The current label number.
+        let labelNumbers: number[][];
+        let lastOperationWasAbrupt: boolean; // Indicates whether the last operation was abrupt (break/continue).
+        let lastOperationWasCompletion: boolean; // Indicates whether the last operation was a completion (return/throw).
+        let clauses: CaseClause[]; // The case clauses generated for labels.
+        let statements: Statement[]; // The statements for the current label.
+        let exceptionBlockStack: ExceptionBlock[]; // A stack of containing exception blocks.
+        let currentExceptionBlock: ExceptionBlock; // The current exception block.
+        let withBlockStack: WithBlock[]; // A stack containing `with` blocks.
+
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            if (node.transformFlags & TransformFlags.ContainsGenerator) {
+                currentSourceFile = node;
+                node = visitEachChild(node, visitor, context);
+                currentSourceFile = undefined;
+            }
+
+            return node;
+        }
+
+        /**
+         * Visits a node.
+         *
+         * @param node The node to visit.
+         */
+        function visitor(node: Node): VisitResult<Node> {
+            const transformFlags = node.transformFlags;
+            if (inStatementContainingYield) {
+                return visitJavaScriptInStatementContainingYield(node);
+            }
+            else if (inGeneratorFunctionBody) {
+                return visitJavaScriptInGeneratorFunctionBody(node);
+            }
+            else if (transformFlags & TransformFlags.Generator) {
+                return visitGenerator(node);
+            }
+            else if (transformFlags & TransformFlags.ContainsGenerator) {
+                return visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+
+        /**
+         * Visits a node that is contained within a statement that contains yield.
+         *
+         * @param node The node to visit.
+         */
+        function visitJavaScriptInStatementContainingYield(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.DoStatement:
+                    return visitDoStatement(<DoStatement>node);
+                case SyntaxKind.WhileStatement:
+                    return visitWhileStatement(<WhileStatement>node);
+                case SyntaxKind.SwitchStatement:
+                    return visitSwitchStatement(<SwitchStatement>node);
+                case SyntaxKind.LabeledStatement:
+                    return visitLabeledStatement(<LabeledStatement>node);
+                default:
+                    return visitJavaScriptInGeneratorFunctionBody(node);
+            }
+        }
+
+        /**
+         * Visits a node that is contained within a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitJavaScriptInGeneratorFunctionBody(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.FunctionDeclaration:
+                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+                case SyntaxKind.FunctionExpression:
+                    return visitFunctionExpression(<FunctionExpression>node);
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return visitAccessorDeclaration(<AccessorDeclaration>node);
+                case SyntaxKind.VariableStatement:
+                    return visitVariableStatement(<VariableStatement>node);
+                case SyntaxKind.ForStatement:
+                    return visitForStatement(<ForStatement>node);
+                case SyntaxKind.ForInStatement:
+                    return visitForInStatement(<ForInStatement>node);
+                case SyntaxKind.BreakStatement:
+                    return visitBreakStatement(<BreakStatement>node);
+                case SyntaxKind.ContinueStatement:
+                    return visitContinueStatement(<ContinueStatement>node);
+                case SyntaxKind.ReturnStatement:
+                    return visitReturnStatement(<ReturnStatement>node);
+                default:
+                    if (node.transformFlags & TransformFlags.ContainsYield) {
+                        return visitJavaScriptContainingYield(node);
+                    }
+                    else if (node.transformFlags & (TransformFlags.ContainsGenerator | TransformFlags.ContainsHoistedDeclarationOrCompletion)) {
+                        return visitEachChild(node, visitor, context);
+                    }
+                    else {
+                        return node;
+                    }
+            }
+        }
+
+        /**
+         * Visits a node that contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitJavaScriptContainingYield(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.BinaryExpression:
+                    return visitBinaryExpression(<BinaryExpression>node);
+                case SyntaxKind.ConditionalExpression:
+                    return visitConditionalExpression(<ConditionalExpression>node);
+                case SyntaxKind.YieldExpression:
+                    return visitYieldExpression(<YieldExpression>node);
+                case SyntaxKind.ArrayLiteralExpression:
+                    return visitArrayLiteralExpression(<ArrayLiteralExpression>node);
+                case SyntaxKind.ObjectLiteralExpression:
+                    return visitObjectLiteralExpression(<ObjectLiteralExpression>node);
+                case SyntaxKind.ElementAccessExpression:
+                    return visitElementAccessExpression(<ElementAccessExpression>node);
+                case SyntaxKind.CallExpression:
+                    return visitCallExpression(<CallExpression>node);
+                case SyntaxKind.NewExpression:
+                    return visitNewExpression(<NewExpression>node);
+                default:
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        /**
+         * Visits a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitGenerator(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.FunctionDeclaration:
+                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+
+                case SyntaxKind.FunctionExpression:
+                    return visitFunctionExpression(<FunctionExpression>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        /**
+         * Visits a function declaration.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The function declaration is a generator function.
+         * - The function declaration is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node: FunctionDeclaration): Statement {
+            // Currently, we only support generators that were originally async functions.
+            if (node.asteriskToken && node.emitFlags & NodeEmitFlags.AsyncFunctionBody) {
+                node = setOriginalNode(
+                    createFunctionDeclaration(
+                        /*decorators*/ undefined,
+                        /*modifiers*/ undefined,
+                        /*asteriskToken*/ undefined,
+                        node.name,
+                        /*typeParameters*/ undefined,
+                        node.parameters,
+                        /*type*/ undefined,
+                        transformGeneratorFunctionBody(node.body),
+                        /*location*/ node
+                    ),
+                    node
+                );
+            }
+            else {
+                const savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+                const savedInStatementContainingYield = inStatementContainingYield;
+                inGeneratorFunctionBody = false;
+                inStatementContainingYield = false;
+                node = visitEachChild(node, visitor, context);
+                inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+                inStatementContainingYield = savedInStatementContainingYield;
+            }
+
+            if (inGeneratorFunctionBody) {
+                // Function declarations in a generator function body are hoisted
+                // to the top of the lexical scope and elided from the current statement.
+                hoistFunctionDeclaration(node);
+                return undefined;
+            }
+            else {
+                return node;
+            }
+        }
+
+        /**
+         * Visits a function expression.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The function expression is a generator function.
+         * - The function expression is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionExpression(node: FunctionExpression): Expression {
+            // Currently, we only support generators that were originally async functions.
+            if (node.asteriskToken && node.emitFlags & NodeEmitFlags.AsyncFunctionBody) {
+                node = setOriginalNode(
+                    createFunctionExpression(
+                        /*asteriskToken*/ undefined,
+                        node.name,
+                        /*typeParameters*/ undefined,
+                        node.parameters,
+                        /*type*/ undefined,
+                        transformGeneratorFunctionBody(node.body),
+                        /*location*/ node
+                    ),
+                    node
+                );
+            }
+            else {
+                const savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+                const savedInStatementContainingYield = inStatementContainingYield;
+                inGeneratorFunctionBody = false;
+                inStatementContainingYield = false;
+                node = visitEachChild(node, visitor, context);
+                inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+                inStatementContainingYield = savedInStatementContainingYield;
+            }
+
+            return node;
+        }
+
+        /**
+         * Visits a get or set accessor declaration.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The accessor is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitAccessorDeclaration(node: GetAccessorDeclaration) {
+            const savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+            const savedInStatementContainingYield = inStatementContainingYield;
+            inGeneratorFunctionBody = false;
+            inStatementContainingYield = false;
+            node = visitEachChild(node, visitor, context);
+            inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+            inStatementContainingYield = savedInStatementContainingYield;
+            return node;
+        }
+
+        /**
+         * Transforms the body of a generator function declaration.
+         *
+         * @param node The function body to transform.
+         */
+        function transformGeneratorFunctionBody(body: Block) {
+            // Save existing generator state
+            const statements: Statement[] = [];
+            const savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+            const savedInStatementContainingYield = inStatementContainingYield;
+            const savedBlocks = blocks;
+            const savedBlockOffsets = blockOffsets;
+            const savedBlockActions = blockActions;
+            const savedLabelOffsets = labelOffsets;
+            const savedLabelExpressions = labelExpressions;
+            const savedNextLabelId = nextLabelId;
+            const savedOperations = operations;
+            const savedOperationArguments = operationArguments;
+            const savedOperationLocations = operationLocations;
+            const savedState = state;
+
+            // Initialize generator state
+            inGeneratorFunctionBody = true;
+            inStatementContainingYield = false;
+            blocks = undefined;
+            blockOffsets = undefined;
+            blockActions = undefined;
+            labelOffsets = undefined;
+            labelExpressions = undefined;
+            nextLabelId = 1;
+            operations = undefined;
+            operationArguments = undefined;
+            operationLocations = undefined;
+            state = createTempVariable(/*recordTempVariable*/ undefined);
+
+            const statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+
+            // Build the generator
+            startLexicalEnvironment();
+
+            transformAndEmitStatements(body.statements, statementOffset);
+
+            const buildResult = build();
+            addRange(statements, endLexicalEnvironment());
+            statements.push(createReturn(buildResult));
+
+            // Restore previous generator state
+            inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+            inStatementContainingYield = savedInStatementContainingYield;
+            blocks = savedBlocks;
+            blockOffsets = savedBlockOffsets;
+            blockActions = savedBlockActions;
+            labelOffsets = savedLabelOffsets;
+            labelExpressions = savedLabelExpressions;
+            nextLabelId = savedNextLabelId;
+            operations = savedOperations;
+            operationArguments = savedOperationArguments;
+            operationLocations = savedOperationLocations;
+            state = savedState;
+
+            return createBlock(statements, /*location*/ body, body.multiLine);
+        }
+
+        /**
+         * Visits a variable statement.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The variable statement is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node: VariableStatement): Statement {
+            if (node.transformFlags & TransformFlags.ContainsYield) {
+                transformAndEmitVariableDeclarationList(node.declarationList);
+                return undefined;
+            }
+            else {
+                for (const variable of node.declarationList.declarations) {
+                    hoistVariableDeclaration(<Identifier>variable.name);
+                }
+
+                const variables = getInitializedVariables(node.declarationList);
+                if (variables.length === 0) {
+                    return undefined;
+                }
+
+                return createStatement(
+                    inlineExpressions(
+                        map(variables, transformInitializedVariable)
+                    )
+                );
+            }
+        }
+
+        /**
+         * Visits a binary expression.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The node contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitBinaryExpression(node: BinaryExpression): Expression {
+            switch (getExpressionAssociativity(node)) {
+                case Associativity.Left:
+                    return visitLeftAssociativeBinaryExpression(node);
+                case Associativity.Right:
+                    return visitRightAssociativeBinaryExpression(node);
+                default:
+                    Debug.fail("Unknown associativity.");
+            }
+        }
+
+        function isCompoundAssignment(kind: SyntaxKind) {
+            return kind >= SyntaxKind.FirstCompoundAssignment
+                && kind <= SyntaxKind.LastCompoundAssignment;
+        }
+
+        function getOperatorForCompoundAssignment(kind: SyntaxKind) {
+            switch (kind) {
+                case SyntaxKind.PlusEqualsToken: return SyntaxKind.PlusToken;
+                case SyntaxKind.MinusEqualsToken: return SyntaxKind.MinusToken;
+                case SyntaxKind.AsteriskEqualsToken: return SyntaxKind.AsteriskToken;
+                case SyntaxKind.AsteriskAsteriskEqualsToken: return SyntaxKind.AsteriskAsteriskToken;
+                case SyntaxKind.SlashEqualsToken: return SyntaxKind.SlashToken;
+                case SyntaxKind.PercentEqualsToken: return SyntaxKind.PercentToken;
+                case SyntaxKind.LessThanLessThanEqualsToken: return SyntaxKind.LessThanLessThanToken;
+                case SyntaxKind.GreaterThanGreaterThanEqualsToken: return SyntaxKind.GreaterThanGreaterThanToken;
+                case SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken: return SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
+                case SyntaxKind.AmpersandEqualsToken: return SyntaxKind.AmpersandToken;
+                case SyntaxKind.BarEqualsToken: return SyntaxKind.BarToken;
+                case SyntaxKind.CaretEqualsToken: return SyntaxKind.CaretToken;
+            }
+        }
+
+        /**
+         * Visits a right-associative binary expression containing `yield`.
+         *
+         * @param node The node to visit.
+         */
+        function visitRightAssociativeBinaryExpression(node: BinaryExpression) {
+            const { left, right } = node;
+            if (containsYield(right)) {
+                let target: Expression;
+                switch (left.kind) {
+                    case SyntaxKind.PropertyAccessExpression:
+                        // [source]
+                        //      a.b = yield;
+                        //
+                        // [intermediate]
+                        //  .local _a
+                        //      _a = a;
+                        //  .yield resumeLabel
+                        //  .mark resumeLabel
+                        //      _a.b = %sent%;
+
+                        target = updatePropertyAccess(
+                            <PropertyAccessExpression>left,
+                            cacheExpression(visitNode((<PropertyAccessExpression>left).expression, visitor, isLeftHandSideExpression)),
+                            (<PropertyAccessExpression>left).name
+                        );
+                        break;
+
+                    case SyntaxKind.ElementAccessExpression:
+                        // [source]
+                        //      a[b] = yield;
+                        //
+                        // [intermediate]
+                        //  .local _a, _b
+                        //      _a = a;
+                        //      _b = b;
+                        //  .yield resumeLabel
+                        //  .mark resumeLabel
+                        //      _a[_b] = %sent%;
+
+                        target = updateElementAccess(<ElementAccessExpression>left,
+                            cacheExpression(visitNode((<ElementAccessExpression>left).expression, visitor, isLeftHandSideExpression)),
+                            cacheExpression(visitNode((<ElementAccessExpression>left).argumentExpression, visitor, isExpression))
+                        );
+                        break;
+
+                    default:
+                        target = visitNode(left, visitor, isExpression);
+                        break;
+                }
+
+                const operator = node.operatorToken.kind;
+                if (isCompoundAssignment(operator)) {
+                    return createBinary(
+                        target,
+                        SyntaxKind.EqualsToken,
+                        createBinary(
+                            cacheExpression(target),
+                            getOperatorForCompoundAssignment(operator),
+                            visitNode(right, visitor, isExpression),
+                            node
+                        ),
+                        node
+                    );
+                }
+                else {
+                    return updateBinary(node, target, visitNode(right, visitor, isExpression));
+                }
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitLeftAssociativeBinaryExpression(node: BinaryExpression) {
+            if (containsYield(node.right)) {
+                if (isLogicalOperator(node.operatorToken.kind)) {
+                    return visitLogicalBinaryExpression(node);
+                }
+                else if (node.operatorToken.kind === SyntaxKind.CommaToken) {
+                    return visitCommaExpression(node);
+                }
+
+                // [source]
+                //      a() + (yield) + c()
+                //
+                // [intermediate]
+                //  .local _a
+                //      _a = a();
+                //  .yield resumeLabel
+                //      _a + %sent% + c()
+
+                const clone = getMutableClone(node);
+                clone.left = cacheExpression(visitNode(node.left, visitor, isExpression));
+                clone.right = visitNode(node.right, visitor, isExpression);
+                return clone;
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a logical binary expression containing `yield`.
+         *
+         * @param node A node to visit.
+         */
+        function visitLogicalBinaryExpression(node: BinaryExpression) {
+            // Logical binary expressions (`&&` and `||`) are shortcutting expressions and need
+            // to be transformed as such:
+            //
+            // [source]
+            //      x = a() && yield;
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = a();
+            //  .brfalse resultLabel, (_a)
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      _a = %sent%;
+            //  .mark resultLabel
+            //      x = _a;
+            //
+            // [source]
+            //      x = a() || yield;
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = a();
+            //  .brtrue resultLabel, (_a)
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      _a = %sent%;
+            //  .mark resultLabel
+            //      x = _a;
+
+            const resultLabel = defineLabel();
+            const resultLocal = declareLocal();
+
+            emitAssignment(resultLocal, visitNode(node.left, visitor, isExpression), /*location*/ node.left);
+            if (node.operatorToken.kind === SyntaxKind.AmpersandAmpersandToken) {
+                // Logical `&&` shortcuts when the left-hand operand is falsey.
+                emitBreakWhenFalse(resultLabel, resultLocal, /*location*/ node.left);
+            }
+            else {
+                // Logical `||` shortcuts when the left-hand operand is truthy.
+                emitBreakWhenTrue(resultLabel, resultLocal, /*location*/ node.left);
+            }
+
+            emitAssignment(resultLocal, visitNode(node.right, visitor, isExpression), /*location*/ node.right);
+            markLabel(resultLabel);
+            return resultLocal;
+        }
+
+        /**
+         * Visits a comma expression containing `yield`.
+         *
+         * @param node The node to visit.
+         */
+        function visitCommaExpression(node: BinaryExpression) {
+            // [source]
+            //      x = a(), yield, b();
+            //
+            // [intermediate]
+            //      a();
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      x = %sent%, b();
+
+            let pendingExpressions: Expression[] = [];
+            visit(node.left);
+            visit(node.right);
+            return inlineExpressions(pendingExpressions);
+
+            function visit(node: Expression) {
+                if (isBinaryExpression(node) && node.operatorToken.kind === SyntaxKind.CommaToken) {
+                    visit(node.left);
+                    visit(node.right);
+                }
+                else {
+                    if (containsYield(node) && pendingExpressions.length > 0) {
+                        emitWorker(OpCode.Statement, [createStatement(inlineExpressions(pendingExpressions))]);
+                        pendingExpressions = [];
+                    }
+
+                    pendingExpressions.push(visitNode(node, visitor, isExpression));
+                }
+            }
+        }
+
+        /**
+         * Visits a conditional expression containing `yield`.
+         *
+         * @param node The node to visit.
+         */
+        function visitConditionalExpression(node: ConditionalExpression): Expression {
+            // [source]
+            //      x = a() ? yield : b();
+            //
+            // [intermediate]
+            //  .local _a
+            //  .brfalse whenFalseLabel, (a())
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      _a = %sent%;
+            //  .br resultLabel
+            //  .mark whenFalseLabel
+            //      _a = b();
+            //  .mark resultLabel
+            //      x = _a;
+
+            // We only need to perform a specific transformation if a `yield` expression exists
+            // in either the `whenTrue` or `whenFalse` branches.
+            // A `yield` in the condition will be handled by the normal visitor.
+            if (containsYield(node.whenTrue) || containsYield(node.whenFalse)) {
+                const whenFalseLabel = defineLabel();
+                const resultLabel = defineLabel();
+                const resultLocal = declareLocal();
+                emitBreakWhenFalse(whenFalseLabel, visitNode(node.condition, visitor, isExpression), /*location*/ node.condition);
+                emitAssignment(resultLocal, visitNode(node.whenTrue, visitor, isExpression), /*location*/ node.whenTrue);
+                emitBreak(resultLabel);
+                markLabel(whenFalseLabel);
+                emitAssignment(resultLocal, visitNode(node.whenFalse, visitor, isExpression), /*location*/ node.whenFalse);
+                markLabel(resultLabel);
+                return resultLocal;
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a `yield` expression.
+         *
+         * @param node The node to visit.
+         */
+        function visitYieldExpression(node: YieldExpression) {
+            // [source]
+            //      x = yield a();
+            //
+            // [intermediate]
+            //  .yield resumeLabel, (a())
+            //  .mark resumeLabel
+            //      x = %sent%;
+
+            // NOTE: we are explicitly not handling YieldStar at this time.
+            const resumeLabel = defineLabel();
+            emitYield(visitNode(node.expression, visitor, isExpression), /*location*/ node);
+            markLabel(resumeLabel);
+            return createGeneratorResume();
+        }
+
+        /**
+         * Visits an ArrayLiteralExpression that contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitArrayLiteralExpression(node: ArrayLiteralExpression) {
+            return visitElements(node.elements, node.multiLine);
+        }
+
+        /**
+         * Visits an array of expressions containing one or more YieldExpression nodes
+         * and returns an expression for the resulting value.
+         *
+         * @param elements The elements to visit.
+         * @param multiLine Whether array literals created should be emitted on multiple lines.
+         */
+        function visitElements(elements: NodeArray<Expression>, multiLine: boolean) {
+            // [source]
+            //      ar = [1, yield, 2];
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = [1];
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      ar = _a.concat([%sent%, 2]);
+
+            const numInitialElements = countInitialNodesWithoutYield(elements);
+            const temp = declareLocal();
+            let hasAssignedTemp = false;
+            if (numInitialElements > 0) {
+                emitAssignment(temp,
+                    createArrayLiteral(
+                        visitNodes(elements, visitor, isExpression, 0, numInitialElements)
+                    )
+                );
+                hasAssignedTemp = true;
+            }
+
+            const expressions = reduceLeft(elements, reduceElement, <Expression[]>[], numInitialElements);
+            return hasAssignedTemp
+                ? createArrayConcat(temp, [createArrayLiteral(expressions)])
+                : createArrayLiteral(expressions);
+
+            function reduceElement(expressions: Expression[], element: Expression) {
+                if (containsYield(element) && expressions.length > 0) {
+                    emitAssignment(
+                        temp,
+                        hasAssignedTemp
+                            ? createArrayConcat(
+                                temp,
+                                [createArrayLiteral(expressions)]
+                            )
+                            : createArrayLiteral(expressions)
+                    );
+                    hasAssignedTemp = true;
+                    expressions = [];
+                }
+
+                expressions.push(visitNode(element, visitor, isExpression));
+                return expressions;
+            }
+        }
+
+        function visitObjectLiteralExpression(node: ObjectLiteralExpression) {
+            // [source]
+            //      o = {
+            //          a: 1,
+            //          b: yield,
+            //          c: 2
+            //      };
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = {
+            //          a: 1
+            //      };
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      o = (_a.b = %sent%,
+            //          _a.c = 2,
+            //          _a);
+
+            const properties = node.properties;
+            const multiLine = node.multiLine;
+            const numInitialProperties = countInitialNodesWithoutYield(properties);
+
+            const temp = declareLocal();
+            emitAssignment(temp,
+                createObjectLiteral(
+                    visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialProperties),
+                    /*location*/ undefined,
+                    multiLine
+                )
+            );
+
+            const expressions = reduceLeft(properties, reduceProperty, <Expression[]>[], numInitialProperties);
+            expressions.push(multiLine ? startOnNewLine(getMutableClone(temp)) : temp);
+            return inlineExpressions(expressions);
+
+            function reduceProperty(expressions: Expression[], property: ObjectLiteralElement) {
+                if (containsYield(property) && expressions.length > 0) {
+                    emitStatement(createStatement(inlineExpressions(expressions)));
+                    expressions = [];
+                }
+
+                const expression = createExpressionForObjectLiteralElement(node, property, temp);
+                const visited = visitNode(expression, visitor, isExpression);
+                if (visited) {
+                    if (multiLine) {
+                        visited.startsOnNewLine = true;
+                    }
+                    expressions.push(visited);
+                }
+                return expressions;
+            }
+        }
+
+        /**
+         * Visits an ElementAccessExpression that contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitElementAccessExpression(node: ElementAccessExpression) {
+            if (containsYield(node.argumentExpression)) {
+                // [source]
+                //      a = x[yield];
+                //
+                // [intermediate]
+                //  .local _a
+                //      _a = x;
+                //  .yield resumeLabel
+                //  .mark resumeLabel
+                //      a = _a[%sent%]
+
+                const clone = getMutableClone(node);
+                clone.expression = cacheExpression(visitNode(node.expression, visitor, isLeftHandSideExpression));
+                clone.argumentExpression = visitNode(node.argumentExpression, visitor, isExpression);
+                return clone;
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitCallExpression(node: CallExpression) {
+            if (forEach(node.arguments, containsYield)) {
+                // [source]
+                //      a.b(1, yield, 2);
+                //
+                // [intermediate]
+                //  .local _a, _b, _c
+                //      _b = (_a = a).b;
+                //      _c = [1];
+                //  .yield resumeLabel
+                //  .mark resumeLabel
+                //      _b.apply(_a, _c.concat([%sent%, 2]));
+
+                const { target, thisArg } = createCallBinding(node.expression, hoistVariableDeclaration, languageVersion, /*cacheIdentifiers*/ true);
+                return setOriginalNode(
+                    createFunctionApply(
+                        cacheExpression(visitNode(target, visitor, isLeftHandSideExpression)),
+                        thisArg,
+                        visitElements(node.arguments, /*multiLine*/ false),
+                        /*location*/ node
+                    ),
+                    node
+                );
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitNewExpression(node: NewExpression) {
+            if (forEach(node.arguments, containsYield)) {
+                // [source]
+                //      new a.b(1, yield, 2);
+                //
+                // [intermediate]
+                //  .local _a, _b, _c
+                //      _b = (_a = a.b).bind;
+                //      _c = [1];
+                //  .yield resumeLabel
+                //  .mark resumeLabel
+                //      new (_b.apply(_a, _c.concat([%sent%, 2])));
+
+                const { target, thisArg } = createCallBinding(createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration);
+                return setOriginalNode(
+                    createNew(
+                        createFunctionApply(
+                            cacheExpression(visitNode(target, visitor, isExpression)),
+                            thisArg,
+                            visitElements(node.arguments, /*multiLine*/ false)
+                        ),
+                        /*typeArguments*/ undefined,
+                        [],
+                        /*location*/ node
+                    ),
+                    node
+                );
+            }
+            return visitEachChild(node, visitor, context);
+        }
+
+        function transformAndEmitStatements(statements: Statement[], start = 0) {
+            const numStatements = statements.length;
+            for (let i = start; i < numStatements; i++) {
+                transformAndEmitStatement(statements[i]);
+            }
+        }
+
+        function transformAndEmitEmbeddedStatement(node: Statement) {
+            if (isBlock(node)) {
+                transformAndEmitStatements(node.statements);
+            }
+            else {
+                transformAndEmitStatement(node);
+            }
+        }
+
+        function transformAndEmitStatement(node: Statement): void {
+            const savedInStatementContainingYield = inStatementContainingYield;
+            if (!inStatementContainingYield) {
+                inStatementContainingYield = containsYield(node);
+            }
+
+            transformAndEmitStatementWorker(node);
+            inStatementContainingYield = savedInStatementContainingYield;
+        }
+
+        function transformAndEmitStatementWorker(node: Statement): void {
+            switch (node.kind) {
+                case SyntaxKind.Block:
+                    return transformAndEmitBlock(<Block>node);
+                case SyntaxKind.ExpressionStatement:
+                    return transformAndEmitExpressionStatement(<ExpressionStatement>node);
+                case SyntaxKind.IfStatement:
+                    return transformAndEmitIfStatement(<IfStatement>node);
+                case SyntaxKind.DoStatement:
+                    return transformAndEmitDoStatement(<DoStatement>node);
+                case SyntaxKind.WhileStatement:
+                    return transformAndEmitWhileStatement(<WhileStatement>node);
+                case SyntaxKind.ForStatement:
+                    return transformAndEmitForStatement(<ForStatement>node);
+                case SyntaxKind.ForInStatement:
+                    return transformAndEmitForInStatement(<ForInStatement>node);
+                case SyntaxKind.ContinueStatement:
+                    return transformAndEmitContinueStatement(<ContinueStatement>node);
+                case SyntaxKind.BreakStatement:
+                    return transformAndEmitBreakStatement(<BreakStatement>node);
+                case SyntaxKind.ReturnStatement:
+                    return transformAndEmitReturnStatement(<ReturnStatement>node);
+                case SyntaxKind.WithStatement:
+                    return transformAndEmitWithStatement(<WithStatement>node);
+                case SyntaxKind.SwitchStatement:
+                    return transformAndEmitSwitchStatement(<SwitchStatement>node);
+                case SyntaxKind.LabeledStatement:
+                    return transformAndEmitLabeledStatement(<LabeledStatement>node);
+                case SyntaxKind.ThrowStatement:
+                    return transformAndEmitThrowStatement(<ThrowStatement>node);
+                case SyntaxKind.TryStatement:
+                    return transformAndEmitTryStatement(<TryStatement>node);
+                default:
+                    return emitStatement(visitNode(node, visitor, isStatement, /*optional*/ true));
+            }
+        }
+
+        function transformAndEmitBlock(node: Block): void {
+            if (containsYield(node)) {
+                transformAndEmitStatements(node.statements);
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function transformAndEmitExpressionStatement(node: ExpressionStatement) {
+            emitStatement(visitNode(node, visitor, isStatement));
+        }
+
+        function transformAndEmitVariableDeclarationList(node: VariableDeclarationList): VariableDeclarationList {
+            for (const variable of node.declarations) {
+                hoistVariableDeclaration(<Identifier>variable.name);
+            }
+
+            const variables = getInitializedVariables(node);
+            const numVariables = variables.length;
+            let variablesWritten = 0;
+            let pendingExpressions: Expression[] = [];
+            while (variablesWritten < numVariables) {
+                for (let i = variablesWritten; i < numVariables; i++) {
+                    const variable = variables[i];
+                    if (containsYield(variable.initializer) && pendingExpressions.length > 0) {
+                        break;
+                    }
+
+                    pendingExpressions.push(transformInitializedVariable(variable));
+                }
+
+                if (pendingExpressions.length) {
+                    emitStatement(createStatement(inlineExpressions(pendingExpressions)));
+                    variablesWritten += pendingExpressions.length;
+                    pendingExpressions = [];
+                }
+            }
+
+            return undefined;
+        }
+
+        function transformInitializedVariable(node: VariableDeclaration) {
+            return createAssignment(
+                <Identifier>getSynthesizedClone(node.name),
+                visitNode(node.initializer, visitor, isExpression)
+            );
+        }
+
+        function transformAndEmitIfStatement(node: IfStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      if (x)
+                //          /*thenStatement*/
+                //      else
+                //          /*elseStatement*/
+                //
+                // [intermediate]
+                //  .brfalse elseLabel, (x)
+                //      /*thenStatement*/
+                //  .br endLabel
+                //  .mark elseLabel
+                //      /*elseStatement*/
+                //  .mark endLabel
+
+                if (containsYield(node.thenStatement) || containsYield(node.elseStatement)) {
+                    const endLabel = defineLabel();
+                    const elseLabel = node.elseStatement ? defineLabel() : undefined;
+                    emitBreakWhenFalse(node.elseStatement ? elseLabel : endLabel, visitNode(node.expression, visitor, isExpression));
+                    transformAndEmitEmbeddedStatement(node.thenStatement);
+                    if (node.elseStatement) {
+                        emitBreak(endLabel);
+                        markLabel(elseLabel);
+                        transformAndEmitEmbeddedStatement(node.elseStatement);
+                    }
+                    markLabel(endLabel);
+                }
+                else {
+                    emitStatement(visitNode(node, visitor, isStatement));
+                }
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function transformAndEmitDoStatement(node: DoStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      do {
+                //          /*body*/
+                //      }
+                //      while (i < 10);
+                //
+                // [intermediate]
+                //  .loop conditionLabel, endLabel
+                //  .mark loopLabel
+                //      /*body*/
+                //  .mark conditionLabel
+                //  .brtrue loopLabel, (i < 10)
+                //  .endloop
+                //  .mark endLabel
+
+                const conditionLabel = defineLabel();
+                const loopLabel = defineLabel();
+                beginLoopBlock(/*continueLabel*/ conditionLabel);
+                markLabel(loopLabel);
+                transformAndEmitEmbeddedStatement(node.statement);
+                markLabel(conditionLabel);
+                emitBreakWhenTrue(loopLabel, visitNode(node.expression, visitor, isExpression));
+                endLoopBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function visitDoStatement(node: DoStatement) {
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+                node = visitEachChild(node, visitor, context);
+                endLoopBlock();
+                return node;
+            }
+            else {
+                return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function transformAndEmitWhileStatement(node: WhileStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      while (i < 10) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .loop loopLabel, endLabel
+                //  .mark loopLabel
+                //  .brfalse endLabel, (i < 10)
+                //      /*body*/
+                //  .br loopLabel
+                //  .endloop
+                //  .mark endLabel
+
+                const loopLabel = defineLabel();
+                const endLabel = beginLoopBlock(loopLabel);
+                markLabel(loopLabel);
+                emitBreakWhenFalse(endLabel, visitNode(node.expression, visitor, isExpression));
+                transformAndEmitEmbeddedStatement(node.statement);
+                emitBreak(loopLabel);
+                endLoopBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function visitWhileStatement(node: WhileStatement) {
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+                node = visitEachChild(node, visitor, context);
+                endLoopBlock();
+                return node;
+            }
+            else {
+                return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function transformAndEmitForStatement(node: ForStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      for (var i = 0; i < 10; i++) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .local i
+                //      i = 0;
+                //  .loop incrementLabel, endLoopLabel
+                //  .mark conditionLabel
+                //  .brfalse endLoopLabel, (i < 10)
+                //      /*body*/
+                //  .mark incrementLabel
+                //      i++;
+                //  .br conditionLabel
+                //  .endloop
+                //  .mark endLoopLabel
+
+                const conditionLabel = defineLabel();
+                const incrementLabel = defineLabel();
+                const endLabel = beginLoopBlock(incrementLabel);
+                if (node.initializer) {
+                    const initializer = node.initializer;
+                    if (isVariableDeclarationList(initializer)) {
+                        transformAndEmitVariableDeclarationList(initializer);
+                    }
+                    else {
+                        emitStatement(
+                            createStatement(
+                                visitNode(initializer, visitor, isExpression),
+                                /*location*/ initializer
+                            )
+                        );
+                    }
+                }
+
+                markLabel(conditionLabel);
+                if (node.condition) {
+                    emitBreakWhenFalse(endLabel, visitNode(node.condition, visitor, isExpression));
+                }
+
+                transformAndEmitEmbeddedStatement(node.statement);
+
+                markLabel(incrementLabel);
+                if (node.incrementor) {
+                    emitStatement(
+                        createStatement(
+                            visitNode(node.incrementor, visitor, isExpression),
+                            /*location*/ node.incrementor
+                        )
+                    );
+                }
+                emitBreak(conditionLabel);
+                endLoopBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function visitForStatement(node: ForStatement) {
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+            }
+
+            const initializer = node.initializer;
+            if (isVariableDeclarationList(initializer)) {
+                for (const variable of initializer.declarations) {
+                    hoistVariableDeclaration(<Identifier>variable.name);
+                }
+
+                const variables = getInitializedVariables(initializer);
+                node = updateFor(node,
+                    variables.length > 0
+                        ? inlineExpressions(map(variables, transformInitializedVariable))
+                        : undefined,
+                    visitNode(node.condition, visitor, isExpression, /*optional*/ true),
+                    visitNode(node.incrementor, visitor, isExpression, /*optional*/ true),
+                    visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock)
+                );
+            }
+            else {
+                node = visitEachChild(node, visitor, context);
+            }
+
+            if (inStatementContainingYield) {
+                endLoopBlock();
+            }
+
+            return node;
+        }
+
+        function transformAndEmitForInStatement(node: ForInStatement) {
+            // TODO(rbuckton): Source map locations
+            if (containsYield(node)) {
+                // [source]
+                //      for (var p in o) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .local _a, _b, _i
+                //      _a = [];
+                //      for (_b in o) _a.push(_b);
+                //      _i = 0;
+                //  .loop incrementLabel, endLoopLabel
+                //  .mark conditionLabel
+                //  .brfalse endLoopLabel, (_i < _a.length)
+                //      p = _a[_i];
+                //      /*body*/
+                //  .mark incrementLabel
+                //      _b++;
+                //  .br conditionLabel
+                //  .endloop
+                //  .mark endLoopLabel
+
+                const keysArray = declareLocal(); // _a
+                const key = declareLocal(); // _b
+                const keysIndex = createLoopVariable(); // _i
+                const initializer = node.initializer;
+                hoistVariableDeclaration(keysIndex);
+                emitAssignment(keysArray, createArrayLiteral());
+
+                emitStatement(
+                    createForIn(
+                        key,
+                        visitNode(node.expression, visitor, isExpression),
+                        createStatement(
+                            createCall(
+                                createPropertyAccess(keysArray, "push"),
+                                /*typeArguments*/ undefined,
+                                [key]
+                            )
+                        )
+                    )
+                );
+
+                emitAssignment(keysIndex, createLiteral(0));
+
+                const conditionLabel = defineLabel();
+                const incrementLabel = defineLabel();
+                const endLabel = beginLoopBlock(incrementLabel);
+
+                markLabel(conditionLabel);
+                emitBreakWhenFalse(endLabel, createLessThan(keysIndex, createPropertyAccess(keysArray, "length")));
+
+                let variable: Expression;
+                if (isVariableDeclarationList(initializer)) {
+                    for (const variable of initializer.declarations) {
+                        hoistVariableDeclaration(<Identifier>variable.name);
+                    }
+
+                    variable = <Identifier>getSynthesizedClone(initializer.declarations[0].name);
+                }
+                else {
+                    variable = visitNode(initializer, visitor, isExpression);
+                    Debug.assert(isLeftHandSideExpression(variable));
+                }
+
+                emitAssignment(variable, createElementAccess(keysArray, keysIndex));
+                transformAndEmitEmbeddedStatement(node.statement);
+
+                markLabel(incrementLabel);
+                emitStatement(createStatement(createPostfixIncrement(keysIndex)));
+
+                emitBreak(conditionLabel);
+                endLoopBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function visitForInStatement(node: ForInStatement) {
+            // [source]
+            //      for (var x in a) {
+            //          /*body*/
+            //      }
+            //
+            // [intermediate]
+            //  .local x
+            //  .loop
+            //      for (x in a) {
+            //          /*body*/
+            //      }
+            //  .endloop
+
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+            }
+
+            const initializer = node.initializer;
+            if (isVariableDeclarationList(initializer)) {
+                for (const variable of initializer.declarations) {
+                    hoistVariableDeclaration(<Identifier>variable.name);
+                }
+
+                node = updateForIn(node,
+                    <Identifier>initializer.declarations[0].name,
+                    visitNode(node.expression, visitor, isExpression),
+                    visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock)
+                );
+            }
+            else {
+                node = visitEachChild(node, visitor, context);
+            }
+
+            if (inStatementContainingYield) {
+                endLoopBlock();
+            }
+
+            return node;
+        }
+
+        function transformAndEmitContinueStatement(node: ContinueStatement): void {
+            const label = findContinueTarget(node.label ? node.label.text : undefined);
+            Debug.assert(label > 0, "Expected continue statment to point to a valid Label.");
+            emitBreak(label, /*location*/ node);
+        }
+
+        function visitContinueStatement(node: ContinueStatement): Statement {
+            if (inStatementContainingYield) {
+                const label = findContinueTarget(node.label && node.label.text);
+                if (label > 0) {
+                    return createInlineBreak(label, /*location*/ node);
+                }
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function transformAndEmitBreakStatement(node: BreakStatement): void {
+            const label = findBreakTarget(node.label ? node.label.text : undefined);
+            Debug.assert(label > 0, "Expected break statment to point to a valid Label.");
+            emitBreak(label, /*location*/ node);
+        }
+
+        function visitBreakStatement(node: BreakStatement): Statement {
+            if (inStatementContainingYield) {
+                const label = findBreakTarget(node.label && node.label.text);
+                if (label > 0) {
+                    return createInlineBreak(label, /*location*/ node);
+                }
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function transformAndEmitReturnStatement(node: ReturnStatement): void {
+            emitReturn(
+                visitNode(node.expression, visitor, isExpression, /*optional*/ true),
+                /*location*/ node
+            );
+        }
+
+        function visitReturnStatement(node: ReturnStatement) {
+            return createInlineReturn(
+                visitNode(node.expression, visitor, isExpression, /*optional*/ true),
+                /*location*/ node
+            );
+        }
+
+        function transformAndEmitWithStatement(node: WithStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      with (x) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .with (x)
+                //      /*body*/
+                //  .endwith
+                beginWithBlock(cacheExpression(visitNode(node.expression, visitor, isExpression)));
+                transformAndEmitEmbeddedStatement(node.statement);
+                endWithBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function transformAndEmitSwitchStatement(node: SwitchStatement) {
+            if (containsYield(node.caseBlock)) {
+                // [source]
+                //      switch (x) {
+                //          case a:
+                //              /*caseStatements*/
+                //          case b:
+                //              /*caseStatements*/
+                //          default:
+                //              /*defaultStatements*/
+                //      }
+                //
+                // [intermediate]
+                //  .local _a
+                //  .switch endLabel
+                //      _a = x;
+                //      switch (_a) {
+                //          case a:
+                //  .br clauseLabels[0]
+                //      }
+                //      switch (_a) {
+                //          case b:
+                //  .br clauseLabels[1]
+                //      }
+                //  .br clauseLabels[2]
+                //  .mark clauseLabels[0]
+                //      /*caseStatements*/
+                //  .mark clauseLabels[1]
+                //      /*caseStatements*/
+                //  .mark clauseLabels[2]
+                //      /*caseStatements*/
+                //  .endswitch
+                //  .mark endLabel
+
+                const caseBlock = node.caseBlock;
+                const numClauses = caseBlock.clauses.length;
+                const endLabel = beginSwitchBlock();
+
+                const expression = cacheExpression(visitNode(node.expression, visitor, isExpression));
+
+                // Create labels for each clause and find the index of the first default clause.
+                const clauseLabels: Label[] = [];
+                let defaultClauseIndex = -1;
+                for (let i = 0; i < numClauses; i++) {
+                    const clause = caseBlock.clauses[i];
+                    clauseLabels.push(defineLabel());
+                    if (clause.kind === SyntaxKind.DefaultClause && defaultClauseIndex === -1) {
+                        defaultClauseIndex = i;
+                    }
+                }
+
+                // Emit switch statements for each run of case clauses either from the first case
+                // clause or the next case clause with a `yield` in its expression, up to the next
+                // case clause with a `yield` in its expression.
+                let clausesWritten = 0;
+                let pendingClauses: CaseClause[] = [];
+                while (clausesWritten < numClauses) {
+                    let defaultClausesSkipped = 0;
+                    for (let i = clausesWritten; i < numClauses; i++) {
+                        const clause = caseBlock.clauses[i];
+                        if (clause.kind === SyntaxKind.CaseClause) {
+                            const caseClause = <CaseClause>clause;
+                            if (containsYield(caseClause.expression) && pendingClauses.length > 0) {
+                                break;
+                            }
+
+                            pendingClauses.push(
+                                createCaseClause(
+                                    visitNode(caseClause.expression, visitor, isExpression),
+                                    [
+                                        createInlineBreak(clauseLabels[i], /*location*/ caseClause.expression)
+                                    ]
+                                )
+                            );
+                        }
+                        else {
+                            defaultClausesSkipped++;
+                        }
+                    }
+
+                    if (pendingClauses.length) {
+                        emitStatement(createSwitch(expression, createCaseBlock(pendingClauses)));
+                        clausesWritten += pendingClauses.length;
+                        pendingClauses = [];
+                    }
+                    if (defaultClausesSkipped > 0) {
+                        clausesWritten += defaultClausesSkipped;
+                        defaultClausesSkipped = 0;
+                    }
+                }
+
+                if (defaultClauseIndex >= 0) {
+                    emitBreak(clauseLabels[defaultClauseIndex]);
+                }
+                else {
+                    emitBreak(endLabel);
+                }
+
+                for (let i = 0; i < numClauses; i++) {
+                    markLabel(clauseLabels[i]);
+                    transformAndEmitStatements(caseBlock.clauses[i].statements);
+                }
+
+                endSwitchBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function visitSwitchStatement(node: SwitchStatement) {
+            if (inStatementContainingYield) {
+                beginScriptSwitchBlock();
+            }
+
+            node = visitEachChild(node, visitor, context);
+
+            if (inStatementContainingYield) {
+                endSwitchBlock();
+            }
+
+            return node;
+        }
+
+        function transformAndEmitLabeledStatement(node: LabeledStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      x: {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .labeled "x", endLabel
+                //      /*body*/
+                //  .endlabeled
+                //  .mark endLabel
+                beginLabeledBlock(node.label.text);
+                transformAndEmitEmbeddedStatement(node.statement);
+                endLabeledBlock();
+            }
+            else {
+                emitStatement(visitNode(node, visitor, isStatement));
+            }
+        }
+
+        function visitLabeledStatement(node: LabeledStatement) {
+            if (inStatementContainingYield) {
+                beginScriptLabeledBlock(node.label.text);
+            }
+
+            node = visitEachChild(node, visitor, context);
+
+            if (inStatementContainingYield) {
+                endLabeledBlock();
+            }
+
+            return node;
+        }
+
+        function transformAndEmitThrowStatement(node: ThrowStatement): void {
+            emitThrow(
+                visitNode(node.expression, visitor, isExpression),
+                /*location*/ node
+            );
+        }
+
+        function transformAndEmitTryStatement(node: TryStatement) {
+            if (containsYield(node)) {
+                // [source]
+                //      try {
+                //          /*tryBlock*/
+                //      }
+                //      catch (e) {
+                //          /*catchBlock*/
+                //      }
+                //      finally {
+                //          /*finallyBlock*/
+                //      }
+                //
+                // [intermediate]
+                //  .local _a
+                //  .try tryLabel, catchLabel, finallyLabel, endLabel
+                //  .mark tryLabel
+                //  .nop
+                //      /*tryBlock*/
+                //  .br endLabel
+                //  .catch
+                //  .mark catchLabel
+                //      _a = %error%;
+                //      /*catchBlock*/
+                //  .br endLabel
+                //  .finally
+                //  .mark finallyLabel
+                //      /*finallyBlock*/
+                //  .endfinally
+                //  .endtry
+                //  .mark endLabel
+
+                beginExceptionBlock();
+                transformAndEmitEmbeddedStatement(node.tryBlock);
+                if (node.catchClause) {
+                    beginCatchBlock(node.catchClause.variableDeclaration);
+                    transformAndEmitEmbeddedStatement(node.catchClause.block);
+                }
+
+                if (node.finallyBlock) {
+                    beginFinallyBlock();
+                    transformAndEmitEmbeddedStatement(node.finallyBlock);
+                }
+
+                endExceptionBlock();
+            }
+            else {
+                emitStatement(visitEachChild(node, visitor, context));
+            }
+        }
+
+        function containsYield(node: Node) {
+            return node && (node.transformFlags & TransformFlags.ContainsYield) !== 0;
+        }
+
+        function countInitialNodesWithoutYield(nodes: NodeArray<Node>) {
+            const numNodes = nodes.length;
+            for (let i = 0; i < numNodes; i++) {
+                if (containsYield(nodes[i])) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        function onSubstituteNode(node: Node, isExpression: boolean): Node {
+            node = previousOnSubstituteNode(node, isExpression);
+            if (isExpression) {
+                return substituteExpression(<Expression>node);
+            }
+            return node;
+        }
+
+        function substituteExpression(node: Expression): Expression {
+            if (isIdentifier(node)) {
+                return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+
+        function substituteExpressionIdentifier(node: Identifier) {
+            if (renamedCatchVariables && hasProperty(renamedCatchVariables, node.text)) {
+                const original = getOriginalNode(node);
+                if (isIdentifier(original) && original.parent) {
+                    const declaration = resolver.getReferencedValueDeclaration(original);
+                    if (declaration) {
+                        const name = getProperty(renamedCatchVariableDeclarations, String(getOriginalNodeId(declaration)));
+                        if (name) {
+                            const clone = getMutableClone(name);
+                            setSourceMapRange(clone, node);
+                            setCommentRange(clone, node);
+                            return clone;
+                        }
+                    }
+                }
+            }
+
+            return node;
+        }
+
+        function cacheExpression(node: Expression): Identifier {
+            let temp: Identifier;
+            if (isGeneratedIdentifier(node)) {
+                return <Identifier>node;
+            }
+
+            temp = createTempVariable(hoistVariableDeclaration);
+            emitAssignment(temp, node, /*location*/ node);
+            return temp;
+        }
+
+        function declareLocal(name?: string): Identifier {
+            const temp = name
+                ? createUniqueName(name)
+                : createTempVariable(/*recordTempVariable*/ undefined);
+            hoistVariableDeclaration(temp);
+            return temp;
+        }
+
+        /**
+         * Defines a label, uses as the target of a Break operation.
+         */
+        function defineLabel(): Label {
+            if (!labelOffsets) {
+                labelOffsets = [];
+            }
+
+            const label = nextLabelId;
+            nextLabelId++;
+            labelOffsets[label] = -1;
+            return label;
+        }
+
+        /**
+         * Marks the current operation with the specified label.
+         */
+        function markLabel(label: Label): void {
+            Debug.assert(labelOffsets !== undefined, "No labels were defined.");
+            labelOffsets[label] = operations ? operations.length : 0;
+        }
+
+        /**
+         * Begins a block operation (With, Break/Continue, Try/Catch/Finally)
+         *
+         * @param block Information about the block.
+         */
+        function beginBlock(block: CodeBlock): number {
+            if (!blocks) {
+                blocks = [];
+                blockActions = [];
+                blockOffsets = [];
+                blockStack = [];
+            }
+
+            const index = blockActions.length;
+            blockActions[index] = BlockAction.Open;
+            blockOffsets[index] = operations ? operations.length : 0;
+            blocks[index] = block;
+            blockStack.push(block);
+            return index;
+        }
+
+        /**
+         * Ends the current block operation.
+         */
+        function endBlock(): CodeBlock {
+            const block = peekBlock();
+            Debug.assert(block !== undefined, "beginBlock was never called.");
+
+            const index = blockActions.length;
+            blockActions[index] = BlockAction.Close;
+            blockOffsets[index] = operations ? operations.length : 0;
+            blocks[index] = block;
+            blockStack.pop();
+            return block;
+        }
+
+        /**
+         * Gets the current open block.
+         */
+        function peekBlock() {
+            return lastOrUndefined(blockStack);
+        }
+
+        /**
+         * Gets the kind of the current open block.
+         */
+        function peekBlockKind(): CodeBlockKind {
+            const block = peekBlock();
+            return block && block.kind;
+        }
+
+        /**
+         * Begins a code block for a generated `with` statement.
+         *
+         * @param expression An identifier representing expression for the `with` block.
+         */
+        function beginWithBlock(expression: Identifier): void {
+            const startLabel = defineLabel();
+            const endLabel = defineLabel();
+            markLabel(startLabel);
+            beginBlock(<WithBlock>{
+                kind: CodeBlockKind.With,
+                expression,
+                startLabel,
+                endLabel
+            });
+        }
+
+        /**
+         * Ends a code block for a generated `with` statement.
+         */
+        function endWithBlock(): void {
+            Debug.assert(peekBlockKind() === CodeBlockKind.With);
+            const block = <WithBlock>endBlock();
+            markLabel(block.endLabel);
+        }
+
+        function isWithBlock(block: CodeBlock): block is WithBlock {
+            return block.kind === CodeBlockKind.With;
+        }
+
+        /**
+         * Begins a code block for a generated `try` statement.
+         */
+        function beginExceptionBlock(): Label {
+            const startLabel = defineLabel();
+            const endLabel = defineLabel();
+            markLabel(startLabel);
+            beginBlock(<ExceptionBlock>{
+                kind: CodeBlockKind.Exception,
+                state: ExceptionBlockState.Try,
+                startLabel,
+                endLabel
+            });
+            emitNop();
+            return endLabel;
+        }
+
+        /**
+         * Enters the `catch` clause of a generated `try` statement.
+         *
+         * @param variable The catch variable.
+         */
+        function beginCatchBlock(variable: VariableDeclaration): void {
+            Debug.assert(peekBlockKind() === CodeBlockKind.Exception);
+
+            const text = (<Identifier>variable.name).text;
+            const name = declareLocal(text);
+
+            if (!renamedCatchVariables) {
+                renamedCatchVariables = createMap<boolean>();
+                renamedCatchVariableDeclarations = createMap<Identifier>();
+                context.enableSubstitution(SyntaxKind.Identifier);
+            }
+
+            renamedCatchVariables[text] = true;
+            renamedCatchVariableDeclarations[getOriginalNodeId(variable)] = name;
+
+            const exception = <ExceptionBlock>peekBlock();
+            Debug.assert(exception.state < ExceptionBlockState.Catch);
+
+            const endLabel = exception.endLabel;
+            emitBreak(endLabel);
+
+            const catchLabel = defineLabel();
+            markLabel(catchLabel);
+            exception.state = ExceptionBlockState.Catch;
+            exception.catchVariable = name;
+            exception.catchLabel = catchLabel;
+
+            emitAssignment(name, createCall(createPropertyAccess(state, "sent"), /*typeArguments*/ undefined, []));
+            emitNop();
+        }
+
+        /**
+         * Enters the `finally` block of a generated `try` statement.
+         */
+        function beginFinallyBlock(): void {
+            Debug.assert(peekBlockKind() === CodeBlockKind.Exception);
+
+            const exception = <ExceptionBlock>peekBlock();
+            Debug.assert(exception.state < ExceptionBlockState.Finally);
+
+            const endLabel = exception.endLabel;
+            emitBreak(endLabel);
+
+            const finallyLabel = defineLabel();
+            markLabel(finallyLabel);
+            exception.state = ExceptionBlockState.Finally;
+            exception.finallyLabel = finallyLabel;
+        }
+
+        /**
+         * Ends the code block for a generated `try` statement.
+         */
+        function endExceptionBlock(): void {
+            Debug.assert(peekBlockKind() === CodeBlockKind.Exception);
+            const exception = <ExceptionBlock>endBlock();
+            const state = exception.state;
+            if (state < ExceptionBlockState.Finally) {
+                emitBreak(exception.endLabel);
+            }
+            else {
+                emitEndfinally();
+            }
+
+            markLabel(exception.endLabel);
+            emitNop();
+            exception.state = ExceptionBlockState.Done;
+        }
+
+        function isExceptionBlock(block: CodeBlock): block is ExceptionBlock {
+            return block.kind === CodeBlockKind.Exception;
+        }
+
+        /**
+         * Begins a code block that supports `break` or `continue` statements that are defined in
+         * the source tree and not from generated code.
+         *
+         * @param labelText Names from containing labeled statements.
+         */
+        function beginScriptLoopBlock(): void {
+            beginBlock(<LoopBlock>{
+                kind: CodeBlockKind.Loop,
+                isScript: true,
+                breakLabel: -1,
+                continueLabel: -1
+            });
+        }
+
+        /**
+         * Begins a code block that supports `break` or `continue` statements that are defined in
+         * generated code. Returns a label used to mark the operation to which to jump when a
+         * `break` statement targets this block.
+         *
+         * @param continueLabel A Label used to mark the operation to which to jump when a
+         *                      `continue` statement targets this block.
+         */
+        function beginLoopBlock(continueLabel: Label): Label {
+            const breakLabel = defineLabel();
+            beginBlock(<LoopBlock>{
+                kind: CodeBlockKind.Loop,
+                isScript: false,
+                breakLabel: breakLabel,
+                continueLabel: continueLabel
+            });
+            return breakLabel;
+        }
+
+        /**
+         * Ends a code block that supports `break` or `continue` statements that are defined in
+         * generated code or in the source tree.
+         */
+        function endLoopBlock(): void {
+            Debug.assert(peekBlockKind() === CodeBlockKind.Loop);
+            const block = <SwitchBlock>endBlock();
+            const breakLabel = block.breakLabel;
+            if (!block.isScript) {
+                markLabel(breakLabel);
+            }
+        }
+
+        /**
+         * Begins a code block that supports `break` statements that are defined in the source
+         * tree and not from generated code.
+         *
+         */
+        function beginScriptSwitchBlock(): void {
+            beginBlock(<SwitchBlock>{
+                kind: CodeBlockKind.Switch,
+                isScript: true,
+                breakLabel: -1
+            });
+        }
+
+        /**
+         * Begins a code block that supports `break` statements that are defined in generated code.
+         * Returns a label used to mark the operation to which to jump when a `break` statement
+         * targets this block.
+         */
+        function beginSwitchBlock(): Label {
+            const breakLabel = defineLabel();
+            beginBlock(<SwitchBlock>{
+                kind: CodeBlockKind.Switch,
+                isScript: false,
+                breakLabel: breakLabel
+            });
+            return breakLabel;
+        }
+
+        /**
+         * Ends a code block that supports `break` statements that are defined in generated code.
+         */
+        function endSwitchBlock(): void {
+            Debug.assert(peekBlockKind() === CodeBlockKind.Switch);
+            const block = <SwitchBlock>endBlock();
+            const breakLabel = block.breakLabel;
+            if (!block.isScript) {
+                markLabel(breakLabel);
+            }
+        }
+
+        function beginScriptLabeledBlock(labelText: string) {
+            beginBlock(<LabeledBlock>{
+                kind: CodeBlockKind.Labeled,
+                isScript: true,
+                labelText,
+                breakLabel: -1
+            });
+        }
+
+        function beginLabeledBlock(labelText: string) {
+            const breakLabel = defineLabel();
+            beginBlock(<LabeledBlock>{
+                kind: CodeBlockKind.Labeled,
+                isScript: false,
+                labelText,
+                breakLabel
+            });
+        }
+
+        function endLabeledBlock() {
+            Debug.assert(peekBlockKind() === CodeBlockKind.Labeled);
+            const block = <LabeledBlock>endBlock();
+            if (!block.isScript) {
+                markLabel(block.breakLabel);
+            }
+        }
+
+        /**
+         * Indicates whether the provided block supports `break` statements.
+         *
+         * @param block A code block.
+         */
+        function supportsUnlabeledBreak(block: CodeBlock): block is SwitchBlock | LoopBlock {
+            return block.kind === CodeBlockKind.Switch
+                || block.kind === CodeBlockKind.Loop;
+        }
+
+        /**
+         * Indicates whether the provided block supports `break` statements with labels.
+         *
+         * @param block A code block.
+         */
+        function supportsLabeledBreakOrContinue(block: CodeBlock): block is LabeledBlock {
+            return block.kind === CodeBlockKind.Labeled;
+        }
+
+        /**
+         * Indicates whether the provided block supports `continue` statements.
+         *
+         * @param block A code block.
+         */
+        function supportsUnlabeledContinue(block: CodeBlock): block is LoopBlock {
+            return block.kind === CodeBlockKind.Loop;
+        }
+
+        function hasImmediateContainingLabeledBlock(labelText: string, start: number) {
+            for (let j = start; j >= 0; j--) {
+                const containingBlock = blockStack[j];
+                if (supportsLabeledBreakOrContinue(containingBlock)) {
+                    if (containingBlock.labelText === labelText) {
+                        return true;
+                    }
+                }
+                else {
+                    break;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Finds the label that is the target for a `break` statement.
+         *
+         * @param labelText An optional name of a containing labeled statement.
+         */
+        function findBreakTarget(labelText?: string): Label {
+            Debug.assert(blocks !== undefined);
+            if (labelText) {
+                for (let i = blockStack.length - 1; i >= 0; i--) {
+                    const block = blockStack[i];
+                    if (supportsLabeledBreakOrContinue(block) && block.labelText === labelText) {
+                        return block.breakLabel;
+                    }
+                    else if (supportsUnlabeledBreak(block) && hasImmediateContainingLabeledBlock(labelText, i - 1)) {
+                        return block.breakLabel;
+                    }
+                }
+            }
+            else {
+                for (let i = blockStack.length - 1; i >= 0; i--) {
+                    const block = blockStack[i];
+                    if (supportsUnlabeledBreak(block)) {
+                        return block.breakLabel;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        /**
+         * Finds the label that is the target for a `continue` statement.
+         *
+         * @param labelText An optional name of a containing labeled statement.
+         */
+        function findContinueTarget(labelText?: string): Label {
+            Debug.assert(blocks !== undefined);
+            if (labelText) {
+                for (let i = blockStack.length - 1; i >= 0; i--) {
+                    const block = blockStack[i];
+                    if (supportsUnlabeledContinue(block) && hasImmediateContainingLabeledBlock(labelText, i - 1)) {
+                        return block.continueLabel;
+                    }
+                }
+            }
+            else {
+                for (let i = blockStack.length - 1; i >= 0; i--) {
+                    const block = blockStack[i];
+                    if (supportsUnlabeledContinue(block)) {
+                        return block.continueLabel;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        /**
+         * Creates an expression that can be used to indicate the value for a label.
+         *
+         * @param label A label.
+         */
+        function createLabel(label: Label): Expression {
+            if (label > 0) {
+                if (labelExpressions === undefined) {
+                    labelExpressions = [];
+                }
+
+                const expression = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
+                if (labelExpressions[label] === undefined) {
+                    labelExpressions[label] = [expression];
+                }
+                else {
+                    labelExpressions[label].push(expression);
+                }
+
+                return expression;
+            }
+
+            return <OmittedExpression>createNode(SyntaxKind.OmittedExpression);
+        }
+
+        /**
+         * Creates a numeric literal for the provided instruction.
+         */
+        function createInstruction(instruction: Instruction): NumericLiteral {
+            const literal = createLiteral(instruction);
+            literal.trailingComment = instructionNames[instruction];
+            return literal;
+        }
+
+        /**
+         * Creates a statement that can be used indicate a Break operation to the provided label.
+         *
+         * @param label A label.
+         * @param location An optional source map location for the statement.
+         */
+        function createInlineBreak(label: Label, location?: TextRange): ReturnStatement {
+            Debug.assert(label > 0, `Invalid label: ${label}`);
+            return createReturn(
+                createArrayLiteral([
+                    createInstruction(Instruction.Break),
+                    createLabel(label)
+                ]),
+                location
+            );
+        }
+
+        /**
+         * Creates a statement that can be used indicate a Return operation.
+         *
+         * @param expression The expression for the return statement.
+         * @param location An optional source map location for the statement.
+         */
+        function createInlineReturn(expression?: Expression, location?: TextRange): ReturnStatement {
+            return createReturn(
+                createArrayLiteral(expression
+                    ? [createInstruction(Instruction.Return), expression]
+                    : [createInstruction(Instruction.Return)]
+                ),
+                location
+            );
+        }
+
+        /**
+         * Creates an expression that can be used to resume from a Yield operation.
+         */
+        function createGeneratorResume(location?: TextRange): LeftHandSideExpression {
+            return createCall(createPropertyAccess(state, "sent"), /*typeArguments*/ undefined, [], location);
+        }
+
+        /**
+         * Emits an empty instruction.
+         */
+        function emitNop() {
+            emitWorker(OpCode.Nop);
+        }
+
+        /**
+         * Emits a Statement.
+         *
+         * @param node A statement.
+         */
+        function emitStatement(node: Statement): void {
+            if (node) {
+                emitWorker(OpCode.Statement, [node]);
+            }
+            else {
+                emitNop();
+            }
+        }
+
+        /**
+         * Emits an Assignment operation.
+         *
+         * @param left The left-hand side of the assignment.
+         * @param right The right-hand side of the assignment.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitAssignment(left: Expression, right: Expression, location?: TextRange): void {
+            emitWorker(OpCode.Assign, [left, right], location);
+        }
+
+        /**
+         * Emits a Break operation to the specified label.
+         *
+         * @param label A label.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitBreak(label: Label, location?: TextRange): void {
+            emitWorker(OpCode.Break, [label], location);
+        }
+
+        /**
+         * Emits a Break operation to the specified label when a condition evaluates to a truthy
+         * value at runtime.
+         *
+         * @param label A label.
+         * @param condition The condition.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitBreakWhenTrue(label: Label, condition: Expression, location?: TextRange): void {
+            emitWorker(OpCode.BreakWhenTrue, [label, condition], location);
+        }
+
+        /**
+         * Emits a Break to the specified label when a condition evaluates to a falsey value at
+         * runtime.
+         *
+         * @param label A label.
+         * @param condition The condition.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitBreakWhenFalse(label: Label, condition: Expression, location?: TextRange): void {
+            emitWorker(OpCode.BreakWhenFalse, [label, condition], location);
+        }
+
+        /**
+         * Emits a Yield operation for the provided expression.
+         *
+         * @param expression An optional value for the yield operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitYield(expression?: Expression, location?: TextRange): void {
+            emitWorker(OpCode.Yield, [expression], location);
+        }
+
+        /**
+         * Emits a Return operation for the provided expression.
+         *
+         * @param expression An optional value for the operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitReturn(expression?: Expression, location?: TextRange): void {
+            emitWorker(OpCode.Return, [expression], location);
+        }
+
+        /**
+         * Emits a Throw operation for the provided expression.
+         *
+         * @param expression A value for the operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitThrow(expression: Expression, location?: TextRange): void {
+            emitWorker(OpCode.Throw, [expression], location);
+        }
+
+        /**
+         * Emits an Endfinally operation. This is used to handle `finally` block semantics.
+         */
+        function emitEndfinally(): void {
+            emitWorker(OpCode.Endfinally);
+        }
+
+        /**
+         * Emits an operation.
+         *
+         * @param code The OpCode for the operation.
+         * @param args The optional arguments for the operation.
+         */
+        function emitWorker(code: OpCode, args?: OperationArguments, location?: TextRange): void {
+            if (operations === undefined) {
+                operations = [];
+                operationArguments = [];
+                operationLocations = [];
+            }
+
+            if (labelOffsets === undefined) {
+                // mark entry point
+                markLabel(defineLabel());
+            }
+
+            const operationIndex = operations.length;
+            operations[operationIndex] = code;
+            operationArguments[operationIndex] = args;
+            operationLocations[operationIndex] = location;
+        }
+
+        /**
+         * Builds the generator function body.
+         */
+        function build() {
+            blockIndex = 0;
+            labelNumber = 0;
+            labelNumbers = undefined;
+            lastOperationWasAbrupt = false;
+            lastOperationWasCompletion = false;
+            clauses = undefined;
+            statements = undefined;
+            exceptionBlockStack = undefined;
+            currentExceptionBlock = undefined;
+            withBlockStack = undefined;
+
+            const buildResult = buildStatements();
+            return createCall(
+                createHelperName(currentSourceFile.externalHelpersModuleName, "__generator"),
+                /*typeArguments*/ undefined,
+                [
+                    createThis(),
+                    setNodeEmitFlags(
+                        createFunctionExpression(
+                            /*asteriskToken*/ undefined,
+                            /*name*/ undefined,
+                            /*typeParameters*/ undefined,
+                            [createParameter(state)],
+                            /*type*/ undefined,
+                            createBlock(
+                                buildResult,
+                                /*location*/ undefined,
+                                /*multiLine*/ buildResult.length > 0
+                            )
+                        ),
+                        NodeEmitFlags.ReuseTempVariableScope
+                    )
+                ]
+            );
+        }
+
+        /**
+         * Builds the statements for the generator function body.
+         */
+        function buildStatements(): Statement[] {
+            if (operations) {
+                for (let operationIndex = 0; operationIndex < operations.length; operationIndex++) {
+                    writeOperation(operationIndex);
+                }
+
+                flushFinalLabel(operations.length);
+            }
+            else {
+                flushFinalLabel(0);
+            }
+
+            if (clauses) {
+                const labelExpression = createPropertyAccess(state, "label");
+                const switchStatement = createSwitch(labelExpression, createCaseBlock(clauses));
+                switchStatement.startsOnNewLine = true;
+                return [switchStatement];
+            }
+
+            if (statements) {
+                return statements;
+            }
+
+            return [];
+        }
+
+        /**
+         * Flush the current label and advance to a new label.
+         */
+        function flushLabel(): void {
+            if (!statements) {
+                return;
+            }
+
+            appendLabel(/*markLabelEnd*/ !lastOperationWasAbrupt);
+
+            lastOperationWasAbrupt = false;
+            lastOperationWasCompletion = false;
+            labelNumber++;
+        }
+
+        /**
+         * Flush the final label of the generator function body.
+         */
+        function flushFinalLabel(operationIndex: number): void {
+            if (!lastOperationWasCompletion) {
+                tryEnterLabel(operationIndex);
+                withBlockStack = undefined;
+                writeReturn(/*expression*/ undefined, /*operationLocation*/ undefined);
+            }
+
+            if (statements && clauses) {
+                appendLabel(/*markLabelEnd*/ false);
+            }
+
+            updateLabelExpressions();
+        }
+
+        /**
+         * Appends a case clause for the last label and sets the new label.
+         *
+         * @param markLabelEnd Indicates that the transition between labels was a fall-through
+         *                     from a previous case clause and the change in labels should be
+         *                     reflected on the `state` object.
+         */
+        function appendLabel(markLabelEnd: boolean): void {
+            if (!clauses) {
+                clauses = [];
+            }
+
+            if (statements) {
+                if (withBlockStack) {
+                    // The previous label was nested inside one or more `with` blocks, so we
+                    // surround the statements in generated `with` blocks to create the same environment.
+                    for (let i = withBlockStack.length - 1; i >= 0; i--) {
+                        const withBlock = withBlockStack[i];
+                        statements = [createWith(withBlock.expression, createBlock(statements))];
+                    }
+                }
+
+                if (currentExceptionBlock) {
+                    // The previous label was nested inside of an exception block, so we must
+                    // indicate entry into a protected region by pushing the label numbers
+                    // for each block in the protected region.
+                    const { startLabel, catchLabel, finallyLabel, endLabel } = currentExceptionBlock;
+                    statements.unshift(
+                        createStatement(
+                            createCall(
+                                createPropertyAccess(createPropertyAccess(state, "trys"), "push"),
+                                /*typeArguments*/ undefined,
+                                [
+                                    createArrayLiteral([
+                                        createLabel(startLabel),
+                                        createLabel(catchLabel),
+                                        createLabel(finallyLabel),
+                                        createLabel(endLabel)
+                                    ])
+                                ]
+                            )
+                        )
+                    );
+
+                    currentExceptionBlock = undefined;
+                }
+
+                if (markLabelEnd) {
+                    // The case clause for the last label falls through to this label, so we
+                    // add an assignment statement to reflect the change in labels.
+                    statements.push(
+                        createStatement(
+                            createAssignment(
+                                createPropertyAccess(state, "label"),
+                                createLiteral(labelNumber + 1)
+                            )
+                        )
+                    );
+                }
+            }
+
+            clauses.push(
+                createCaseClause(
+                    createLiteral(labelNumber),
+                    statements || []
+                )
+            );
+
+            statements = undefined;
+        }
+
+        /**
+         * Tries to enter into a new label at the current operation index.
+         */
+        function tryEnterLabel(operationIndex: number): void {
+            if (!labelOffsets) {
+                return;
+            }
+
+            for (let label = 0; label < labelOffsets.length; label++) {
+                if (labelOffsets[label] === operationIndex) {
+                    flushLabel();
+                    if (labelNumbers === undefined) {
+                        labelNumbers = [];
+                    }
+                    if (labelNumbers[labelNumber] === undefined) {
+                        labelNumbers[labelNumber] = [label];
+                    }
+                    else {
+                        labelNumbers[labelNumber].push(label);
+                    }
+                }
+            }
+        }
+
+        /**
+         * Updates literal expressions for labels with actual label numbers.
+         */
+        function updateLabelExpressions() {
+            if (labelExpressions !== undefined && labelNumbers !== undefined) {
+                for (let labelNumber = 0; labelNumber < labelNumbers.length; labelNumber++) {
+                    const labels = labelNumbers[labelNumber];
+                    if (labels !== undefined) {
+                        for (const label of labels) {
+                            const expressions = labelExpressions[label];
+                            if (expressions !== undefined) {
+                                for (const expression of expressions) {
+                                    expression.text = String(labelNumber);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Tries to enter or leave a code block.
+         */
+        function tryEnterOrLeaveBlock(operationIndex: number): void {
+            if (blocks) {
+                for (; blockIndex < blockActions.length && blockOffsets[blockIndex] <= operationIndex; blockIndex++) {
+                    const block = blocks[blockIndex];
+                    const blockAction = blockActions[blockIndex];
+                    if (isExceptionBlock(block)) {
+                        if (blockAction === BlockAction.Open) {
+                            if (!exceptionBlockStack) {
+                                exceptionBlockStack = [];
+                            }
+
+                            if (!statements) {
+                                statements = [];
+                            }
+
+                            exceptionBlockStack.push(currentExceptionBlock);
+                            currentExceptionBlock = block;
+                        }
+                        else if (blockAction === BlockAction.Close) {
+                            currentExceptionBlock = exceptionBlockStack.pop();
+                        }
+                    }
+                    else if (isWithBlock(block)) {
+                        if (blockAction === BlockAction.Open) {
+                            if (!withBlockStack) {
+                                withBlockStack = [];
+                            }
+
+                            withBlockStack.push(block);
+                        }
+                        else if (blockAction === BlockAction.Close) {
+                            withBlockStack.pop();
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Writes an operation as a statement to the current label's statement list.
+         *
+         * @param operation The OpCode of the operation
+         */
+        function writeOperation(operationIndex: number): void {
+            tryEnterLabel(operationIndex);
+            tryEnterOrLeaveBlock(operationIndex);
+
+            // early termination, nothing else to process in this label
+            if (lastOperationWasAbrupt) {
+                return;
+            }
+
+            lastOperationWasAbrupt = false;
+            lastOperationWasCompletion = false;
+
+            const opcode = operations[operationIndex];
+            if (opcode === OpCode.Nop) {
+                return;
+            }
+            else if (opcode === OpCode.Endfinally) {
+                return writeEndfinally();
+            }
+
+            const args = operationArguments[operationIndex];
+            if (opcode === OpCode.Statement) {
+                return writeStatement(<Statement>args[0]);
+            }
+
+            const location = operationLocations[operationIndex];
+            switch (opcode) {
+                case OpCode.Assign:
+                    return writeAssign(<Expression>args[0], <Expression>args[1], location);
+                case OpCode.Break:
+                    return writeBreak(<Label>args[0], location);
+                case OpCode.BreakWhenTrue:
+                    return writeBreakWhenTrue(<Label>args[0], <Expression>args[1], location);
+                case OpCode.BreakWhenFalse:
+                    return writeBreakWhenFalse(<Label>args[0], <Expression>args[1], location);
+                case OpCode.Yield:
+                    return writeYield(<Expression>args[0], location);
+                case OpCode.YieldStar:
+                    return writeYieldStar(<Expression>args[0], location);
+                case OpCode.Return:
+                    return writeReturn(<Expression>args[0], location);
+                case OpCode.Throw:
+                    return writeThrow(<Expression>args[0], location);
+            }
+        }
+
+        /**
+         * Writes a statement to the current label's statement list.
+         *
+         * @param statement A statement to write.
+         */
+        function writeStatement(statement: Statement): void {
+            if (statement) {
+                if (!statements) {
+                    statements = [statement];
+                }
+                else {
+                    statements.push(statement);
+                }
+            }
+        }
+
+        /**
+         * Writes an Assign operation to the current label's statement list.
+         *
+         * @param left The left-hand side of the assignment.
+         * @param right The right-hand side of the assignment.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeAssign(left: Expression, right: Expression, operationLocation: TextRange): void {
+            writeStatement(createStatement(createAssignment(left, right), operationLocation));
+        }
+
+        /**
+         * Writes a Throw operation to the current label's statement list.
+         *
+         * @param expression The value to throw.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeThrow(expression: Expression, operationLocation: TextRange): void {
+            lastOperationWasAbrupt = true;
+            lastOperationWasCompletion = true;
+            writeStatement(createThrow(expression, operationLocation));
+        }
+
+        /**
+         * Writes a Return operation to the current label's statement list.
+         *
+         * @param expression The value to return.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeReturn(expression: Expression, operationLocation: TextRange): void {
+            lastOperationWasAbrupt = true;
+            lastOperationWasCompletion = true;
+            writeStatement(
+                createReturn(
+                    createArrayLiteral(expression
+                        ? [createInstruction(Instruction.Return), expression]
+                        : [createInstruction(Instruction.Return)]
+                    ),
+                    operationLocation
+                )
+            );
+        }
+
+        /**
+         * Writes a Break operation to the current label's statement list.
+         *
+         * @param label The label for the Break.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeBreak(label: Label, operationLocation: TextRange): void {
+            lastOperationWasAbrupt = true;
+            writeStatement(
+                createReturn(
+                    createArrayLiteral([
+                        createInstruction(Instruction.Break),
+                        createLabel(label)
+                    ]),
+                    operationLocation
+                )
+            );
+        }
+
+        /**
+         * Writes a BreakWhenTrue operation to the current label's statement list.
+         *
+         * @param label The label for the Break.
+         * @param condition The condition for the Break.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeBreakWhenTrue(label: Label, condition: Expression, operationLocation: TextRange): void {
+            writeStatement(
+                createIf(
+                    condition,
+                    createReturn(
+                        createArrayLiteral([
+                            createInstruction(Instruction.Break),
+                            createLabel(label)
+                        ]),
+                        operationLocation
+                    )
+                )
+            );
+        }
+
+        /**
+         * Writes a BreakWhenFalse operation to the current label's statement list.
+         *
+         * @param label The label for the Break.
+         * @param condition The condition for the Break.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeBreakWhenFalse(label: Label, condition: Expression, operationLocation: TextRange): void {
+            writeStatement(
+                createIf(
+                    createLogicalNot(condition),
+                    createReturn(
+                        createArrayLiteral([
+                            createInstruction(Instruction.Break),
+                            createLabel(label)
+                        ]),
+                        operationLocation
+                    )
+                )
+            );
+        }
+
+        /**
+         * Writes a Yield operation to the current label's statement list.
+         *
+         * @param expression The expression to yield.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeYield(expression: Expression, operationLocation: TextRange): void {
+            lastOperationWasAbrupt = true;
+            writeStatement(
+                createReturn(
+                    createArrayLiteral(
+                        expression
+                            ? [createInstruction(Instruction.Yield), expression]
+                            : [createInstruction(Instruction.Yield)]
+                    ),
+                    operationLocation
+                )
+            );
+        }
+
+        /**
+         * Writes a YieldStar instruction to the current label's statement list.
+         *
+         * @param expression The expression to yield.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeYieldStar(expression: Expression, operationLocation: TextRange): void {
+            lastOperationWasAbrupt = true;
+            writeStatement(
+                createReturn(
+                    createArrayLiteral([
+                        createInstruction(Instruction.YieldStar),
+                        expression
+                    ]),
+                    operationLocation
+                )
+            );
+        }
+
+        /**
+         * Writes an Endfinally instruction to the current label's statement list.
+         */
+        function writeEndfinally(): void {
+            lastOperationWasAbrupt = true;
+            writeStatement(
+                createReturn(
+                    createArrayLiteral([
+                        createInstruction(Instruction.Endfinally)
+                    ])
+                )
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
new file mode 100644
index 00000000000..4bc523a262f
--- /dev/null
+++ b/src/compiler/transformers/jsx.ts
@@ -0,0 +1,518 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    const entities: Map<number> = createEntitiesMap();
+
+    export function transformJsx(context: TransformationContext) {
+        const compilerOptions = context.getCompilerOptions();
+        let currentSourceFile: SourceFile;
+        return transformSourceFile;
+
+        /**
+         * Transform JSX-specific syntax in a SourceFile.
+         *
+         * @param node A SourceFile node.
+         */
+        function transformSourceFile(node: SourceFile) {
+            currentSourceFile = node;
+            node = visitEachChild(node, visitor, context);
+            currentSourceFile = undefined;
+            return node;
+        }
+
+        function visitor(node: Node): VisitResult<Node> {
+            if (node.transformFlags & TransformFlags.Jsx) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsJsx) {
+                return visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+
+        function visitorWorker(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.JsxElement:
+                    return visitJsxElement(<JsxElement>node, /*isChild*/ false);
+
+                case SyntaxKind.JsxSelfClosingElement:
+                    return visitJsxSelfClosingElement(<JsxSelfClosingElement>node, /*isChild*/ false);
+
+                case SyntaxKind.JsxExpression:
+                    return visitJsxExpression(<JsxExpression>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
+            }
+        }
+
+        function transformJsxChildToExpression(node: JsxChild): Expression {
+            switch (node.kind) {
+                case SyntaxKind.JsxText:
+                    return visitJsxText(<JsxText>node);
+
+                case SyntaxKind.JsxExpression:
+                    return visitJsxExpression(<JsxExpression>node);
+
+                case SyntaxKind.JsxElement:
+                    return visitJsxElement(<JsxElement>node, /*isChild*/ true);
+
+                case SyntaxKind.JsxSelfClosingElement:
+                    return visitJsxSelfClosingElement(<JsxSelfClosingElement>node, /*isChild*/ true);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
+            }
+        }
+
+        function visitJsxElement(node: JsxElement, isChild: boolean) {
+            return visitJsxOpeningLikeElement(node.openingElement, node.children, isChild, /*location*/ node);
+        }
+
+        function visitJsxSelfClosingElement(node: JsxSelfClosingElement, isChild: boolean) {
+            return visitJsxOpeningLikeElement(node, /*children*/ undefined, isChild, /*location*/ node);
+        }
+
+        function visitJsxOpeningLikeElement(node: JsxOpeningLikeElement, children: JsxChild[], isChild: boolean, location: TextRange) {
+            const tagName = getTagName(node);
+            let objectProperties: Expression;
+            const attrs = node.attributes;
+            if (attrs.length === 0) {
+                // When there are no attributes, React wants "null"
+                objectProperties = createNull();
+            }
+            else {
+                // Map spans of JsxAttribute nodes into object literals and spans
+                // of JsxSpreadAttribute nodes into expressions.
+                const segments = flatten(
+                    spanMap(attrs, isJsxSpreadAttribute, (attrs, isSpread) => isSpread
+                        ? map(attrs, transformJsxSpreadAttributeToExpression)
+                        : createObjectLiteral(map(attrs, transformJsxAttributeToObjectLiteralElement))
+                    )
+                );
+
+                if (isJsxSpreadAttribute(attrs[0])) {
+                    // We must always emit at least one object literal before a spread
+                    // argument.
+                    segments.unshift(createObjectLiteral());
+                }
+
+                // Either emit one big object literal (no spread attribs), or
+                // a call to the __assign helper.
+                objectProperties = singleOrUndefined(segments)
+                    || createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
+            }
+
+            const element = createReactCreateElement(
+                compilerOptions.reactNamespace,
+                tagName,
+                objectProperties,
+                filter(map(children, transformJsxChildToExpression), isDefined),
+                node,
+                location
+            );
+
+            if (isChild) {
+                startOnNewLine(element);
+            }
+
+            return element;
+        }
+
+        function transformJsxSpreadAttributeToExpression(node: JsxSpreadAttribute) {
+            return visitNode(node.expression, visitor, isExpression);
+        }
+
+        function transformJsxAttributeToObjectLiteralElement(node: JsxAttribute) {
+            const name = getAttributeName(node);
+            const expression = transformJsxAttributeInitializer(node.initializer);
+            return createPropertyAssignment(name, expression);
+        }
+
+        function transformJsxAttributeInitializer(node: StringLiteral | JsxExpression) {
+            if (node === undefined) {
+                return createLiteral(true);
+            }
+            else if (node.kind === SyntaxKind.StringLiteral) {
+                return node;
+            }
+            else if (node.kind === SyntaxKind.JsxExpression) {
+                return visitJsxExpression(<JsxExpression>node);
+            }
+            else {
+                Debug.failBadSyntaxKind(node);
+            }
+        }
+
+        function visitJsxText(node: JsxText) {
+            const text = getTextOfNode(node, /*includeTrivia*/ true);
+            let parts: Expression[];
+            let firstNonWhitespace = 0;
+            let lastNonWhitespace = -1;
+
+            // JSX trims whitespace at the end and beginning of lines, except that the
+            // start/end of a tag is considered a start/end of a line only if that line is
+            // on the same line as the closing tag. See examples in
+            // tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
+            for (let i = 0; i < text.length; i++) {
+                const c = text.charCodeAt(i);
+                if (isLineBreak(c)) {
+                    if (firstNonWhitespace !== -1 && (lastNonWhitespace - firstNonWhitespace + 1 > 0)) {
+                        const part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
+                        if (!parts) {
+                            parts = [];
+                        }
+
+                        // We do not escape the string here as that is handled by the printer
+                        // when it emits the literal. We do, however, need to decode JSX entities.
+                        parts.push(createLiteral(decodeEntities(part)));
+                    }
+
+                    firstNonWhitespace = -1;
+                }
+                else if (!isWhiteSpace(c)) {
+                    lastNonWhitespace = i;
+                    if (firstNonWhitespace === -1) {
+                        firstNonWhitespace = i;
+                    }
+                }
+            }
+
+            if (firstNonWhitespace !== -1) {
+                const part = text.substr(firstNonWhitespace);
+                if (!parts) {
+                    parts = [];
+                }
+
+                // We do not escape the string here as that is handled by the printer
+                // when it emits the literal. We do, however, need to decode JSX entities.
+                parts.push(createLiteral(decodeEntities(part)));
+            }
+
+            if (parts) {
+                return reduceLeft(parts, aggregateJsxTextParts);
+            }
+
+            return undefined;
+        }
+
+        /**
+         * Aggregates two expressions by interpolating them with a whitespace literal.
+         */
+        function aggregateJsxTextParts(left: Expression, right: Expression) {
+            return createAdd(createAdd(left, createLiteral(" ")), right);
+        }
+
+        /**
+         * Decodes JSX entities.
+         */
+        function decodeEntities(text: string) {
+            return text.replace(/&(\w+);/g, function(s: any, m: string) {
+                if (entities[m] !== undefined) {
+                    return String.fromCharCode(entities[m]);
+                }
+                else {
+                    return s;
+                }
+            });
+        }
+
+        function getTagName(node: JsxElement | JsxOpeningLikeElement): Expression {
+            if (node.kind === SyntaxKind.JsxElement) {
+                return getTagName((<JsxElement>node).openingElement);
+            }
+            else {
+                const name = (<JsxOpeningLikeElement>node).tagName;
+                if (isIdentifier(name) && isIntrinsicJsxName(name.text)) {
+                    return createLiteral(name.text);
+                }
+                else {
+                    return createExpressionFromEntityName(name);
+                }
+            }
+        }
+
+        /**
+         * Emit an attribute name, which is quoted if it needs to be quoted. Because
+         * these emit into an object literal property name, we don't need to be worried
+         * about keywords, just non-identifier characters
+         */
+        function getAttributeName(node: JsxAttribute): StringLiteral | Identifier {
+            const name = node.name;
+            if (/^[A-Za-z_]\w*$/.test(name.text)) {
+                return name;
+            }
+            else {
+                return createLiteral(name.text);
+            }
+        }
+
+        function visitJsxExpression(node: JsxExpression) {
+            return visitNode(node.expression, visitor, isExpression);
+        }
+    }
+
+    function createEntitiesMap(): Map<number> {
+        return createMap<number>({
+            "quot": 0x0022,
+            "amp": 0x0026,
+            "apos": 0x0027,
+            "lt": 0x003C,
+            "gt": 0x003E,
+            "nbsp": 0x00A0,
+            "iexcl": 0x00A1,
+            "cent": 0x00A2,
+            "pound": 0x00A3,
+            "curren": 0x00A4,
+            "yen": 0x00A5,
+            "brvbar": 0x00A6,
+            "sect": 0x00A7,
+            "uml": 0x00A8,
+            "copy": 0x00A9,
+            "ordf": 0x00AA,
+            "laquo": 0x00AB,
+            "not": 0x00AC,
+            "shy": 0x00AD,
+            "reg": 0x00AE,
+            "macr": 0x00AF,
+            "deg": 0x00B0,
+            "plusmn": 0x00B1,
+            "sup2": 0x00B2,
+            "sup3": 0x00B3,
+            "acute": 0x00B4,
+            "micro": 0x00B5,
+            "para": 0x00B6,
+            "middot": 0x00B7,
+            "cedil": 0x00B8,
+            "sup1": 0x00B9,
+            "ordm": 0x00BA,
+            "raquo": 0x00BB,
+            "frac14": 0x00BC,
+            "frac12": 0x00BD,
+            "frac34": 0x00BE,
+            "iquest": 0x00BF,
+            "Agrave": 0x00C0,
+            "Aacute": 0x00C1,
+            "Acirc": 0x00C2,
+            "Atilde": 0x00C3,
+            "Auml": 0x00C4,
+            "Aring": 0x00C5,
+            "AElig": 0x00C6,
+            "Ccedil": 0x00C7,
+            "Egrave": 0x00C8,
+            "Eacute": 0x00C9,
+            "Ecirc": 0x00CA,
+            "Euml": 0x00CB,
+            "Igrave": 0x00CC,
+            "Iacute": 0x00CD,
+            "Icirc": 0x00CE,
+            "Iuml": 0x00CF,
+            "ETH": 0x00D0,
+            "Ntilde": 0x00D1,
+            "Ograve": 0x00D2,
+            "Oacute": 0x00D3,
+            "Ocirc": 0x00D4,
+            "Otilde": 0x00D5,
+            "Ouml": 0x00D6,
+            "times": 0x00D7,
+            "Oslash": 0x00D8,
+            "Ugrave": 0x00D9,
+            "Uacute": 0x00DA,
+            "Ucirc": 0x00DB,
+            "Uuml": 0x00DC,
+            "Yacute": 0x00DD,
+            "THORN": 0x00DE,
+            "szlig": 0x00DF,
+            "agrave": 0x00E0,
+            "aacute": 0x00E1,
+            "acirc": 0x00E2,
+            "atilde": 0x00E3,
+            "auml": 0x00E4,
+            "aring": 0x00E5,
+            "aelig": 0x00E6,
+            "ccedil": 0x00E7,
+            "egrave": 0x00E8,
+            "eacute": 0x00E9,
+            "ecirc": 0x00EA,
+            "euml": 0x00EB,
+            "igrave": 0x00EC,
+            "iacute": 0x00ED,
+            "icirc": 0x00EE,
+            "iuml": 0x00EF,
+            "eth": 0x00F0,
+            "ntilde": 0x00F1,
+            "ograve": 0x00F2,
+            "oacute": 0x00F3,
+            "ocirc": 0x00F4,
+            "otilde": 0x00F5,
+            "ouml": 0x00F6,
+            "divide": 0x00F7,
+            "oslash": 0x00F8,
+            "ugrave": 0x00F9,
+            "uacute": 0x00FA,
+            "ucirc": 0x00FB,
+            "uuml": 0x00FC,
+            "yacute": 0x00FD,
+            "thorn": 0x00FE,
+            "yuml": 0x00FF,
+            "OElig": 0x0152,
+            "oelig": 0x0153,
+            "Scaron": 0x0160,
+            "scaron": 0x0161,
+            "Yuml": 0x0178,
+            "fnof": 0x0192,
+            "circ": 0x02C6,
+            "tilde": 0x02DC,
+            "Alpha": 0x0391,
+            "Beta": 0x0392,
+            "Gamma": 0x0393,
+            "Delta": 0x0394,
+            "Epsilon": 0x0395,
+            "Zeta": 0x0396,
+            "Eta": 0x0397,
+            "Theta": 0x0398,
+            "Iota": 0x0399,
+            "Kappa": 0x039A,
+            "Lambda": 0x039B,
+            "Mu": 0x039C,
+            "Nu": 0x039D,
+            "Xi": 0x039E,
+            "Omicron": 0x039F,
+            "Pi": 0x03A0,
+            "Rho": 0x03A1,
+            "Sigma": 0x03A3,
+            "Tau": 0x03A4,
+            "Upsilon": 0x03A5,
+            "Phi": 0x03A6,
+            "Chi": 0x03A7,
+            "Psi": 0x03A8,
+            "Omega": 0x03A9,
+            "alpha": 0x03B1,
+            "beta": 0x03B2,
+            "gamma": 0x03B3,
+            "delta": 0x03B4,
+            "epsilon": 0x03B5,
+            "zeta": 0x03B6,
+            "eta": 0x03B7,
+            "theta": 0x03B8,
+            "iota": 0x03B9,
+            "kappa": 0x03BA,
+            "lambda": 0x03BB,
+            "mu": 0x03BC,
+            "nu": 0x03BD,
+            "xi": 0x03BE,
+            "omicron": 0x03BF,
+            "pi": 0x03C0,
+            "rho": 0x03C1,
+            "sigmaf": 0x03C2,
+            "sigma": 0x03C3,
+            "tau": 0x03C4,
+            "upsilon": 0x03C5,
+            "phi": 0x03C6,
+            "chi": 0x03C7,
+            "psi": 0x03C8,
+            "omega": 0x03C9,
+            "thetasym": 0x03D1,
+            "upsih": 0x03D2,
+            "piv": 0x03D6,
+            "ensp": 0x2002,
+            "emsp": 0x2003,
+            "thinsp": 0x2009,
+            "zwnj": 0x200C,
+            "zwj": 0x200D,
+            "lrm": 0x200E,
+            "rlm": 0x200F,
+            "ndash": 0x2013,
+            "mdash": 0x2014,
+            "lsquo": 0x2018,
+            "rsquo": 0x2019,
+            "sbquo": 0x201A,
+            "ldquo": 0x201C,
+            "rdquo": 0x201D,
+            "bdquo": 0x201E,
+            "dagger": 0x2020,
+            "Dagger": 0x2021,
+            "bull": 0x2022,
+            "hellip": 0x2026,
+            "permil": 0x2030,
+            "prime": 0x2032,
+            "Prime": 0x2033,
+            "lsaquo": 0x2039,
+            "rsaquo": 0x203A,
+            "oline": 0x203E,
+            "frasl": 0x2044,
+            "euro": 0x20AC,
+            "image": 0x2111,
+            "weierp": 0x2118,
+            "real": 0x211C,
+            "trade": 0x2122,
+            "alefsym": 0x2135,
+            "larr": 0x2190,
+            "uarr": 0x2191,
+            "rarr": 0x2192,
+            "darr": 0x2193,
+            "harr": 0x2194,
+            "crarr": 0x21B5,
+            "lArr": 0x21D0,
+            "uArr": 0x21D1,
+            "rArr": 0x21D2,
+            "dArr": 0x21D3,
+            "hArr": 0x21D4,
+            "forall": 0x2200,
+            "part": 0x2202,
+            "exist": 0x2203,
+            "empty": 0x2205,
+            "nabla": 0x2207,
+            "isin": 0x2208,
+            "notin": 0x2209,
+            "ni": 0x220B,
+            "prod": 0x220F,
+            "sum": 0x2211,
+            "minus": 0x2212,
+            "lowast": 0x2217,
+            "radic": 0x221A,
+            "prop": 0x221D,
+            "infin": 0x221E,
+            "ang": 0x2220,
+            "and": 0x2227,
+            "or": 0x2228,
+            "cap": 0x2229,
+            "cup": 0x222A,
+            "int": 0x222B,
+            "there4": 0x2234,
+            "sim": 0x223C,
+            "cong": 0x2245,
+            "asymp": 0x2248,
+            "ne": 0x2260,
+            "equiv": 0x2261,
+            "le": 0x2264,
+            "ge": 0x2265,
+            "sub": 0x2282,
+            "sup": 0x2283,
+            "nsub": 0x2284,
+            "sube": 0x2286,
+            "supe": 0x2287,
+            "oplus": 0x2295,
+            "otimes": 0x2297,
+            "perp": 0x22A5,
+            "sdot": 0x22C5,
+            "lceil": 0x2308,
+            "rceil": 0x2309,
+            "lfloor": 0x230A,
+            "rfloor": 0x230B,
+            "lang": 0x2329,
+            "rang": 0x232A,
+            "loz": 0x25CA,
+            "spades": 0x2660,
+            "clubs": 0x2663,
+            "hearts": 0x2665,
+            "diams": 0x2666
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/module/es6.ts b/src/compiler/transformers/module/es6.ts
new file mode 100644
index 00000000000..2716165f2d3
--- /dev/null
+++ b/src/compiler/transformers/module/es6.ts
@@ -0,0 +1,140 @@
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    export function transformES6Module(context: TransformationContext) {
+        const compilerOptions = context.getCompilerOptions();
+        const resolver = context.getEmitResolver();
+
+        let currentSourceFile: SourceFile;
+
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            if (isExternalModule(node) || compilerOptions.isolatedModules) {
+                currentSourceFile = node;
+                return visitEachChild(node, visitor, context);
+            }
+            return node;
+        }
+
+        function visitor(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ImportDeclaration:
+                    return visitImportDeclaration(<ImportDeclaration>node);
+                case SyntaxKind.ImportEqualsDeclaration:
+                    return visitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+                case SyntaxKind.ImportClause:
+                    return visitImportClause(<ImportClause>node);
+                case SyntaxKind.NamedImports:
+                case SyntaxKind.NamespaceImport:
+                    return visitNamedBindings(<NamedImportBindings>node);
+                case SyntaxKind.ImportSpecifier:
+                    return visitImportSpecifier(<ImportSpecifier>node);
+                case SyntaxKind.ExportAssignment:
+                    return visitExportAssignment(<ExportAssignment>node);
+                case SyntaxKind.ExportDeclaration:
+                    return visitExportDeclaration(<ExportDeclaration>node);
+                case SyntaxKind.NamedExports:
+                    return visitNamedExports(<NamedExports>node);
+                case SyntaxKind.ExportSpecifier:
+                    return visitExportSpecifier(<ExportSpecifier>node);
+            }
+
+            return node;
+        }
+
+        function visitExportAssignment(node: ExportAssignment): ExportAssignment {
+            if (node.isExportEquals) {
+                return undefined; // do not emit export equals for ES6
+            }
+            const original = getOriginalNode(node);
+            return nodeIsSynthesized(original) || resolver.isValueAliasDeclaration(original) ? node : undefined;
+        }
+
+        function visitExportDeclaration(node: ExportDeclaration): ExportDeclaration {
+            if (!node.exportClause) {
+                return resolver.moduleExportsSomeValue(node.moduleSpecifier) ? node : undefined;
+            }
+            if (!resolver.isValueAliasDeclaration(node)) {
+                return undefined;
+            }
+            const newExportClause = visitNode(node.exportClause, visitor, isNamedExports, /*optional*/ true);
+            if (node.exportClause === newExportClause) {
+                return node;
+            }
+            return newExportClause
+                ? createExportDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    newExportClause,
+                    node.moduleSpecifier)
+                : undefined;
+        }
+
+        function visitNamedExports(node: NamedExports): NamedExports {
+            const newExports = visitNodes(node.elements, visitor, isExportSpecifier);
+            if (node.elements === newExports) {
+                return node;
+            }
+            return newExports.length ? createNamedExports(newExports) : undefined;
+        }
+
+        function visitExportSpecifier(node: ExportSpecifier): ExportSpecifier {
+            return resolver.isValueAliasDeclaration(node) ? node : undefined;
+        }
+
+        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): ImportEqualsDeclaration {
+            return !isExternalModuleImportEqualsDeclaration(node) || resolver.isReferencedAliasDeclaration(node) ? node : undefined;
+        }
+
+        function visitImportDeclaration(node: ImportDeclaration) {
+            if (node.importClause) {
+                const newImportClause = visitNode(node.importClause, visitor, isImportClause);
+                if (!newImportClause.name && !newImportClause.namedBindings) {
+                    return undefined;
+                }
+                else if (newImportClause !== node.importClause) {
+                    return createImportDeclaration(
+                        /*decorators*/ undefined,
+                        /*modifiers*/ undefined,
+                        newImportClause,
+                        node.moduleSpecifier);
+                }
+            }
+            return node;
+        }
+
+        function visitImportClause(node: ImportClause): ImportClause {
+            let newDefaultImport = node.name;
+            if (!resolver.isReferencedAliasDeclaration(node)) {
+                newDefaultImport = undefined;
+            }
+            const newNamedBindings = visitNode(node.namedBindings, visitor, isNamedImportBindings, /*optional*/ true);
+            return newDefaultImport !== node.name || newNamedBindings !== node.namedBindings
+                ? createImportClause(newDefaultImport, newNamedBindings)
+                : node;
+        }
+
+        function visitNamedBindings(node: NamedImportBindings): VisitResult<NamedImportBindings> {
+            if (node.kind === SyntaxKind.NamespaceImport) {
+                return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
+            }
+            else {
+                const newNamedImportElements = visitNodes((<NamedImports>node).elements, visitor, isImportSpecifier);
+                if (!newNamedImportElements || newNamedImportElements.length == 0) {
+                    return undefined;
+                }
+                if (newNamedImportElements === (<NamedImports>node).elements) {
+                    return node;
+                }
+                return createNamedImports(newNamedImportElements);
+            }
+        }
+
+        function visitImportSpecifier(node: ImportSpecifier) {
+            return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
new file mode 100644
index 00000000000..144420b7ae9
--- /dev/null
+++ b/src/compiler/transformers/module/module.ts
@@ -0,0 +1,1096 @@
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    export function transformModule(context: TransformationContext) {
+        const transformModuleDelegates = createMap<(node: SourceFile) => SourceFile>({
+            [ModuleKind.None]: transformCommonJSModule,
+            [ModuleKind.CommonJS]: transformCommonJSModule,
+            [ModuleKind.AMD]: transformAMDModule,
+            [ModuleKind.UMD]: transformUMDModule,
+        });
+
+        const {
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            hoistVariableDeclaration,
+            setNodeEmitFlags,
+            getNodeEmitFlags,
+            setSourceMapRange,
+        } = context;
+
+        const compilerOptions = context.getCompilerOptions();
+        const resolver = context.getEmitResolver();
+        const host = context.getEmitHost();
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const moduleKind = getEmitModuleKind(compilerOptions);
+        const previousOnSubstituteNode = context.onSubstituteNode;
+        const previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(SyntaxKind.Identifier);
+        context.enableSubstitution(SyntaxKind.BinaryExpression);
+        context.enableSubstitution(SyntaxKind.PrefixUnaryExpression);
+        context.enableSubstitution(SyntaxKind.PostfixUnaryExpression);
+        context.enableSubstitution(SyntaxKind.ShorthandPropertyAssignment);
+        context.enableEmitNotification(SyntaxKind.SourceFile);
+
+        let currentSourceFile: SourceFile;
+        let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
+        let exportSpecifiers: Map<ExportSpecifier[]>;
+        let exportEquals: ExportAssignment;
+        let bindingNameExportSpecifiersMap: Map<ExportSpecifier[]>;
+        // Subset of exportSpecifiers that is a binding-name.
+        // This is to reduce amount of memory we have to keep around even after we done with module-transformer
+        const bindingNameExportSpecifiersForFileMap = createMap<Map<ExportSpecifier[]>>();
+        let hasExportStarsToExportValues: boolean;
+
+        return transformSourceFile;
+
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node: SourceFile) {
+            if (isExternalModule(node) || compilerOptions.isolatedModules) {
+                currentSourceFile = node;
+
+                // Collect information about the external module.
+                ({ externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues } = collectExternalModuleInfo(node, resolver));
+
+                // Perform the transformation.
+                const transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ModuleKind.None];
+                const updated = transformModule(node);
+                aggregateTransformFlags(updated);
+
+                currentSourceFile = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStarsToExportValues = false;
+                return updated;
+            }
+
+            return node;
+        }
+
+        /**
+         * Transforms a SourceFile into a CommonJS module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformCommonJSModule(node: SourceFile) {
+            startLexicalEnvironment();
+
+            const statements: Statement[] = [];
+            const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitor);
+            addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
+            addRange(statements, endLexicalEnvironment());
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
+
+            const updated = updateSourceFile(node, statements);
+            if (hasExportStarsToExportValues) {
+                setNodeEmitFlags(updated, NodeEmitFlags.EmitExportStar | getNodeEmitFlags(node));
+            }
+
+            return updated;
+        }
+
+        /**
+         * Transforms a SourceFile into an AMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAMDModule(node: SourceFile) {
+            const define = createIdentifier("define");
+            const moduleName = tryGetModuleNameFromFile(node, host, compilerOptions);
+            return transformAsynchronousModule(node, define, moduleName, /*includeNonAmdDependencies*/ true);
+        }
+
+        /**
+         * Transforms a SourceFile into a UMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformUMDModule(node: SourceFile) {
+            const define = createIdentifier("define");
+            setNodeEmitFlags(define, NodeEmitFlags.UMDDefine);
+            return transformAsynchronousModule(node, define, /*moduleName*/ undefined, /*includeNonAmdDependencies*/ false);
+        }
+
+        /**
+         * Transforms a SourceFile into an AMD or UMD module.
+         *
+         * @param node The SourceFile node.
+         * @param define The expression used to define the module.
+         * @param moduleName An expression for the module name, if available.
+         * @param includeNonAmdDependencies A value indicating whether to incldue any non-AMD dependencies.
+         */
+        function transformAsynchronousModule(node: SourceFile, define: Expression, moduleName: Expression, includeNonAmdDependencies: boolean) {
+            // An AMD define function has the following shape:
+            //
+            //     define(id?, dependencies?, factory);
+            //
+            // This has the shape of the following:
+            //
+            //     define(name, ["module1", "module2"], function (module1Alias) { ... }
+            //
+            // The location of the alias in the parameter list in the factory function needs to
+            // match the position of the module name in the dependency list.
+            //
+            // To ensure this is true in cases of modules with no aliases, e.g.:
+            //
+            //     import "module"
+            //
+            // or
+            //
+            //     /// <amd-dependency path= "a.css" />
+            //
+            // we need to add modules without alias names to the end of the dependencies list
+
+            const { aliasedModuleNames, unaliasedModuleNames, importAliasNames } = collectAsynchronousDependencies(node, includeNonAmdDependencies);
+
+            // Create an updated SourceFile:
+            //
+            //     define(moduleName?, ["module1", "module2"], function ...
+            return updateSourceFile(node, [
+                createStatement(
+                    createCall(
+                        define,
+                        /*typeArguments*/ undefined,
+                        [
+                            // Add the module name (if provided).
+                            ...(moduleName ? [moduleName] : []),
+
+                            // Add the dependency array argument:
+                            //
+                            //     ["require", "exports", module1", "module2", ...]
+                            createArrayLiteral([
+                                createLiteral("require"),
+                                createLiteral("exports"),
+                                ...aliasedModuleNames,
+                                ...unaliasedModuleNames
+                            ]),
+
+                            // Add the module body function argument:
+                            //
+                            //     function (require, exports, module1, module2) ...
+                            createFunctionExpression(
+                                /*asteriskToken*/ undefined,
+                                /*name*/ undefined,
+                                /*typeParameters*/ undefined,
+                                [
+                                    createParameter("require"),
+                                    createParameter("exports"),
+                                    ...importAliasNames
+                                ],
+                                /*type*/ undefined,
+                                transformAsynchronousModuleBody(node)
+                            )
+                        ]
+                    )
+                )
+            ]);
+        }
+
+        /**
+         * Transforms a SourceFile into an AMD or UMD module body.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAsynchronousModuleBody(node: SourceFile) {
+            startLexicalEnvironment();
+
+            const statements: Statement[] = [];
+            const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitor);
+
+            // Visit each statement of the module body.
+            addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
+
+            // End the lexical environment for the module body
+            // and merge any new lexical declarations.
+            addRange(statements, endLexicalEnvironment());
+
+            // Append the 'export =' statement if provided.
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
+
+            const body = createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            if (hasExportStarsToExportValues) {
+                // If we have any `export * from ...` declarations
+                // we need to inform the emitter to add the __export helper.
+                setNodeEmitFlags(body, NodeEmitFlags.EmitExportStar);
+            }
+
+            return body;
+        }
+
+        function addExportEqualsIfNeeded(statements: Statement[], emitAsReturn: boolean) {
+            if (exportEquals && resolver.isValueAliasDeclaration(exportEquals)) {
+                if (emitAsReturn) {
+                    const statement = createReturn(
+                        exportEquals.expression,
+                        /*location*/ exportEquals
+                    );
+
+                    setNodeEmitFlags(statement, NodeEmitFlags.NoTokenSourceMaps | NodeEmitFlags.NoComments);
+                    statements.push(statement);
+                }
+                else {
+                    const statement = createStatement(
+                        createAssignment(
+                            createPropertyAccess(
+                                createIdentifier("module"),
+                                "exports"
+                            ),
+                            exportEquals.expression
+                        ),
+                        /*location*/ exportEquals
+                    );
+
+                    setNodeEmitFlags(statement, NodeEmitFlags.NoComments);
+                    statements.push(statement);
+                }
+            }
+        }
+
+        /**
+         * Visits a node at the top level of the source file.
+         *
+         * @param node The node.
+         */
+        function visitor(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ImportDeclaration:
+                    return visitImportDeclaration(<ImportDeclaration>node);
+
+                case SyntaxKind.ImportEqualsDeclaration:
+                    return visitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+
+                case SyntaxKind.ExportDeclaration:
+                    return visitExportDeclaration(<ExportDeclaration>node);
+
+                case SyntaxKind.ExportAssignment:
+                    return visitExportAssignment(<ExportAssignment>node);
+
+                case SyntaxKind.VariableStatement:
+                    return visitVariableStatement(<VariableStatement>node);
+
+                case SyntaxKind.FunctionDeclaration:
+                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+
+                case SyntaxKind.ClassDeclaration:
+                    return visitClassDeclaration(<ClassDeclaration>node);
+
+                case SyntaxKind.ExpressionStatement:
+                    return visitExpressionStatement(<ExpressionStatement>node);
+
+                default:
+                    // This visitor does not descend into the tree, as export/import statements
+                    // are only transformed at the top level of a file.
+                    return node;
+            }
+        }
+
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The ImportDeclaration node.
+         */
+        function visitImportDeclaration(node: ImportDeclaration): VisitResult<Statement> {
+            if (!contains(externalImports, node)) {
+                return undefined;
+            }
+
+            const statements: Statement[] = [];
+            const namespaceDeclaration = getNamespaceDeclarationNode(node);
+            if (moduleKind !== ModuleKind.AMD) {
+                if (!node.importClause) {
+                    // import "mod";
+                    statements.push(
+                        createStatement(
+                            createRequireCall(node),
+                            /*location*/ node
+                        )
+                    );
+                }
+                else {
+                    const variables: VariableDeclaration[] = [];
+                    if (namespaceDeclaration && !isDefaultImport(node)) {
+                        // import * as n from "mod";
+                        variables.push(
+                            createVariableDeclaration(
+                                getSynthesizedClone(namespaceDeclaration.name),
+                                /*type*/ undefined,
+                                createRequireCall(node)
+                            )
+                        );
+                    }
+                    else {
+                        // import d from "mod";
+                        // import { x, y } from "mod";
+                        // import d, { x, y } from "mod";
+                        // import d, * as n from "mod";
+                        variables.push(
+                            createVariableDeclaration(
+                                getGeneratedNameForNode(node),
+                                /*type*/ undefined,
+                                createRequireCall(node)
+                            )
+                        );
+
+                        if (namespaceDeclaration && isDefaultImport(node)) {
+                            variables.push(
+                                createVariableDeclaration(
+                                    getSynthesizedClone(namespaceDeclaration.name),
+                                    /*type*/ undefined,
+                                    getGeneratedNameForNode(node)
+                                )
+                            );
+                        }
+                    }
+
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createConstDeclarationList(variables),
+                            /*location*/ node
+                        )
+                    );
+                }
+            }
+            else if (namespaceDeclaration && isDefaultImport(node)) {
+                // import d, * as n from "mod";
+                statements.push(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createVariableDeclarationList([
+                            createVariableDeclaration(
+                                getSynthesizedClone(namespaceDeclaration.name),
+                                /*type*/ undefined,
+                                getGeneratedNameForNode(node),
+                                /*location*/ node
+                            )
+                        ])
+                    )
+                );
+            }
+
+            addExportImportAssignments(statements, node);
+            return singleOrMany(statements);
+        }
+
+        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): VisitResult<Statement> {
+            if (!contains(externalImports, node)) {
+                return undefined;
+            }
+
+            // Set emitFlags on the name of the importEqualsDeclaration
+            // This is so the printer will not substitute the identifier
+            setNodeEmitFlags(node.name, NodeEmitFlags.NoSubstitution);
+            const statements: Statement[] = [];
+            if (moduleKind !== ModuleKind.AMD) {
+                if (hasModifier(node, ModifierFlags.Export)) {
+                    statements.push(
+                        createStatement(
+                            createExportAssignment(
+                                node.name,
+                                createRequireCall(node)
+                            ),
+                            /*location*/ node
+                        )
+                    );
+                }
+                else {
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    getSynthesizedClone(node.name),
+                                    /*type*/ undefined,
+                                    createRequireCall(node)
+                                )
+                            ],
+                            /*location*/ undefined,
+                            /*flags*/ languageVersion >= ScriptTarget.ES6 ? NodeFlags.Const : NodeFlags.None),
+                            /*location*/ node
+                        )
+                    );
+                }
+            }
+            else {
+                if (hasModifier(node, ModifierFlags.Export)) {
+                    statements.push(
+                        createStatement(
+                            createExportAssignment(node.name, node.name),
+                            /*location*/ node
+                        )
+                    );
+                }
+            }
+
+            addExportImportAssignments(statements, node);
+            return statements;
+        }
+
+        function visitExportDeclaration(node: ExportDeclaration): VisitResult<Statement> {
+            if (!contains(externalImports, node)) {
+                return undefined;
+            }
+
+            const generatedName = getGeneratedNameForNode(node);
+            if (node.exportClause) {
+                const statements: Statement[] = [];
+                // export { x, y } from "mod";
+                if (moduleKind !== ModuleKind.AMD) {
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    generatedName,
+                                    /*type*/ undefined,
+                                    createRequireCall(node)
+                                )
+                            ]),
+                            /*location*/ node
+                        )
+                    );
+                }
+                for (const specifier of node.exportClause.elements) {
+                    if (resolver.isValueAliasDeclaration(specifier)) {
+                        const exportedValue = createPropertyAccess(
+                            generatedName,
+                            specifier.propertyName || specifier.name
+                        );
+                        statements.push(
+                            createStatement(
+                                createExportAssignment(specifier.name, exportedValue),
+                                /*location*/ specifier
+                            )
+                        );
+                    }
+                }
+
+                return singleOrMany(statements);
+            }
+            else if (resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
+                // export * from "mod";
+                return createStatement(
+                    createCall(
+                        createIdentifier("__export"),
+                        /*typeArguments*/ undefined,
+                        [
+                            moduleKind !== ModuleKind.AMD
+                                ? createRequireCall(node)
+                                : generatedName
+                        ]
+                    ),
+                    /*location*/ node
+                );
+            }
+        }
+
+        function visitExportAssignment(node: ExportAssignment): VisitResult<Statement> {
+            if (!node.isExportEquals) {
+                if (nodeIsSynthesized(node) || resolver.isValueAliasDeclaration(node)) {
+                    const statements: Statement[] = [];
+                    addExportDefault(statements, node.expression, /*location*/ node);
+                    return statements;
+                }
+            }
+
+            return undefined;
+        }
+
+        function addExportDefault(statements: Statement[], expression: Expression, location: TextRange): void {
+            tryAddExportDefaultCompat(statements);
+
+            statements.push(
+                createStatement(
+                    createExportAssignment(
+                        createIdentifier("default"),
+                        expression
+                    ),
+                    location
+                )
+            );
+        }
+
+        function tryAddExportDefaultCompat(statements: Statement[]) {
+            const original = getOriginalNode(currentSourceFile);
+            Debug.assert(original.kind === SyntaxKind.SourceFile);
+
+            if (!original.symbol.exports["___esModule"]) {
+                if (languageVersion === ScriptTarget.ES3) {
+                    statements.push(
+                        createStatement(
+                            createExportAssignment(
+                                createIdentifier("__esModule"),
+                                createLiteral(true)
+                            )
+                        )
+                    );
+                }
+                else {
+                    statements.push(
+                        createStatement(
+                            createCall(
+                                createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                                /*typeArguments*/ undefined,
+                                [
+                                    createIdentifier("exports"),
+                                    createLiteral("__esModule"),
+                                    createObjectLiteral([
+                                        createPropertyAssignment("value", createLiteral(true))
+                                    ])
+                                ]
+                            )
+                        )
+                    );
+                }
+            }
+        }
+
+        function addExportImportAssignments(statements: Statement[], node: ImportEqualsDeclaration | ImportDeclaration) {
+            if (isImportEqualsDeclaration(node)) {
+                addExportMemberAssignments(statements, node.name);
+            }
+            else {
+                const names = reduceEachChild(node, collectExportMembers, []);
+                for (const name of names) {
+                    addExportMemberAssignments(statements, name);
+                }
+            }
+        }
+
+        function collectExportMembers(names: Identifier[], node: Node): Identifier[] {
+            if (isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node) && isDeclaration(node)) {
+                const name = node.name;
+                if (isIdentifier(name)) {
+                    names.push(name);
+                }
+            }
+
+            return reduceEachChild(node, collectExportMembers, names);
+        }
+
+        function addExportMemberAssignments(statements: Statement[], name: Identifier): void {
+            if (!exportEquals && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) {
+                for (const specifier of exportSpecifiers[name.text]) {
+                    statements.push(
+                        startOnNewLine(
+                            createStatement(
+                                createExportAssignment(specifier.name, name),
+                                /*location*/ specifier.name
+                            )
+                        )
+                    );
+                }
+            }
+        }
+
+        function addExportMemberAssignment(statements: Statement[], node: DeclarationStatement) {
+            if (hasModifier(node, ModifierFlags.Default)) {
+                addExportDefault(statements, getDeclarationName(node), /*location*/ node);
+            }
+            else {
+                statements.push(
+                    createExportStatement(node.name, setNodeEmitFlags(getSynthesizedClone(node.name), NodeEmitFlags.LocalName), /*location*/ node)
+                );
+            }
+        }
+
+        function visitVariableStatement(node: VariableStatement): VisitResult<Statement> {
+            // If the variable is for a generated declaration,
+            // we should maintain it and just strip off the 'export' modifier if necessary.
+            const originalKind = getOriginalNode(node).kind;
+            if (originalKind === SyntaxKind.ModuleDeclaration ||
+                originalKind === SyntaxKind.EnumDeclaration ||
+                originalKind === SyntaxKind.ClassDeclaration) {
+
+                if (!hasModifier(node, ModifierFlags.Export)) {
+                    return node;
+                }
+
+                return setOriginalNode(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        node.declarationList
+                    ),
+                    node
+                );
+            }
+
+            const resultStatements: Statement[] = [];
+
+            // If we're exporting these variables, then these just become assignments to 'exports.blah'.
+            // We only want to emit assignments for variables with initializers.
+            if (hasModifier(node, ModifierFlags.Export)) {
+                const variables = getInitializedVariables(node.declarationList);
+                if (variables.length > 0) {
+                    const inlineAssignments = createStatement(
+                        inlineExpressions(
+                            map(variables, transformInitializedVariable)
+                        ),
+                        node
+                    );
+                    resultStatements.push(inlineAssignments);
+                }
+            }
+            else {
+                resultStatements.push(node);
+            }
+
+            // While we might not have been exported here, each variable might have been exported
+            // later on in an export specifier (e.g. `export {foo as blah, bar}`).
+            for (const decl of node.declarationList.declarations) {
+                addExportMemberAssignmentsForBindingName(resultStatements, decl.name);
+            }
+
+            return resultStatements;
+        }
+
+        /**
+         * Creates appropriate assignments for each binding identifier that is exported in an export specifier,
+         * and inserts it into 'resultStatements'.
+         */
+        function addExportMemberAssignmentsForBindingName(resultStatements: Statement[], name: BindingName): void {
+            if (isBindingPattern(name)) {
+                for (const element of name.elements) {
+                    addExportMemberAssignmentsForBindingName(resultStatements, element.name);
+                }
+            }
+            else {
+                if (!exportEquals && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) {
+                    const sourceFileId = getOriginalNodeId(currentSourceFile);
+                    if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) {
+                        bindingNameExportSpecifiersForFileMap[sourceFileId] = createMap<ExportSpecifier[]>();
+                    }
+                    bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text];
+                    addExportMemberAssignments(resultStatements, name);
+                }
+            }
+        }
+
+        function transformInitializedVariable(node: VariableDeclaration): Expression {
+            const name = node.name;
+            if (isBindingPattern(name)) {
+                return flattenVariableDestructuringToExpression(
+                    context,
+                    node,
+                    hoistVariableDeclaration,
+                    getModuleMemberName,
+                    visitor
+                );
+            }
+            else {
+                return createAssignment(
+                    getModuleMemberName(name),
+                    visitNode(node.initializer, visitor, isExpression)
+                );
+            }
+        }
+
+        function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
+            const statements: Statement[] = [];
+            const name = node.name || getGeneratedNameForNode(node);
+            if (hasModifier(node, ModifierFlags.Export)) {
+                statements.push(
+                    setOriginalNode(
+                        createFunctionDeclaration(
+                            /*decorators*/ undefined,
+                            /*modifiers*/ undefined,
+                            /*asteriskToken*/ undefined,
+                            name,
+                            /*typeParameters*/ undefined,
+                            node.parameters,
+                            /*type*/ undefined,
+                            node.body,
+                            /*location*/ node
+                        ),
+                        /*original*/ node
+                    )
+                );
+
+                addExportMemberAssignment(statements, node);
+            }
+            else {
+                statements.push(node);
+            }
+
+            if (node.name) {
+                addExportMemberAssignments(statements, node.name);
+            }
+
+            return singleOrMany(statements);
+        }
+
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
+            const statements: Statement[] = [];
+            const name = node.name || getGeneratedNameForNode(node);
+            if (hasModifier(node, ModifierFlags.Export)) {
+                statements.push(
+                    setOriginalNode(
+                        createClassDeclaration(
+                            /*decorators*/ undefined,
+                            /*modifiers*/ undefined,
+                            name,
+                            /*typeParameters*/ undefined,
+                            node.heritageClauses,
+                            node.members,
+                            /*location*/ node
+                        ),
+                        /*original*/ node
+                    )
+                );
+
+                addExportMemberAssignment(statements, node);
+            }
+            else {
+                statements.push(node);
+            }
+
+            // Decorators end up creating a series of assignment expressions which overwrite
+            // the local binding that we export, so we need to defer from exporting decorated classes
+            // until the decoration assignments take place. We do this when visiting expression-statements.
+            if (node.name && !(node.decorators && node.decorators.length)) {
+                addExportMemberAssignments(statements, node.name);
+            }
+
+            return singleOrMany(statements);
+        }
+
+        function visitExpressionStatement(node: ExpressionStatement): VisitResult<Statement> {
+            const original = getOriginalNode(node);
+            const origKind = original.kind;
+
+            if (origKind === SyntaxKind.EnumDeclaration || origKind === SyntaxKind.ModuleDeclaration) {
+                return visitExpressionStatementForEnumOrNamespaceDeclaration(node, <EnumDeclaration | ModuleDeclaration>original);
+            }
+            else if (origKind === SyntaxKind.ClassDeclaration) {
+                // The decorated assignment for a class name may need to be transformed.
+                const classDecl = original as ClassDeclaration;
+                if (classDecl.name) {
+                    const statements = [node];
+                    addExportMemberAssignments(statements, classDecl.name);
+                    return statements;
+                }
+            }
+
+            return node;
+        }
+
+        function visitExpressionStatementForEnumOrNamespaceDeclaration(node: ExpressionStatement, original: EnumDeclaration | ModuleDeclaration): VisitResult<Statement> {
+            const statements: Statement[] = [node];
+
+            // Preserve old behavior for enums in which a variable statement is emitted after the body itself.
+            if (hasModifier(original, ModifierFlags.Export) &&
+                original.kind === SyntaxKind.EnumDeclaration &&
+                isFirstDeclarationOfKind(original, SyntaxKind.EnumDeclaration)) {
+                addVarForExportedEnumOrNamespaceDeclaration(statements, original);
+            }
+
+            addExportMemberAssignments(statements, original.name);
+
+            return statements;
+        }
+
+        /**
+         * Adds a trailing VariableStatement for an enum or module declaration.
+         */
+        function addVarForExportedEnumOrNamespaceDeclaration(statements: Statement[], node: EnumDeclaration | ModuleDeclaration) {
+            statements.push(
+                createVariableStatement(
+                    /*modifiers*/ undefined,
+                    [createVariableDeclaration(
+                        getDeclarationName(node),
+                        /*type*/ undefined,
+                        createPropertyAccess(createIdentifier("exports"), getDeclarationName(node))
+                    )],
+                    /*location*/ node
+                )
+            );
+        }
+
+        function getDeclarationName(node: DeclarationStatement) {
+            return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node);
+        }
+
+        function onEmitNode(node: Node, emit: (node: Node) => void): void {
+            if (node.kind === SyntaxKind.SourceFile) {
+                bindingNameExportSpecifiersMap = bindingNameExportSpecifiersForFileMap[getOriginalNodeId(node)];
+                previousOnEmitNode(node, emit);
+                bindingNameExportSpecifiersMap = undefined;
+            }
+            else {
+                previousOnEmitNode(node, emit);
+            }
+        }
+
+        /**
+         * Hooks node substitutions.
+         *
+         * @param node The node to substitute.
+         * @param isExpression A value indicating whether the node is to be used in an expression
+         *                     position.
+         */
+        function onSubstituteNode(node: Node, isExpression: boolean) {
+            node = previousOnSubstituteNode(node, isExpression);
+            if (isExpression) {
+                return substituteExpression(<Expression>node);
+            }
+            else if (isShorthandPropertyAssignment(node)) {
+                return substituteShorthandPropertyAssignment(node);
+            }
+            return node;
+        }
+
+        function substituteShorthandPropertyAssignment(node: ShorthandPropertyAssignment): ObjectLiteralElement {
+            const name = node.name;
+            const exportedOrImportedName = substituteExpressionIdentifier(name);
+            if (exportedOrImportedName !== name) {
+                // A shorthand property with an assignment initializer is probably part of a
+                // destructuring assignment
+                if (node.objectAssignmentInitializer) {
+                    const initializer = createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
+                    return createPropertyAssignment(name, initializer, /*location*/ node);
+                }
+                return createPropertyAssignment(name, exportedOrImportedName, /*location*/ node);
+            }
+            return node;
+        }
+
+        function substituteExpression(node: Expression) {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return substituteExpressionIdentifier(<Identifier>node);
+                case SyntaxKind.BinaryExpression:
+                    return substituteBinaryExpression(<BinaryExpression>node);
+                case SyntaxKind.PostfixUnaryExpression:
+                case SyntaxKind.PrefixUnaryExpression:
+                    return substituteUnaryExpression(<PrefixUnaryExpression | PostfixUnaryExpression>node);
+            }
+
+            return node;
+        }
+
+        function substituteExpressionIdentifier(node: Identifier): Expression {
+            return trySubstituteExportedName(node)
+                || trySubstituteImportedName(node)
+                || node;
+        }
+
+        function substituteBinaryExpression(node: BinaryExpression): Expression {
+            const left = node.left;
+            // If the left-hand-side of the binaryExpression is an identifier and its is export through export Specifier
+            if (isIdentifier(left) && isAssignmentOperator(node.operatorToken.kind)) {
+                if (bindingNameExportSpecifiersMap && hasProperty(bindingNameExportSpecifiersMap, left.text)) {
+                    setNodeEmitFlags(node, NodeEmitFlags.NoSubstitution);
+                    let nestedExportAssignment: BinaryExpression;
+                    for (const specifier of bindingNameExportSpecifiersMap[left.text]) {
+                        nestedExportAssignment = nestedExportAssignment ?
+                            createExportAssignment(specifier.name, nestedExportAssignment) :
+                            createExportAssignment(specifier.name, node);
+                    }
+                    return nestedExportAssignment;
+                }
+            }
+            return node;
+        }
+
+        function substituteUnaryExpression(node: PrefixUnaryExpression | PostfixUnaryExpression): Expression {
+            // Because how the compiler only parse plusplus and minusminus to be either prefixUnaryExpression or postFixUnaryExpression depended on where they are
+            // We don't need to check that the operator has SyntaxKind.plusplus or SyntaxKind.minusminus
+            const operator = node.operator;
+            const operand = node.operand;
+            if (isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) {
+                if (bindingNameExportSpecifiersMap && hasProperty(bindingNameExportSpecifiersMap, operand.text)) {
+                    setNodeEmitFlags(node, NodeEmitFlags.NoSubstitution);
+                    let transformedUnaryExpression: BinaryExpression;
+                    if (node.kind === SyntaxKind.PostfixUnaryExpression) {
+                        transformedUnaryExpression = createBinary(
+                            operand,
+                            createNode(operator === SyntaxKind.PlusPlusToken ? SyntaxKind.PlusEqualsToken : SyntaxKind.MinusEqualsToken),
+                            createLiteral(1),
+                            /*location*/ node
+                        );
+                        // We have to set no substitution flag here to prevent visit the binary expression and substitute it again as we will preform all necessary substitution in here
+                        setNodeEmitFlags(transformedUnaryExpression, NodeEmitFlags.NoSubstitution);
+                    }
+                    let nestedExportAssignment: BinaryExpression;
+                    for (const specifier of bindingNameExportSpecifiersMap[operand.text]) {
+                        nestedExportAssignment = nestedExportAssignment ?
+                            createExportAssignment(specifier.name, nestedExportAssignment) :
+                            createExportAssignment(specifier.name, transformedUnaryExpression || node);
+                    }
+                    return nestedExportAssignment;
+                }
+            }
+            return node;
+        }
+
+        function trySubstituteExportedName(node: Identifier) {
+            const emitFlags = getNodeEmitFlags(node);
+            if ((emitFlags & NodeEmitFlags.LocalName) === 0) {
+                const container = resolver.getReferencedExportContainer(node, (emitFlags & NodeEmitFlags.ExportName) !== 0);
+                if (container) {
+                    if (container.kind === SyntaxKind.SourceFile) {
+                        return createPropertyAccess(
+                            createIdentifier("exports"),
+                            getSynthesizedClone(node),
+                            /*location*/ node
+                        );
+                    }
+                }
+            }
+
+            return undefined;
+        }
+
+        function trySubstituteImportedName(node: Identifier): Expression {
+            if ((getNodeEmitFlags(node) & NodeEmitFlags.LocalName) === 0) {
+                const declaration = resolver.getReferencedImportDeclaration(node);
+                if (declaration) {
+                    if (isImportClause(declaration)) {
+                        if (languageVersion >= ScriptTarget.ES5) {
+                            return createPropertyAccess(
+                                getGeneratedNameForNode(declaration.parent),
+                                createIdentifier("default"),
+                                /*location*/ node
+                            );
+                        }
+                        else {
+                            // TODO: ES3 transform to handle x.default -> x["default"]
+                            return createElementAccess(
+                                getGeneratedNameForNode(declaration.parent),
+                                createLiteral("default"),
+                                /*location*/ node
+                            );
+                        }
+                    }
+                    else if (isImportSpecifier(declaration)) {
+                        const name = declaration.propertyName || declaration.name;
+                        if (name.originalKeywordKind === SyntaxKind.DefaultKeyword && languageVersion <= ScriptTarget.ES3) {
+                            // TODO: ES3 transform to handle x.default -> x["default"]
+                            return createElementAccess(
+                                getGeneratedNameForNode(declaration.parent.parent.parent),
+                                createLiteral(name.text),
+                                /*location*/ node
+                            );
+                        }
+                        else {
+                            return createPropertyAccess(
+                                getGeneratedNameForNode(declaration.parent.parent.parent),
+                                getSynthesizedClone(name),
+                                /*location*/ node
+                            );
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+
+        function getModuleMemberName(name: Identifier) {
+            return createPropertyAccess(
+                createIdentifier("exports"),
+                name,
+                /*location*/ name
+            );
+        }
+
+        function createRequireCall(importNode: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration) {
+            const moduleName = getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            const args: Expression[] = [];
+            if (isDefined(moduleName)) {
+                args.push(moduleName);
+            }
+
+            return createCall(createIdentifier("require"), /*typeArguments*/ undefined, args);
+        }
+
+        function createExportStatement(name: Identifier, value: Expression, location?: TextRange) {
+            const statement = createStatement(createExportAssignment(name, value));
+            statement.startsOnNewLine = true;
+            if (location) {
+                setSourceMapRange(statement, location);
+            }
+
+            return statement;
+        }
+
+        function createExportAssignment(name: Identifier, value: Expression) {
+            return createAssignment(
+                name.originalKeywordKind === SyntaxKind.DefaultKeyword && languageVersion === ScriptTarget.ES3
+                    ? createElementAccess(
+                        createIdentifier("exports"),
+                        createLiteral(name.text)
+                    )
+                    : createPropertyAccess(
+                        createIdentifier("exports"),
+                        getSynthesizedClone(name)
+                    ),
+                value
+            );
+        }
+
+        interface AsynchronousDependencies {
+            aliasedModuleNames: Expression[];
+            unaliasedModuleNames: Expression[];
+            importAliasNames: ParameterDeclaration[];
+        }
+
+        function collectAsynchronousDependencies(node: SourceFile, includeNonAmdDependencies: boolean): AsynchronousDependencies {
+            // names of modules with corresponding parameter in the factory function
+            const aliasedModuleNames: Expression[] = [];
+
+            // names of modules with no corresponding parameters in factory function
+            const unaliasedModuleNames: Expression[] = [];
+
+            // names of the parameters in the factory function; these
+            // parameters need to match the indexes of the corresponding
+            // module names in aliasedModuleNames.
+            const importAliasNames: ParameterDeclaration[] = [];
+
+            // Fill in amd-dependency tags
+            for (const amdDependency of node.amdDependencies) {
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(createLiteral(amdDependency.path));
+                    importAliasNames.push(createParameter(amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(createLiteral(amdDependency.path));
+                }
+            }
+
+            for (const importNode of externalImports) {
+                // Find the name of the external module
+                const externalModuleName = getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+
+                // Find the name of the module alias, if there is one
+                const importAliasName = getLocalNameForExternalImport(importNode, currentSourceFile);
+                if (includeNonAmdDependencies && importAliasName) {
+                    // Set emitFlags on the name of the classDeclaration
+                    // This is so that when printer will not substitute the identifier
+                    setNodeEmitFlags(importAliasName, NodeEmitFlags.NoSubstitution);
+                    aliasedModuleNames.push(externalModuleName);
+                    importAliasNames.push(createParameter(importAliasName));
+                }
+                else {
+                    unaliasedModuleNames.push(externalModuleName);
+                }
+            }
+
+            return { aliasedModuleNames, unaliasedModuleNames, importAliasNames };
+        }
+
+        function updateSourceFile(node: SourceFile, statements: Statement[]) {
+            const updated = getMutableClone(node);
+            updated.statements = createNodeArray(statements, node.statements);
+            return updated;
+        }
+    }
+}
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
new file mode 100644
index 00000000000..d303dd580ef
--- /dev/null
+++ b/src/compiler/transformers/module/system.ts
@@ -0,0 +1,1399 @@
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    export function transformSystemModule(context: TransformationContext) {
+        interface DependencyGroup {
+            name: StringLiteral;
+            externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
+        }
+
+        const {
+            getNodeEmitFlags,
+            setNodeEmitFlags,
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            hoistVariableDeclaration,
+            hoistFunctionDeclaration,
+        } = context;
+
+        const compilerOptions = context.getCompilerOptions();
+        const resolver = context.getEmitResolver();
+        const host = context.getEmitHost();
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const previousOnSubstituteNode = context.onSubstituteNode;
+        const previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(SyntaxKind.Identifier);
+        context.enableSubstitution(SyntaxKind.BinaryExpression);
+        context.enableSubstitution(SyntaxKind.PrefixUnaryExpression);
+        context.enableSubstitution(SyntaxKind.PostfixUnaryExpression);
+        context.enableEmitNotification(SyntaxKind.SourceFile);
+
+        const exportFunctionForFileMap: Identifier[] = [];
+        let currentSourceFile: SourceFile;
+        let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
+        let exportSpecifiers: Map<ExportSpecifier[]>;
+        let exportEquals: ExportAssignment;
+        let hasExportStarsToExportValues: boolean;
+        let exportFunctionForFile: Identifier;
+        let contextObjectForFile: Identifier;
+        let exportedLocalNames: Identifier[];
+        let exportedFunctionDeclarations: ExpressionStatement[];
+
+        let enclosingBlockScopedContainer: Node;
+        let currentParent: Node;
+        let currentNode: Node;
+
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            if (isExternalModule(node) || compilerOptions.isolatedModules) {
+                currentSourceFile = node;
+                currentNode = node;
+
+                // Perform the transformation.
+                const updated = transformSystemModuleWorker(node);
+                aggregateTransformFlags(updated);
+
+                currentSourceFile = undefined;
+                externalImports = undefined;
+                exportSpecifiers = undefined;
+                exportEquals = undefined;
+                hasExportStarsToExportValues = false;
+                exportFunctionForFile = undefined;
+                contextObjectForFile = undefined;
+                exportedLocalNames = undefined;
+                exportedFunctionDeclarations = undefined;
+                return updated;
+            }
+
+            return node;
+        }
+
+        function transformSystemModuleWorker(node: SourceFile) {
+            // System modules have the following shape:
+            //
+            //     System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
+            //
+            // The parameter 'exports' here is a callback '<T>(name: string, value: T) => T' that
+            // is used to publish exported values. 'exports' returns its 'value' argument so in
+            // most cases expressions that mutate exported values can be rewritten as:
+            //
+            //     expr -> exports('name', expr)
+            //
+            // The only exception in this rule is postfix unary operators,
+            // see comment to 'substitutePostfixUnaryExpression' for more details
+            Debug.assert(!exportFunctionForFile);
+
+            // Collect information about the external module and dependency groups.
+            ({ externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues } = collectExternalModuleInfo(node, resolver));
+
+            // Make sure that the name of the 'exports' function does not conflict with
+            // existing identifiers.
+            exportFunctionForFile = createUniqueName("exports");
+            contextObjectForFile = createUniqueName("context");
+
+            exportFunctionForFileMap[getOriginalNodeId(node)] = exportFunctionForFile;
+
+            const dependencyGroups = collectDependencyGroups(externalImports);
+
+            const statements: Statement[] = [];
+
+            // Add the body of the module.
+            addSystemModuleBody(statements, node, dependencyGroups);
+
+            const moduleName = tryGetModuleNameFromFile(node, host, compilerOptions);
+            const dependencies = createArrayLiteral(map(dependencyGroups, getNameOfDependencyGroup));
+            const body = createFunctionExpression(
+                /*asteriskToken*/ undefined,
+                /*name*/ undefined,
+                /*typeParameters*/ undefined,
+                [
+                    createParameter(exportFunctionForFile),
+                    createParameter(contextObjectForFile)
+                ],
+                /*type*/ undefined,
+                setNodeEmitFlags(
+                    createBlock(statements, /*location*/ undefined, /*multiLine*/ true),
+                    NodeEmitFlags.EmitEmitHelpers
+                )
+            );
+
+            // Write the call to `System.register`
+            // Clear the emit-helpers flag for later passes since we'll have already used it in the module body
+            // So the helper will be emit at the correct position instead of at the top of the source-file
+            return updateSourceFile(node, [
+                createStatement(
+                    createCall(
+                        createPropertyAccess(createIdentifier("System"), "register"),
+                        /*typeArguments*/ undefined,
+                        moduleName
+                            ? [moduleName, dependencies, body]
+                            : [dependencies, body]
+                    )
+                )
+            ], /*nodeEmitFlags*/ ~NodeEmitFlags.EmitEmitHelpers & getNodeEmitFlags(node));
+        }
+
+        /**
+         * Adds the statements for the module body function for the source file.
+         *
+         * @param statements The output statements for the module body.
+         * @param node The source file for the module.
+         * @param statementOffset The offset at which to begin visiting the statements of the SourceFile.
+         */
+        function addSystemModuleBody(statements: Statement[], node: SourceFile, dependencyGroups: DependencyGroup[]) {
+            // Shape of the body in system modules:
+            //
+            //  function (exports) {
+            //      <list of local aliases for imports>
+            //      <hoisted variable declarations>
+            //      <hoisted function declarations>
+            //      return {
+            //          setters: [
+            //              <list of setter function for imports>
+            //          ],
+            //          execute: function() {
+            //              <module statements>
+            //          }
+            //      }
+            //      <temp declarations>
+            //  }
+            //
+            // i.e:
+            //
+            //   import {x} from 'file1'
+            //   var y = 1;
+            //   export function foo() { return y + x(); }
+            //   console.log(y);
+            //
+            // Will be transformed to:
+            //
+            //  function(exports) {
+            //      var file_1; // local alias
+            //      var y;
+            //      function foo() { return y + file_1.x(); }
+            //      exports("foo", foo);
+            //      return {
+            //          setters: [
+            //              function(v) { file_1 = v }
+            //          ],
+            //          execute(): function() {
+            //              y = 1;
+            //              console.log(y);
+            //          }
+            //      };
+            //  }
+
+            // We start a new lexical environment in this function body, but *not* in the
+            // body of the execute function. This allows us to emit temporary declarations
+            // only in the outer module body and not in the inner one.
+            startLexicalEnvironment();
+
+            // Add any prologue directives.
+            const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitSourceElement);
+
+            // var __moduleName = context_1 && context_1.id;
+            statements.push(
+                createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            "__moduleName",
+                            /*type*/ undefined,
+                            createLogicalAnd(
+                                contextObjectForFile,
+                                createPropertyAccess(contextObjectForFile, "id")
+                            )
+                        )
+                    ])
+                )
+            );
+
+            // Visit the statements of the source file, emitting any transformations into
+            // the `executeStatements` array. We do this *before* we fill the `setters` array
+            // as we both emit transformations as well as aggregate some data used when creating
+            // setters. This allows us to reduce the number of times we need to loop through the
+            // statements of the source file.
+            const executeStatements = visitNodes(node.statements, visitSourceElement, isStatement, statementOffset);
+
+            // We emit the lexical environment (hoisted variables and function declarations)
+            // early to align roughly with our previous emit output.
+            // Two key differences in this approach are:
+            // - Temporary variables will appear at the top rather than at the bottom of the file
+            // - Calls to the exporter for exported function declarations are grouped after
+            //   the declarations.
+            addRange(statements, endLexicalEnvironment());
+
+            // Emit early exports for function declarations.
+            addRange(statements, exportedFunctionDeclarations);
+
+            const exportStarFunction = addExportStarIfNeeded(statements);
+
+            statements.push(
+                createReturn(
+                    setMultiLine(
+                        createObjectLiteral([
+                            createPropertyAssignment("setters",
+                                generateSetters(exportStarFunction, dependencyGroups)
+                            ),
+                            createPropertyAssignment("execute",
+                                createFunctionExpression(
+                                    /*asteriskToken*/ undefined,
+                                    /*name*/ undefined,
+                                    /*typeParameters*/ undefined,
+                                    /*parameters*/ [],
+                                    /*type*/ undefined,
+                                    createBlock(
+                                        executeStatements,
+                                        /*location*/ undefined,
+                                        /*multiLine*/ true
+                                    )
+                                )
+                            )
+                        ]),
+                        /*multiLine*/ true
+                    )
+                )
+            );
+        }
+
+        function addExportStarIfNeeded(statements: Statement[]) {
+            if (!hasExportStarsToExportValues) {
+                return;
+            }
+            // when resolving exports local exported entries/indirect exported entries in the module
+            // should always win over entries with similar names that were added via star exports
+            // to support this we store names of local/indirect exported entries in a set.
+            // this set is used to filter names brought by star expors.
+
+            // local names set should only be added if we have anything exported
+            if (!exportedLocalNames && isEmpty(exportSpecifiers)) {
+                // no exported declarations (export var ...) or export specifiers (export {x})
+                // check if we have any non star export declarations.
+                let hasExportDeclarationWithExportClause = false;
+                for (const externalImport of externalImports) {
+                    if (externalImport.kind === SyntaxKind.ExportDeclaration && (<ExportDeclaration>externalImport).exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+
+                if (!hasExportDeclarationWithExportClause) {
+                    // we still need to emit exportStar helper
+                    return addExportStarFunction(statements, /*localNames*/ undefined);
+                }
+            }
+
+            const exportedNames: ObjectLiteralElement[] = [];
+            if (exportedLocalNames) {
+                for (const exportedLocalName of exportedLocalNames) {
+                    // write name of exported declaration, i.e 'export var x...'
+                    exportedNames.push(
+                        createPropertyAssignment(
+                            createLiteral(exportedLocalName.text),
+                            createLiteral(true)
+                        )
+                    );
+                }
+            }
+
+            for (const externalImport of externalImports) {
+                if (externalImport.kind !== SyntaxKind.ExportDeclaration) {
+                    continue;
+                }
+
+                const exportDecl = <ExportDeclaration>externalImport;
+                if (!exportDecl.exportClause) {
+                    // export * from ...
+                    continue;
+                }
+
+                for (const element of exportDecl.exportClause.elements) {
+                    // write name of indirectly exported entry, i.e. 'export {x} from ...'
+                    exportedNames.push(
+                        createPropertyAssignment(
+                            createLiteral((element.name || element.propertyName).text),
+                            createLiteral(true)
+                        )
+                    );
+                }
+            }
+
+            const exportedNamesStorageRef = createUniqueName("exportedNames");
+            statements.push(
+                createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            exportedNamesStorageRef,
+                            /*type*/ undefined,
+                            createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true)
+                        )
+                    ])
+                )
+            );
+
+            return addExportStarFunction(statements, exportedNamesStorageRef);
+        }
+
+        /**
+         * Emits a setter callback for each dependency group.
+         * @param write The callback used to write each callback.
+         */
+        function generateSetters(exportStarFunction: Identifier, dependencyGroups: DependencyGroup[]) {
+            const setters: Expression[] = [];
+            for (const group of dependencyGroups) {
+                // derive a unique name for parameter from the first named entry in the group
+                const localName = forEach(group.externalImports, i => getLocalNameForExternalImport(i, currentSourceFile));
+                const parameterName = localName ? getGeneratedNameForNode(localName) : createUniqueName("");
+                const statements: Statement[] = [];
+                for (const entry of group.externalImports) {
+                    const importVariableName = getLocalNameForExternalImport(entry, currentSourceFile);
+                    switch (entry.kind) {
+                        case SyntaxKind.ImportDeclaration:
+                            if (!(<ImportDeclaration>entry).importClause) {
+                                // 'import "..."' case
+                                // module is imported only for side-effects, no emit required
+                                break;
+                            }
+
+                        // fall-through
+                        case SyntaxKind.ImportEqualsDeclaration:
+                            Debug.assert(importVariableName !== undefined);
+                            // save import into the local
+                            statements.push(
+                                createStatement(
+                                    createAssignment(importVariableName, parameterName)
+                                )
+                            );
+                            break;
+
+                        case SyntaxKind.ExportDeclaration:
+                            Debug.assert(importVariableName !== undefined);
+                            if ((<ExportDeclaration>entry).exportClause) {
+                                //  export {a, b as c} from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exports_({
+                                //     "a": _["a"],
+                                //     "c": _["b"]
+                                //  });
+                                const properties: PropertyAssignment[] = [];
+                                for (const e of (<ExportDeclaration>entry).exportClause.elements) {
+                                    properties.push(
+                                        createPropertyAssignment(
+                                            createLiteral(e.name.text),
+                                            createElementAccess(
+                                                parameterName,
+                                                createLiteral((e.propertyName || e.name).text)
+                                            )
+                                        )
+                                    );
+                                }
+
+                                statements.push(
+                                    createStatement(
+                                        createCall(
+                                            exportFunctionForFile,
+                                            /*typeArguments*/ undefined,
+                                            [createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)]
+                                        )
+                                    )
+                                );
+                            }
+                            else {
+                                //  export * from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exportStar(foo_1_1);
+                                statements.push(
+                                    createStatement(
+                                        createCall(
+                                            exportStarFunction,
+                                            /*typeArguments*/ undefined,
+                                            [parameterName]
+                                        )
+                                    )
+                                );
+                            }
+                            break;
+                    }
+                }
+
+                setters.push(
+                    createFunctionExpression(
+                        /*asteriskToken*/ undefined,
+                        /*name*/ undefined,
+                        /*typeParameters*/ undefined,
+                        [createParameter(parameterName)],
+                        /*type*/ undefined,
+                        createBlock(statements, /*location*/ undefined, /*multiLine*/ true)
+                    )
+                );
+            }
+
+            return createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
+        }
+
+        function visitSourceElement(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ImportDeclaration:
+                    return visitImportDeclaration(<ImportDeclaration>node);
+
+                case SyntaxKind.ImportEqualsDeclaration:
+                    return visitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+
+                case SyntaxKind.ExportDeclaration:
+                    return visitExportDeclaration(<ExportDeclaration>node);
+
+                case SyntaxKind.ExportAssignment:
+                    return visitExportAssignment(<ExportAssignment>node);
+
+                default:
+                    return visitNestedNode(node);
+            }
+        }
+
+        function visitNestedNode(node: Node): VisitResult<Node> {
+            const savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            const savedCurrentParent = currentParent;
+            const savedCurrentNode = currentNode;
+
+            const currentGrandparent = currentParent;
+            currentParent = currentNode;
+            currentNode = node;
+
+            if (currentParent && isBlockScope(currentParent, currentGrandparent)) {
+                enclosingBlockScopedContainer = currentParent;
+            }
+
+            const result = visitNestedNodeWorker(node);
+
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            currentParent = savedCurrentParent;
+            currentNode = savedCurrentNode;
+
+            return result;
+        }
+
+        function visitNestedNodeWorker(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.VariableStatement:
+                    return visitVariableStatement(<VariableStatement>node);
+
+                case SyntaxKind.FunctionDeclaration:
+                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+
+                case SyntaxKind.ClassDeclaration:
+                    return visitClassDeclaration(<ClassDeclaration>node);
+
+                case SyntaxKind.ForStatement:
+                    return visitForStatement(<ForStatement>node);
+
+                case SyntaxKind.ForInStatement:
+                    return visitForInStatement(<ForInStatement>node);
+
+                case SyntaxKind.ForOfStatement:
+                    return visitForOfStatement(<ForOfStatement>node);
+
+                case SyntaxKind.DoStatement:
+                    return visitDoStatement(<DoStatement>node);
+
+                case SyntaxKind.WhileStatement:
+                    return visitWhileStatement(<WhileStatement>node);
+
+                case SyntaxKind.LabeledStatement:
+                    return visitLabeledStatement(<LabeledStatement>node);
+
+                case SyntaxKind.WithStatement:
+                    return visitWithStatement(<WithStatement>node);
+
+                case SyntaxKind.SwitchStatement:
+                    return visitSwitchStatement(<SwitchStatement>node);
+
+                case SyntaxKind.CaseBlock:
+                    return visitCaseBlock(<CaseBlock>node);
+
+                case SyntaxKind.CaseClause:
+                    return visitCaseClause(<CaseClause>node);
+
+                case SyntaxKind.DefaultClause:
+                    return visitDefaultClause(<DefaultClause>node);
+
+                case SyntaxKind.TryStatement:
+                    return visitTryStatement(<TryStatement>node);
+
+                case SyntaxKind.CatchClause:
+                    return visitCatchClause(<CatchClause>node);
+
+                case SyntaxKind.Block:
+                    return visitBlock(<Block>node);
+
+                case SyntaxKind.ExpressionStatement:
+                    return visitExpressionStatement(<ExpressionStatement>node);
+
+                default:
+                    return node;
+            }
+        }
+
+        function visitImportDeclaration(node: ImportDeclaration): Node {
+            if (node.importClause && contains(externalImports, node)) {
+                hoistVariableDeclaration(getLocalNameForExternalImport(node, currentSourceFile));
+            }
+
+            return undefined;
+        }
+
+        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): Node {
+            if (contains(externalImports, node)) {
+                hoistVariableDeclaration(getLocalNameForExternalImport(node, currentSourceFile));
+            }
+
+            // NOTE(rbuckton): Do we support export import = require('') in System?
+            return undefined;
+        }
+
+        function visitExportDeclaration(node: ExportDeclaration): VisitResult<Statement> {
+            if (!node.moduleSpecifier) {
+                const statements: Statement[] = [];
+                addRange(statements, map(node.exportClause.elements, visitExportSpecifier));
+                return statements;
+            }
+
+            return undefined;
+        }
+
+        function visitExportSpecifier(specifier: ExportSpecifier): Statement {
+            if (resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name)
+                || resolver.isValueAliasDeclaration(specifier)) {
+                recordExportName(specifier.name);
+                return createExportStatement(
+                    specifier.name,
+                    specifier.propertyName || specifier.name
+                );
+            }
+            return undefined;
+        }
+
+        function visitExportAssignment(node: ExportAssignment): Statement {
+            if (!node.isExportEquals) {
+                if (nodeIsSynthesized(node) || resolver.isValueAliasDeclaration(node)) {
+                    return createExportStatement(
+                        createLiteral("default"),
+                        node.expression
+                    );
+                }
+            }
+
+            return undefined;
+        }
+
+        /**
+         * Visits a variable statement, hoisting declared names to the top-level module body.
+         * Each declaration is rewritten into an assignment expression.
+         *
+         * @param node The variable statement to visit.
+         */
+        function visitVariableStatement(node: VariableStatement): VisitResult<Statement> {
+            // hoist only non-block scoped declarations or block scoped declarations parented by source file
+            const shouldHoist =
+                ((getCombinedNodeFlags(getOriginalNode(node.declarationList)) & NodeFlags.BlockScoped) == 0) ||
+                enclosingBlockScopedContainer.kind === SyntaxKind.SourceFile;
+            if (!shouldHoist) {
+                return node;
+            }
+            const isExported = hasModifier(node, ModifierFlags.Export);
+            const expressions: Expression[] = [];
+            for (const variable of node.declarationList.declarations) {
+                const visited = <Expression>transformVariable(variable, isExported);
+                if (visited) {
+                    expressions.push(visited);
+                }
+            }
+
+            if (expressions.length) {
+                return createStatement(inlineExpressions(expressions), node);
+            }
+
+            return undefined;
+        }
+
+        /**
+         * Transforms a VariableDeclaration into one or more assignment expressions.
+         *
+         * @param node The VariableDeclaration to transform.
+         * @param isExported A value used to indicate whether the containing statement was exported.
+         */
+        function transformVariable(node: VariableDeclaration, isExported: boolean): VariableDeclaration | Expression {
+            // Hoist any bound names within the declaration.
+            hoistBindingElement(node, isExported);
+
+            if (!node.initializer) {
+                // If the variable has no initializer, ignore it.
+                return;
+            }
+
+            const name = node.name;
+            if (isIdentifier(name)) {
+                // If the variable has an IdentifierName, write out an assignment expression in its place.
+                return createAssignment(name, node.initializer);
+            }
+            else {
+                // If the variable has a BindingPattern, flatten the variable into multiple assignment expressions.
+                return flattenVariableDestructuringToExpression(context, node, hoistVariableDeclaration);
+            }
+        }
+
+        /**
+         * Visits a FunctionDeclaration, hoisting it to the outer module body function.
+         *
+         * @param node The function declaration to visit.
+         */
+        function visitFunctionDeclaration(node: FunctionDeclaration): Node {
+            if (hasModifier(node, ModifierFlags.Export)) {
+                // If the function is exported, ensure it has a name and rewrite the function without any export flags.
+                const name = node.name || getGeneratedNameForNode(node);
+                const newNode = createFunctionDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    node.asteriskToken,
+                    name,
+                    /*typeParameters*/ undefined,
+                    node.parameters,
+                    /*type*/ undefined,
+                    node.body,
+                    /*location*/ node);
+
+                // Record a declaration export in the outer module body function.
+                recordExportedFunctionDeclaration(node);
+
+                if (!hasModifier(node, ModifierFlags.Default)) {
+                    recordExportName(name);
+                }
+
+                setOriginalNode(newNode, node);
+                node = newNode;
+            }
+
+            // Hoist the function declaration to the outer module body function.
+            hoistFunctionDeclaration(node);
+            return undefined;
+        }
+
+        function visitExpressionStatement(node: ExpressionStatement): VisitResult<Statement> {
+            const originalNode = getOriginalNode(node);
+            if ((originalNode.kind === SyntaxKind.ModuleDeclaration || originalNode.kind === SyntaxKind.EnumDeclaration) && hasModifier(originalNode, ModifierFlags.Export)) {
+                const name = getDeclarationName(<ModuleDeclaration | EnumDeclaration>originalNode);
+                // We only need to hoistVariableDeclaration for EnumDeclaration
+                // as ModuleDeclaration is already hoisted when the transformer call visitVariableStatement
+                // which then call transformsVariable for each declaration in declarationList
+                if (originalNode.kind === SyntaxKind.EnumDeclaration) {
+                    hoistVariableDeclaration(name);
+                }
+                return [
+                    node,
+                    createExportStatement(name, name)
+                ];
+            }
+            return node;
+        }
+
+        /**
+         * Visits a ClassDeclaration, hoisting its name to the outer module body function.
+         *
+         * @param node The class declaration to visit.
+         */
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
+            // Hoist the name of the class declaration to the outer module body function.
+            const name = getDeclarationName(node);
+            hoistVariableDeclaration(name);
+
+            const statements: Statement[] = [];
+
+            // Rewrite the class declaration into an assignment of a class expression.
+            statements.push(
+                createStatement(
+                    createAssignment(
+                        name,
+                        createClassExpression(
+                            /*modifiers*/ undefined,
+                            node.name,
+                            /*typeParameters*/ undefined,
+                            node.heritageClauses,
+                            node.members,
+                            /*location*/ node
+                        )
+                    ),
+                    /*location*/ node
+                )
+            );
+
+            // If the class was exported, write a declaration export to the inner module body function.
+            if (hasModifier(node, ModifierFlags.Export)) {
+                if (!hasModifier(node, ModifierFlags.Default)) {
+                    recordExportName(name);
+                }
+
+                statements.push(createDeclarationExport(node));
+            }
+
+            return statements;
+        }
+
+        function shouldHoistLoopInitializer(node: VariableDeclarationList | Expression) {
+            return isVariableDeclarationList(node) && (getCombinedNodeFlags(node) & NodeFlags.BlockScoped) === 0;
+        }
+
+        /**
+         * Visits the body of a ForStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitForStatement(node: ForStatement): ForStatement {
+            const initializer = node.initializer;
+            if (shouldHoistLoopInitializer(initializer)) {
+                const expressions: Expression[] = [];
+                for (const variable of (<VariableDeclarationList>initializer).declarations) {
+                    const visited = <Expression>transformVariable(variable, /*isExported*/ false);
+                    if (visited) {
+                        expressions.push(visited);
+                    }
+                };
+
+                return createFor(
+                    expressions.length
+                        ? inlineExpressions(expressions)
+                        : <OmittedExpression>createSynthesizedNode(SyntaxKind.OmittedExpression),
+                    node.condition,
+                    node.incrementor,
+                    visitNode(node.statement, visitNestedNode, isStatement),
+                    /*location*/ node
+                );
+            }
+            else {
+                return visitEachChild(node, visitNestedNode, context);
+            }
+        }
+
+        /**
+         * Transforms and hoists the declaration list of a ForInStatement or ForOfStatement into an expression.
+         *
+         * @param node The decalaration list to transform.
+         */
+        function transformForBinding(node: VariableDeclarationList): Expression {
+            const firstDeclaration = firstOrUndefined(node.declarations);
+            hoistBindingElement(firstDeclaration, /*isExported*/ false);
+
+            const name = firstDeclaration.name;
+            return isIdentifier(name)
+                ? name
+                : flattenVariableDestructuringToExpression(context, firstDeclaration, hoistVariableDeclaration);
+        }
+
+        /**
+         * Visits the body of a ForInStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitForInStatement(node: ForInStatement): ForInStatement {
+            const initializer = node.initializer;
+            if (shouldHoistLoopInitializer(initializer)) {
+                const updated = getMutableClone(node);
+                updated.initializer = transformForBinding(<VariableDeclarationList>initializer);
+                updated.statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
+                return updated;
+            }
+            else {
+                return visitEachChild(node, visitNestedNode, context);
+            }
+        }
+
+        /**
+         * Visits the body of a ForOfStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitForOfStatement(node: ForOfStatement): ForOfStatement {
+            const initializer = node.initializer;
+            if (shouldHoistLoopInitializer(initializer)) {
+                const updated = getMutableClone(node);
+                updated.initializer = transformForBinding(<VariableDeclarationList>initializer);
+                updated.statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
+                return updated;
+            }
+            else {
+                return visitEachChild(node, visitNestedNode, context);
+            }
+        }
+
+        /**
+         * Visits the body of a DoStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitDoStatement(node: DoStatement) {
+            const statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
+            if (statement !== node.statement) {
+                const updated = getMutableClone(node);
+                updated.statement = statement;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a WhileStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitWhileStatement(node: WhileStatement) {
+            const statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
+            if (statement !== node.statement) {
+                const updated = getMutableClone(node);
+                updated.statement = statement;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a LabeledStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitLabeledStatement(node: LabeledStatement) {
+            const statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
+            if (statement !== node.statement) {
+                const updated = getMutableClone(node);
+                updated.statement = statement;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a WithStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitWithStatement(node: WithStatement) {
+            const statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
+            if (statement !== node.statement) {
+                const updated = getMutableClone(node);
+                updated.statement = statement;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a SwitchStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitSwitchStatement(node: SwitchStatement) {
+            const caseBlock = visitNode(node.caseBlock, visitNestedNode, isCaseBlock);
+            if (caseBlock !== node.caseBlock) {
+                const updated = getMutableClone(node);
+                updated.caseBlock = caseBlock;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a CaseBlock to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseBlock(node: CaseBlock) {
+            const clauses = visitNodes(node.clauses, visitNestedNode, isCaseOrDefaultClause);
+            if (clauses !== node.clauses) {
+                const updated = getMutableClone(node);
+                updated.clauses = clauses;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a CaseClause to hoist declarations.
+         *
+         * @param node The clause to visit.
+         */
+        function visitCaseClause(node: CaseClause) {
+            const statements = visitNodes(node.statements, visitNestedNode, isStatement);
+            if (statements !== node.statements) {
+                const updated = getMutableClone(node);
+                updated.statements = statements;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a DefaultClause to hoist declarations.
+         *
+         * @param node The clause to visit.
+         */
+        function visitDefaultClause(node: DefaultClause) {
+            return visitEachChild(node, visitNestedNode, context);
+        }
+
+        /**
+         * Visits the body of a TryStatement to hoist declarations.
+         *
+         * @param node The statement to visit.
+         */
+        function visitTryStatement(node: TryStatement) {
+            return visitEachChild(node, visitNestedNode, context);
+        }
+
+        /**
+         * Visits the body of a CatchClause to hoist declarations.
+         *
+         * @param node The clause to visit.
+         */
+        function visitCatchClause(node: CatchClause) {
+            const block = visitNode(node.block, visitNestedNode, isBlock);
+            if (block !== node.block) {
+                const updated = getMutableClone(node);
+                updated.block = block;
+                return updated;
+            }
+            return node;
+        }
+
+        /**
+         * Visits the body of a Block to hoist declarations.
+         *
+         * @param node The block to visit.
+         */
+        function visitBlock(node: Block) {
+            return visitEachChild(node, visitNestedNode, context);
+        }
+
+        //
+        // Substitutions
+        //
+
+        function onEmitNode(node: Node, emit: (node: Node) => void): void {
+            if (node.kind === SyntaxKind.SourceFile) {
+                exportFunctionForFile = exportFunctionForFileMap[getOriginalNodeId(node)];
+                previousOnEmitNode(node, emit);
+                exportFunctionForFile = undefined;
+            }
+            else {
+                previousOnEmitNode(node, emit);
+            }
+        }
+
+        /**
+         * Hooks node substitutions.
+         *
+         * @param node The node to substitute.
+         * @param isExpression A value indicating whether the node is to be used in an expression
+         *                     position.
+         */
+        function onSubstituteNode(node: Node, isExpression: boolean) {
+            node = previousOnSubstituteNode(node, isExpression);
+            if (isExpression) {
+                return substituteExpression(<Expression>node);
+            }
+
+            return node;
+        }
+
+        /**
+         * Substitute the expression, if necessary.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node: Expression) {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return substituteExpressionIdentifier(<Identifier>node);
+                case SyntaxKind.BinaryExpression:
+                    return substituteBinaryExpression(<BinaryExpression>node);
+                case SyntaxKind.PrefixUnaryExpression:
+                case SyntaxKind.PostfixUnaryExpression:
+                    return substituteUnaryExpression(<PrefixUnaryExpression | PostfixUnaryExpression>node);
+            }
+            return node;
+        }
+
+        /**
+         * Substitution for identifiers exported at the top level of a module.
+         */
+        function substituteExpressionIdentifier(node: Identifier): Expression {
+            const importDeclaration = resolver.getReferencedImportDeclaration(node);
+            if (importDeclaration) {
+                const importBinding = createImportBinding(importDeclaration);
+                if (importBinding) {
+                    return importBinding;
+                }
+            }
+
+            return node;
+        }
+
+        function substituteBinaryExpression(node: BinaryExpression): Expression {
+            if (isAssignmentOperator(node.operatorToken.kind)) {
+                return substituteAssignmentExpression(node);
+            }
+
+            return node;
+        }
+
+        function substituteAssignmentExpression(node: BinaryExpression): Expression {
+            setNodeEmitFlags(node, NodeEmitFlags.NoSubstitution);
+
+            const left = node.left;
+            switch (left.kind) {
+                case SyntaxKind.Identifier:
+                    const exportDeclaration = resolver.getReferencedExportContainer(<Identifier>left);
+                    if (exportDeclaration) {
+                        return createExportExpression(<Identifier>left, node);
+                    }
+                    break;
+
+                case SyntaxKind.ObjectLiteralExpression:
+                case SyntaxKind.ArrayLiteralExpression:
+                    if (hasExportedReferenceInDestructuringPattern(<ObjectLiteralExpression | ArrayLiteralExpression>left)) {
+                        return substituteDestructuring(node);
+                    }
+                    break;
+            }
+
+            return node;
+        }
+
+        function isExportedBinding(name: Identifier) {
+            const container = resolver.getReferencedExportContainer(name);
+            return container && container.kind === SyntaxKind.SourceFile;
+        }
+
+        function hasExportedReferenceInDestructuringPattern(node: ObjectLiteralExpression | ArrayLiteralExpression | Identifier): boolean {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return isExportedBinding(<Identifier>node);
+
+                case SyntaxKind.ObjectLiteralExpression:
+                    for (const property of (<ObjectLiteralExpression>node).properties) {
+                        if (hasExportedReferenceInObjectDestructuringElement(property)) {
+                            return true;
+                        }
+                    }
+
+                    break;
+
+                case SyntaxKind.ArrayLiteralExpression:
+                    for (const element of (<ArrayLiteralExpression>node).elements) {
+                        if (hasExportedReferenceInArrayDestructuringElement(element)) {
+                            return true;
+                        }
+                    }
+
+                    break;
+            }
+
+            return false;
+        }
+
+        function hasExportedReferenceInObjectDestructuringElement(node: ObjectLiteralElement): boolean {
+            if (isShorthandPropertyAssignment(node)) {
+                return isExportedBinding(node.name);
+            }
+            else if (isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringElement(node.initializer);
+            }
+            else {
+                return false;
+            }
+        }
+
+        function hasExportedReferenceInArrayDestructuringElement(node: Expression): boolean {
+            if (isSpreadElementExpression(node)) {
+                const expression = node.expression;
+                return isIdentifier(expression) && isExportedBinding(expression);
+            }
+            else {
+                return hasExportedReferenceInDestructuringElement(node);
+            }
+        }
+
+        function hasExportedReferenceInDestructuringElement(node: Expression): boolean {
+            if (isBinaryExpression(node)) {
+                const left = node.left;
+                return node.operatorToken.kind === SyntaxKind.EqualsToken
+                    && isDestructuringPattern(left)
+                    && hasExportedReferenceInDestructuringPattern(left);
+            }
+            else if (isIdentifier(node)) {
+                return isExportedBinding(node);
+            }
+            else if (isSpreadElementExpression(node)) {
+                const expression = node.expression;
+                return isIdentifier(expression) && isExportedBinding(expression);
+            }
+            else if (isDestructuringPattern(node)) {
+                return hasExportedReferenceInDestructuringPattern(node);
+            }
+            else {
+                return false;
+            }
+        }
+
+        function isDestructuringPattern(node: Expression): node is ObjectLiteralExpression | ArrayLiteralExpression | Identifier {
+            const kind = node.kind;
+            return kind === SyntaxKind.Identifier
+                || kind === SyntaxKind.ObjectLiteralExpression
+                || kind === SyntaxKind.ArrayLiteralExpression;
+        }
+
+        function substituteDestructuring(node: BinaryExpression) {
+            return flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration);
+        }
+
+        function substituteUnaryExpression(node: PrefixUnaryExpression | PostfixUnaryExpression): Expression {
+            const operand = node.operand;
+            const operator = node.operator;
+            const substitute =
+                isIdentifier(operand) &&
+                (
+                    node.kind === SyntaxKind.PostfixUnaryExpression ||
+                    (node.kind === SyntaxKind.PrefixUnaryExpression && (operator === SyntaxKind.PlusPlusToken || operator === SyntaxKind.MinusMinusToken))
+                );
+
+            if (substitute) {
+                const exportDeclaration = resolver.getReferencedExportContainer(<Identifier>operand);
+                if (exportDeclaration) {
+                    const expr = createPrefix(node.operator, operand, node);
+                    setNodeEmitFlags(expr, NodeEmitFlags.NoSubstitution);
+                    const call = createExportExpression(<Identifier>operand, expr);
+                    if (node.kind === SyntaxKind.PrefixUnaryExpression) {
+                        return call;
+                    }
+                    else {
+                        // export function returns the value that was passes as the second argument
+                        // however for postfix unary expressions result value should be the value before modification.
+                        // emit 'x++' as '(export('x', ++x) - 1)' and 'x--' as '(export('x', --x) + 1)'
+                        return operator === SyntaxKind.PlusPlusToken
+                            ? createSubtract(call, createLiteral(1))
+                            : createAdd(call, createLiteral(1));
+                    }
+                }
+            }
+            return node;
+        }
+
+        /**
+         * Gets a name to use for a DeclarationStatement.
+         * @param node The declaration statement.
+         */
+        function getDeclarationName(node: DeclarationStatement) {
+            return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node);
+        }
+
+        function addExportStarFunction(statements: Statement[], localNames: Identifier) {
+            const exportStarFunction = createUniqueName("exportStar");
+            const m = createIdentifier("m");
+            const n = createIdentifier("n");
+            const exports = createIdentifier("exports");
+            let condition: Expression = createStrictInequality(n, createLiteral("default"));
+            if (localNames) {
+                condition = createLogicalAnd(
+                    condition,
+                    createLogicalNot(createHasOwnProperty(localNames, n))
+                );
+            }
+
+            statements.push(
+                createFunctionDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    /*asteriskToken*/ undefined,
+                    exportStarFunction,
+                    /*typeParameters*/ undefined,
+                    [createParameter(m)],
+                    /*type*/ undefined,
+                    createBlock([
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    exports,
+                                    /*type*/ undefined,
+                                    createObjectLiteral([])
+                                )
+                            ])
+                        ),
+                        createForIn(
+                            createVariableDeclarationList([
+                                createVariableDeclaration(n, /*type*/ undefined)
+                            ]),
+                            m,
+                            createBlock([
+                                setNodeEmitFlags(
+                                    createIf(
+                                        condition,
+                                        createStatement(
+                                            createAssignment(
+                                                createElementAccess(exports, n),
+                                                createElementAccess(m, n)
+                                            )
+                                        )
+                                    ),
+                                    NodeEmitFlags.SingleLine
+                                )
+                            ])
+                        ),
+                        createStatement(
+                            createCall(
+                                exportFunctionForFile,
+                                /*typeArguments*/ undefined,
+                                [exports]
+                            )
+                        )
+                    ],
+                    /*location*/ undefined,
+                    /*multiline*/ true)
+                )
+            );
+
+            return exportStarFunction;
+        }
+
+        /**
+         * Creates a call to the current file's export function to export a value.
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         */
+        function createExportExpression(name: Identifier | StringLiteral, value: Expression) {
+            const exportName = isIdentifier(name) ? createLiteral(name.text) : name;
+            return createCall(exportFunctionForFile, /*typeArguments*/ undefined, [exportName, value]);
+        }
+
+        /**
+         * Creates a call to the current file's export function to export a value.
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         */
+        function createExportStatement(name: Identifier | StringLiteral, value: Expression) {
+            return createStatement(createExportExpression(name, value));
+        }
+
+        /**
+         * Creates a call to the current file's export function to export a declaration.
+         * @param node The declaration to export.
+         */
+        function createDeclarationExport(node: DeclarationStatement) {
+            const declarationName = getDeclarationName(node);
+            const exportName = hasModifier(node, ModifierFlags.Default) ? createLiteral("default") : declarationName;
+            return createExportStatement(exportName, declarationName);
+        }
+
+        function createImportBinding(importDeclaration: Declaration): LeftHandSideExpression {
+            let importAlias: Identifier;
+            let name: Identifier;
+            if (isImportClause(importDeclaration)) {
+                importAlias = getGeneratedNameForNode(importDeclaration.parent);
+                name = createIdentifier("default");
+            }
+            else if (isImportSpecifier(importDeclaration)) {
+                importAlias = getGeneratedNameForNode(importDeclaration.parent.parent.parent);
+                name = importDeclaration.propertyName || importDeclaration.name;
+            }
+            else {
+                return undefined;
+            }
+
+            if (name.originalKeywordKind && languageVersion === ScriptTarget.ES3) {
+                return createElementAccess(importAlias, createLiteral(name.text));
+            }
+            else {
+                return createPropertyAccess(importAlias, getSynthesizedClone(name));
+            }
+        }
+
+        function collectDependencyGroups(externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[]) {
+            const groupIndices = createMap<number>();
+            const dependencyGroups: DependencyGroup[] = [];
+            for (let i = 0; i < externalImports.length; i++) {
+                const externalImport = externalImports[i];
+                const externalModuleName = getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
+                const text = externalModuleName.text;
+                if (hasProperty(groupIndices, text)) {
+                    // deduplicate/group entries in dependency list by the dependency name
+                    const groupIndex = groupIndices[text];
+                    dependencyGroups[groupIndex].externalImports.push(externalImport);
+                    continue;
+                }
+                else {
+                    groupIndices[text] = dependencyGroups.length;
+                    dependencyGroups.push({
+                        name: externalModuleName,
+                        externalImports: [externalImport]
+                    });
+                }
+            }
+
+            return dependencyGroups;
+        }
+
+        function getNameOfDependencyGroup(dependencyGroup: DependencyGroup) {
+            return dependencyGroup.name;
+        }
+
+        function recordExportName(name: Identifier) {
+            if (!exportedLocalNames) {
+                exportedLocalNames = [];
+            }
+
+            exportedLocalNames.push(name);
+        }
+
+        function recordExportedFunctionDeclaration(node: FunctionDeclaration) {
+            if (!exportedFunctionDeclarations) {
+                exportedFunctionDeclarations = [];
+            }
+
+            exportedFunctionDeclarations.push(createDeclarationExport(node));
+        }
+
+        function hoistBindingElement(node: VariableDeclaration | BindingElement, isExported: boolean): void {
+            const name = node.name;
+            if (isIdentifier(name)) {
+                hoistVariableDeclaration(getSynthesizedClone(name));
+                if (isExported) {
+                    recordExportName(name);
+                }
+            }
+            else if (isBindingPattern(name)) {
+                forEach(name.elements, isExported ? hoistExportedBindingElement : hoistNonExportedBindingElement);
+            }
+        }
+
+        function hoistExportedBindingElement(node: VariableDeclaration | BindingElement) {
+            hoistBindingElement(node, /*isExported*/ true);
+        }
+
+        function hoistNonExportedBindingElement(node: VariableDeclaration | BindingElement) {
+            hoistBindingElement(node, /*isExported*/ false);
+        }
+
+        function updateSourceFile(node: SourceFile, statements: Statement[], nodeEmitFlags: NodeEmitFlags) {
+            const updated = getMutableClone(node);
+            updated.statements = createNodeArray(statements, node.statements);
+            setNodeEmitFlags(updated, nodeEmitFlags);
+            return updated;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
new file mode 100644
index 00000000000..efb247ba663
--- /dev/null
+++ b/src/compiler/transformers/ts.ts
@@ -0,0 +1,3415 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+/// <reference path="./destructuring.ts" />
+
+/*@internal*/
+namespace ts {
+    type SuperContainer = ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration;
+
+    /**
+     * Indicates whether to emit type metadata in the new format.
+     */
+    const USE_NEW_TYPE_METADATA_FORMAT = false;
+
+    const enum TypeScriptSubstitutionFlags {
+        /** Enables substitutions for decorated classes. */
+        ClassAliases = 1 << 0,
+        /** Enables substitutions for namespace exports. */
+        NamespaceExports = 1 << 1,
+        /** Enables substitutions for async methods with `super` calls. */
+        AsyncMethodsWithSuper = 1 << 2,
+        /* Enables substitutions for unqualified enum members */
+        NonQualifiedEnumMembers = 1 << 3
+    }
+
+    export function transformTypeScript(context: TransformationContext) {
+        const {
+            getNodeEmitFlags,
+            setNodeEmitFlags,
+            setCommentRange,
+            setSourceMapRange,
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            hoistVariableDeclaration,
+        } = context;
+
+        const resolver = context.getEmitResolver();
+        const compilerOptions = context.getCompilerOptions();
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const moduleKind = getEmitModuleKind(compilerOptions);
+
+        // Save the previous transformation hooks.
+        const previousOnEmitNode = context.onEmitNode;
+        const previousOnSubstituteNode = context.onSubstituteNode;
+
+        // Set new transformation hooks.
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+
+        // These variables contain state that changes as we descend into the tree.
+        let currentSourceFile: SourceFile;
+        let currentNamespace: ModuleDeclaration;
+        let currentNamespaceContainerName: Identifier;
+        let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
+        let currentSourceFileExternalHelpersModuleName: Identifier;
+
+        /**
+         * Keeps track of whether expression substitution has been enabled for specific edge cases.
+         * They are persisted between each SourceFile transformation and should not be reset.
+         */
+        let enabledSubstitutions: TypeScriptSubstitutionFlags;
+
+        /**
+         * A map that keeps track of aliases created for classes with decorators to avoid issues
+         * with the double-binding behavior of classes.
+         */
+        let classAliases: Map<Identifier>;
+
+        /**
+         * Keeps track of whether  we are within any containing namespaces when performing
+         * just-in-time substitution while printing an expression identifier.
+         */
+        let applicableSubstitutions: TypeScriptSubstitutionFlags;
+
+        /**
+         * This keeps track of containers where `super` is valid, for use with
+         * just-in-time substitution for `super` expressions inside of async methods.
+         */
+        let currentSuperContainer: SuperContainer;
+
+        return transformSourceFile;
+
+        /**
+         * Transform TypeScript-specific syntax in a SourceFile.
+         *
+         * @param node A SourceFile node.
+         */
+        function transformSourceFile(node: SourceFile) {
+            return visitNode(node, visitor, isSourceFile);
+        }
+
+        /**
+         * Visits a node, saving and restoring state variables on the stack.
+         *
+         * @param node The node to visit.
+         */
+        function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {
+            // Save state
+            const savedCurrentScope = currentScope;
+
+            // Handle state changes before visiting a node.
+            onBeforeVisitNode(node);
+
+            const visited = f(node);
+
+            // Restore state
+            currentScope = savedCurrentScope;
+
+            return visited;
+        }
+
+        /**
+         * General-purpose node visitor.
+         *
+         * @param node The node to visit.
+         */
+        function visitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, visitorWorker);
+        }
+
+        /**
+         * Visits and possibly transforms any node.
+         *
+         * @param node The node to visit.
+         */
+        function visitorWorker(node: Node): VisitResult<Node> {
+            if (node.kind === SyntaxKind.SourceFile) {
+                return visitSourceFile(<SourceFile>node);
+            }
+            else if (node.transformFlags & TransformFlags.TypeScript) {
+                // This node is explicitly marked as TypeScript, so we should transform the node.
+                return visitTypeScript(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsTypeScript) {
+                // This node contains TypeScript, so we should visit its children.
+                return visitEachChild(node, visitor, context);
+            }
+
+            return node;
+        }
+
+        /**
+         * Specialized visitor that visits the immediate children of a namespace.
+         *
+         * @param node The node to visit.
+         */
+        function namespaceElementVisitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, namespaceElementVisitorWorker);
+        }
+
+        /**
+         * Specialized visitor that visits the immediate children of a namespace.
+         *
+         * @param node The node to visit.
+         */
+        function namespaceElementVisitorWorker(node: Node): VisitResult<Node> {
+            if (node.kind === SyntaxKind.ExportDeclaration ||
+                node.kind === SyntaxKind.ImportDeclaration ||
+                node.kind === SyntaxKind.ImportClause ||
+                (node.kind === SyntaxKind.ImportEqualsDeclaration &&
+                 (<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference)) {
+                // do not emit ES6 imports and exports since they are illegal inside a namespace
+                return undefined;
+           }
+           else if (node.transformFlags & TransformFlags.TypeScript || hasModifier(node, ModifierFlags.Export)) {
+                // This node is explicitly marked as TypeScript, or is exported at the namespace
+                // level, so we should transform the node.
+                return visitTypeScript(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsTypeScript) {
+                // This node contains TypeScript, so we should visit its children.
+                return visitEachChild(node, visitor, context);
+            }
+
+            return node;
+        }
+
+        /**
+         * Specialized visitor that visits the immediate children of a class with TypeScript syntax.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, classElementVisitorWorker);
+        }
+
+        /**
+         * Specialized visitor that visits the immediate children of a class with TypeScript syntax.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitorWorker(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.Constructor:
+                    // TypeScript constructors are transformed in `visitClassDeclaration`.
+                    // We elide them here as `visitorWorker` checks transform flags, which could
+                    // erronously include an ES6 constructor without TypeScript syntax.
+                    return undefined;
+
+                case SyntaxKind.PropertyDeclaration:
+                case SyntaxKind.IndexSignature:
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                case SyntaxKind.MethodDeclaration:
+                    // Fallback to the default visit behavior.
+                    return visitorWorker(node);
+
+                case SyntaxKind.SemicolonClassElement:
+                    return node;
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
+            }
+        }
+
+        /**
+         * Branching visitor, visits a TypeScript syntax node.
+         *
+         * @param node The node to visit.
+         */
+        function visitTypeScript(node: Node): VisitResult<Node> {
+            if (hasModifier(node, ModifierFlags.Ambient) && isStatement(node)) {
+                // TypeScript ambient declarations are elided, but some comments may be preserved.
+                // See the implementation of `getLeadingComments` in comments.ts for more details.
+                return createNotEmittedStatement(node);
+            }
+
+            switch (node.kind) {
+                case SyntaxKind.ExportKeyword:
+                case SyntaxKind.DefaultKeyword:
+                    // ES6 export and default modifiers are elided when inside a namespace.
+                    return currentNamespace ? undefined : node;
+
+                case SyntaxKind.PublicKeyword:
+                case SyntaxKind.PrivateKeyword:
+                case SyntaxKind.ProtectedKeyword:
+                case SyntaxKind.AbstractKeyword:
+                case SyntaxKind.AsyncKeyword:
+                case SyntaxKind.ConstKeyword:
+                case SyntaxKind.DeclareKeyword:
+                case SyntaxKind.ReadonlyKeyword:
+                    // TypeScript accessibility and readonly modifiers are elided.
+
+                case SyntaxKind.ArrayType:
+                case SyntaxKind.TupleType:
+                case SyntaxKind.TypeLiteral:
+                case SyntaxKind.TypePredicate:
+                case SyntaxKind.TypeParameter:
+                case SyntaxKind.AnyKeyword:
+                case SyntaxKind.BooleanKeyword:
+                case SyntaxKind.StringKeyword:
+                case SyntaxKind.NumberKeyword:
+                case SyntaxKind.NeverKeyword:
+                case SyntaxKind.VoidKeyword:
+                case SyntaxKind.SymbolKeyword:
+                case SyntaxKind.ConstructorType:
+                case SyntaxKind.FunctionType:
+                case SyntaxKind.TypeQuery:
+                case SyntaxKind.TypeReference:
+                case SyntaxKind.UnionType:
+                case SyntaxKind.IntersectionType:
+                case SyntaxKind.ParenthesizedType:
+                case SyntaxKind.ThisType:
+                case SyntaxKind.LiteralType:
+                    // TypeScript type nodes are elided.
+
+                case SyntaxKind.IndexSignature:
+                    // TypeScript index signatures are elided.
+
+                case SyntaxKind.Decorator:
+                    // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
+
+                case SyntaxKind.TypeAliasDeclaration:
+                    // TypeScript type-only declarations are elided.
+
+                case SyntaxKind.PropertyDeclaration:
+                    // TypeScript property declarations are elided.
+
+                case SyntaxKind.Constructor:
+                    // TypeScript constructors are transformed in `visitClassDeclaration`.
+                    return undefined;
+
+                case SyntaxKind.InterfaceDeclaration:
+                    // TypeScript interfaces are elided, but some comments may be preserved.
+                    // See the implementation of `getLeadingComments` in comments.ts for more details.
+                    return createNotEmittedStatement(node);
+
+                case SyntaxKind.ClassDeclaration:
+                    // This is a class declaration with TypeScript syntax extensions.
+                    //
+                    // TypeScript class syntax extensions include:
+                    // - decorators
+                    // - optional `implements` heritage clause
+                    // - parameter property assignments in the constructor
+                    // - property declarations
+                    // - index signatures
+                    // - method overload signatures
+                    // - async methods
+                    return visitClassDeclaration(<ClassDeclaration>node);
+
+                case SyntaxKind.ClassExpression:
+                    // This is a class expression with TypeScript syntax extensions.
+                    //
+                    // TypeScript class syntax extensions include:
+                    // - decorators
+                    // - optional `implements` heritage clause
+                    // - parameter property assignments in the constructor
+                    // - property declarations
+                    // - index signatures
+                    // - method overload signatures
+                    // - async methods
+                    return visitClassExpression(<ClassExpression>node);
+
+                case SyntaxKind.HeritageClause:
+                    // This is a heritage clause with TypeScript syntax extensions.
+                    //
+                    // TypeScript heritage clause extensions include:
+                    // - `implements` clause
+                    return visitHeritageClause(<HeritageClause>node);
+
+                case SyntaxKind.ExpressionWithTypeArguments:
+                    // TypeScript supports type arguments on an expression in an `extends` heritage clause.
+                    return visitExpressionWithTypeArguments(<ExpressionWithTypeArguments>node);
+
+                case SyntaxKind.MethodDeclaration:
+                    // TypeScript method declarations may be 'async', and may have decorators, modifiers
+                    // or type annotations.
+                    return visitMethodDeclaration(<MethodDeclaration>node);
+
+                case SyntaxKind.GetAccessor:
+                    // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
+                    return visitGetAccessor(<GetAccessorDeclaration>node);
+
+                case SyntaxKind.SetAccessor:
+                    // Set Accessors can have TypeScript modifiers, decorators, and type annotations.
+                    return visitSetAccessor(<SetAccessorDeclaration>node);
+
+                case SyntaxKind.FunctionDeclaration:
+                    // TypeScript function declarations may be 'async'
+                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+
+                case SyntaxKind.FunctionExpression:
+                    // TypeScript function expressions may be 'async'
+                    return visitFunctionExpression(<FunctionExpression>node);
+
+                case SyntaxKind.ArrowFunction:
+                    // TypeScript arrow functions may be 'async'
+                    return visitArrowFunction(<ArrowFunction>node);
+
+                case SyntaxKind.Parameter:
+                    // This is a parameter declaration with TypeScript syntax extensions.
+                    //
+                    // TypeScript parameter declaration syntax extensions include:
+                    // - decorators
+                    // - accessibility modifiers
+                    // - the question mark (?) token for optional parameters
+                    // - type annotations
+                    // - this parameters
+                    return visitParameter(<ParameterDeclaration>node);
+
+                case SyntaxKind.ParenthesizedExpression:
+                    // ParenthesizedExpressions are TypeScript if their expression is a
+                    // TypeAssertion or AsExpression
+                    return visitParenthesizedExpression(<ParenthesizedExpression>node);
+
+                case SyntaxKind.TypeAssertionExpression:
+                case SyntaxKind.AsExpression:
+                    // TypeScript type assertions are removed, but their subtrees are preserved.
+                    return visitAssertionExpression(<AssertionExpression>node);
+
+                case SyntaxKind.NonNullExpression:
+                    // TypeScript non-null expressions are removed, but their subtrees are preserved.
+                    return visitNonNullExpression(<NonNullExpression>node);
+
+                case SyntaxKind.EnumDeclaration:
+                    // TypeScript enum declarations do not exist in ES6 and must be rewritten.
+                    return visitEnumDeclaration(<EnumDeclaration>node);
+
+                case SyntaxKind.AwaitExpression:
+                    // TypeScript 'await' expressions must be transformed.
+                    return visitAwaitExpression(<AwaitExpression>node);
+
+                case SyntaxKind.VariableStatement:
+                    // TypeScript namespace exports for variable statements must be transformed.
+                    return visitVariableStatement(<VariableStatement>node);
+
+                case SyntaxKind.ModuleDeclaration:
+                    // TypeScript namespace declarations must be transformed.
+                    return visitModuleDeclaration(<ModuleDeclaration>node);
+
+                case SyntaxKind.ImportEqualsDeclaration:
+                    // TypeScript namespace or external module import.
+                    return visitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        /**
+         * Performs actions that should always occur immediately before visiting a node.
+         *
+         * @param node The node to visit.
+         */
+        function onBeforeVisitNode(node: Node) {
+            switch (node.kind) {
+                case SyntaxKind.SourceFile:
+                case SyntaxKind.CaseBlock:
+                case SyntaxKind.ModuleBlock:
+                case SyntaxKind.Block:
+                    currentScope = <SourceFile | CaseBlock | ModuleBlock | Block>node;
+                    break;
+            }
+        }
+
+        function visitSourceFile(node: SourceFile) {
+            currentSourceFile = node;
+
+            // If the source file requires any helpers and is an external module, and
+            // the importHelpers compiler option is enabled, emit a synthesized import
+            // statement for the helpers library.
+            if (node.flags & NodeFlags.EmitHelperFlags
+                && compilerOptions.importHelpers
+                && (isExternalModule(node) || compilerOptions.isolatedModules)) {
+                startLexicalEnvironment();
+                const statements: Statement[] = [];
+                const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ false, visitor);
+                const externalHelpersModuleName = createUniqueName(externalHelpersModuleNameText);
+                const externalHelpersModuleImport = createImportDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    createImportClause(/*name*/ undefined, createNamespaceImport(externalHelpersModuleName)),
+                    createLiteral(externalHelpersModuleNameText)
+                );
+                externalHelpersModuleImport.parent = node;
+                externalHelpersModuleImport.flags &= ~NodeFlags.Synthesized;
+                statements.push(externalHelpersModuleImport);
+
+                currentSourceFileExternalHelpersModuleName = externalHelpersModuleName;
+                addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
+                addRange(statements, endLexicalEnvironment());
+                currentSourceFileExternalHelpersModuleName = undefined;
+
+                node = updateSourceFileNode(node, createNodeArray(statements, node.statements));
+                node.externalHelpersModuleName = externalHelpersModuleName;
+            }
+            else {
+                node = visitEachChild(node, visitor, context);
+            }
+
+            setNodeEmitFlags(node, NodeEmitFlags.EmitEmitHelpers | node.emitFlags);
+            return node;
+        }
+
+        /**
+         * Tests whether we should emit a __decorate call for a class declaration.
+         */
+        function shouldEmitDecorateCallForClass(node: ClassDeclaration) {
+            if (node.decorators && node.decorators.length > 0) {
+                return true;
+            }
+
+            const constructor = getFirstConstructorWithBody(node);
+            if (constructor) {
+                return forEach(constructor.parameters, shouldEmitDecorateCallForParameter);
+            }
+
+            return false;
+        }
+
+        /**
+         * Tests whether we should emit a __decorate call for a parameter declaration.
+         */
+        function shouldEmitDecorateCallForParameter(parameter: ParameterDeclaration) {
+            return parameter.decorators !== undefined && parameter.decorators.length > 0;
+        }
+
+        /**
+         * Transforms a class declaration with TypeScript syntax into compatible ES6.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The class has decorators.
+         * - The class has property declarations with initializers.
+         * - The class contains a constructor that contains parameters with accessibility modifiers.
+         * - The class is an export in a TypeScript namespace.
+         *
+         * @param node The node to transform.
+         */
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
+            const staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            const hasExtendsClause = getClassExtendsHeritageClauseElement(node) !== undefined;
+            const isDecoratedClass = shouldEmitDecorateCallForClass(node);
+            let classAlias: Identifier;
+
+            // emit name if
+            // - node has a name
+            // - node has static initializers
+            //
+            let name = node.name;
+            if (!name && staticProperties.length > 0) {
+                name = getGeneratedNameForNode(node);
+            }
+
+            const statements: Statement[] = [];
+            if (!isDecoratedClass) {
+                //  ${modifiers} class ${name} ${heritageClauses} {
+                //      ${members}
+                //  }
+                const classDeclaration = createClassDeclaration(
+                    /*decorators*/ undefined,
+                    visitNodes(node.modifiers, visitor, isModifier),
+                    name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.heritageClauses, visitor, isHeritageClause),
+                    transformClassMembers(node, hasExtendsClause),
+                    /*location*/ node
+                );
+                setOriginalNode(classDeclaration, node);
+
+                // To better align with the old emitter, we should not emit a trailing source map
+                // entry if the class has static properties.
+                if (staticProperties.length > 0) {
+                    setNodeEmitFlags(classDeclaration, NodeEmitFlags.NoTrailingSourceMap | getNodeEmitFlags(classDeclaration));
+                }
+
+                statements.push(classDeclaration);
+            }
+            else {
+                classAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
+            }
+
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            if (staticProperties.length) {
+                addInitializedPropertyStatements(statements, node, staticProperties, getLocalName(node, /*noSourceMaps*/ true));
+            }
+
+            // Write any decorators of the node.
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
+            addConstructorDecorationStatement(statements, node, classAlias);
+
+            // If the class is exported as part of a TypeScript namespace, emit the namespace export.
+            // Otherwise, if the class was exported at the top level and was decorated, emit an export
+            // declaration or export default for the class.
+            if (isNamespaceExport(node)) {
+                addExportMemberAssignment(statements, node);
+            }
+            else if (isDecoratedClass) {
+                if (isDefaultExternalModuleExport(node)) {
+                    statements.push(createExportAssignment(
+                        /*decorators*/ undefined,
+                        /*modifiers*/ undefined,
+                        /*isExportEquals*/ false,
+                        getLocalName(node)));
+                }
+                else if (isNamedExternalModuleExport(node)) {
+                    statements.push(createExternalModuleExport(name));
+                }
+            }
+
+            return statements;
+        }
+
+        /**
+         * Transforms a decorated class declaration and appends the resulting statements. If
+         * the class requires an alias to avoid issues with double-binding, the alias is returned.
+         *
+         * @param node A ClassDeclaration node.
+         * @param name The name of the class.
+         * @param hasExtendsClause A value indicating whether
+         */
+        function addClassDeclarationHeadWithDecorators(statements: Statement[], node: ClassDeclaration, name: Identifier, hasExtendsClause: boolean) {
+            // When we emit an ES6 class that has a class decorator, we must tailor the
+            // emit to certain specific cases.
+            //
+            // In the simplest case, we emit the class declaration as a let declaration, and
+            // evaluate decorators after the close of the class body:
+            //
+            //  [Example 1]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  class C {                       | }
+            //  }                               | C = __decorate([dec], C);
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export class C {                | }
+            //  }                               | C = __decorate([dec], C);
+            //                                  | export { C };
+            //  ---------------------------------------------------------------------
+            //
+            // If a class declaration contains a reference to itself *inside* of the class body,
+            // this introduces two bindings to the class: One outside of the class body, and one
+            // inside of the class body. If we apply decorators as in [Example 1] above, there
+            // is the possibility that the decorator `dec` will return a new value for the
+            // constructor, which would result in the binding inside of the class no longer
+            // pointing to the same reference as the binding outside of the class.
+            //
+            // As a result, we must instead rewrite all references to the class *inside* of the
+            // class body to instead point to a local temporary alias for the class:
+            //
+            //  [Example 2]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C_1 = class C {
+            //  class C {                       |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | let C = C_1;
+            //  }                               | C.y = 1;
+            //                                  | C = C_1 = __decorate([dec], C);
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C_1 = class C {
+            //  export class C {                |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | let C = C_1;
+            //  }                               | C.y = 1;
+            //                                  | C = C_1 = __decorate([dec], C);
+            //                                  | export { C };
+            //  ---------------------------------------------------------------------
+            //
+            // If a class declaration is the default export of a module, we instead emit
+            // the export after the decorated declaration:
+            //
+            //  [Example 3]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let default_1 = class {
+            //  export default class {          | }
+            //  }                               | default_1 = __decorate([dec], default_1);
+            //                                  | export default default_1;
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export default class C {        | }
+            //  }                               | C = __decorate([dec], C);
+            //                                  | export default C;
+            //  ---------------------------------------------------------------------
+            //
+            // If the class declaration is the default export and a reference to itself
+            // inside of the class body, we must emit both an alias for the class *and*
+            // move the export after the declaration:
+            //
+            //  [Example 4]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C_1 = class C {
+            //  export default class C {        |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | let C = C_1;
+            //  }                               | C.y = 1;
+            //                                  | C = C_1 = __decorate([dec], C);
+            //                                  | export default C;
+            //  ---------------------------------------------------------------------
+            //
+
+            const location = moveRangePastDecorators(node);
+
+            //  ... = class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            const classExpression: Expression = setOriginalNode(
+                createClassExpression(
+                    /*modifiers*/ undefined,
+                    name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.heritageClauses, visitor, isHeritageClause),
+                    transformClassMembers(node, hasExtendsClause),
+                    /*location*/ location
+                ),
+                node
+            );
+
+            if (!name) {
+                name = getGeneratedNameForNode(node);
+            }
+
+            // Record an alias to avoid class double-binding.
+            let classAlias: Identifier;
+            if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithConstructorReference) {
+                enableSubstitutionForClassAliases();
+                classAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                classAliases[getOriginalNodeId(node)] = classAlias;
+            }
+
+            const declaredName = getDeclarationName(node, /*allowComments*/ true);
+
+            //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
+            //                                         or decoratedClassAlias if the class contain self-reference.
+            statements.push(
+                setOriginalNode(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createLetDeclarationList([
+                            createVariableDeclaration(
+                                classAlias || declaredName,
+                                /*type*/ undefined,
+                                classExpression
+                            )
+                        ]),
+                        /*location*/ location
+                    ),
+                    /*original*/ node
+                )
+            );
+
+            if (classAlias) {
+                // We emit the class alias as a `let` declaration here so that it has the same
+                // TDZ as the class.
+
+                // let ${declaredName} = ${decoratedClassAlias}
+                statements.push(
+                    setOriginalNode(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createLetDeclarationList([
+                                createVariableDeclaration(
+                                    declaredName,
+                                    /*type*/ undefined,
+                                    classAlias
+                                )
+                            ]),
+                            /*location*/ location
+                        ),
+                        /*original*/ node
+                    )
+                );
+            }
+
+            return classAlias;
+        }
+
+        /**
+         * Transforms a class expression with TypeScript syntax into compatible ES6.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The class has property declarations with initializers.
+         * - The class contains a constructor that contains parameters with accessibility modifiers.
+         *
+         * @param node The node to transform.
+         */
+        function visitClassExpression(node: ClassExpression): Expression {
+            const staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause);
+            const members = transformClassMembers(node, heritageClauses !== undefined);
+
+            const classExpression = setOriginalNode(
+                createClassExpression(
+                    /*modifiers*/ undefined,
+                    node.name,
+                    /*typeParameters*/ undefined,
+                    heritageClauses,
+                    members,
+                    /*location*/ node
+                ),
+                node
+            );
+
+            if (staticProperties.length > 0) {
+                const expressions: Expression[] = [];
+                const temp = createTempVariable(hoistVariableDeclaration);
+                if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithConstructorReference) {
+                    // record an alias as the class name is not in scope for statics.
+                    enableSubstitutionForClassAliases();
+                    classAliases[getOriginalNodeId(node)] = getSynthesizedClone(temp);
+                }
+
+                // To preserve the behavior of the old emitter, we explicitly indent
+                // the body of a class with static initializers.
+                setNodeEmitFlags(classExpression, NodeEmitFlags.Indented | getNodeEmitFlags(classExpression));
+                expressions.push(startOnNewLine(createAssignment(temp, classExpression)));
+                addRange(expressions, generateInitializedPropertyExpressions(node, staticProperties, temp));
+                expressions.push(startOnNewLine(temp));
+                return inlineExpressions(expressions);
+            }
+
+            return classExpression;
+        }
+
+        /**
+         * Transforms the members of a class.
+         *
+         * @param node The current class.
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
+         */
+        function transformClassMembers(node: ClassDeclaration | ClassExpression, hasExtendsClause: boolean) {
+            const members: ClassElement[] = [];
+            const constructor = transformConstructor(node, hasExtendsClause);
+            if (constructor) {
+                members.push(constructor);
+            }
+
+            addRange(members, visitNodes(node.members, classElementVisitor, isClassElement));
+            return createNodeArray(members, /*location*/ node.members);
+        }
+
+        /**
+         * Transforms (or creates) a constructor for a class.
+         *
+         * @param node The current class.
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
+         */
+        function transformConstructor(node: ClassDeclaration | ClassExpression, hasExtendsClause: boolean) {
+            // Check if we have property assignment inside class declaration.
+            // If there is a property assignment, we need to emit constructor whether users define it or not
+            // If there is no property assignment, we can omit constructor if users do not define it
+            const hasInstancePropertyWithInitializer = forEach(node.members, isInstanceInitializedProperty);
+            const hasParameterPropertyAssignments = node.transformFlags & TransformFlags.ContainsParameterPropertyAssignments;
+            const constructor = getFirstConstructorWithBody(node);
+
+            // If the class does not contain nodes that require a synthesized constructor,
+            // accept the current constructor if it exists.
+            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
+                return visitEachChild(constructor, visitor, context);
+            }
+
+            const parameters = transformConstructorParameters(constructor);
+            const body = transformConstructorBody(node, constructor, hasExtendsClause, parameters);
+
+            //  constructor(${parameters}) {
+            //      ${body}
+            //  }
+            return startOnNewLine(
+                setOriginalNode(
+                    createConstructor(
+                        /*decorators*/ undefined,
+                        /*modifiers*/ undefined,
+                        parameters,
+                        body,
+                        /*location*/ constructor || node
+                    ),
+                    constructor
+                )
+            );
+        }
+
+        /**
+         * Transforms (or creates) the parameters for the constructor of a class with
+         * parameter property assignments or instance property initializers.
+         *
+         * @param constructor The constructor declaration.
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
+         */
+        function transformConstructorParameters(constructor: ConstructorDeclaration) {
+            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
+            // If constructor is empty, then
+            //     If ClassHeritag_eopt is present and protoParent is not null, then
+            //          Let constructor be the result of parsing the source text
+            //              constructor(...args) { super (...args);}
+            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
+            //      Else,
+            //           Let constructor be the result of parsing the source text
+            //               constructor( ){ }
+            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
+            //
+            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
+            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
+            // Instead, we'll avoid using a rest parameter and spread into the super call as
+            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
+            return constructor
+                ? visitNodes(constructor.parameters, visitor, isParameter)
+                : <ParameterDeclaration[]>[];
+        }
+
+        /**
+         * Transforms (or creates) a constructor body for a class with parameter property
+         * assignments or instance property initializers.
+         *
+         * @param node The current class.
+         * @param constructor The current class constructor.
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
+         * @param parameters The transformed parameters for the constructor.
+         */
+        function transformConstructorBody(node: ClassExpression | ClassDeclaration, constructor: ConstructorDeclaration, hasExtendsClause: boolean, parameters: ParameterDeclaration[]) {
+            const statements: Statement[] = [];
+            let indexOfFirstStatement = 0;
+
+            // The body of a constructor is a new lexical environment
+            startLexicalEnvironment();
+
+            if (constructor) {
+                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
+
+                // Add parameters with property assignments. Transforms this:
+                //
+                //  constructor (public x, public y) {
+                //  }
+                //
+                // Into this:
+                //
+                //  constructor (x, y) {
+                //      this.x = x;
+                //      this.y = y;
+                //  }
+                //
+                const propertyAssignments = getParametersWithPropertyAssignments(constructor);
+                addRange(statements, map(propertyAssignments, transformParameterWithPropertyAssignment));
+            }
+            else if (hasExtendsClause) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(
+                    createStatement(
+                        createCall(
+                            createSuper(),
+                            /*typeArguments*/ undefined,
+                            [createSpread(createIdentifier("arguments"))]
+                        )
+                    )
+                );
+            }
+
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            const properties = getInitializedProperties(node, /*isStatic*/ false);
+            addInitializedPropertyStatements(statements, node, properties, createThis());
+
+            if (constructor) {
+                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
+                addRange(statements, visitNodes(constructor.body.statements, visitor, isStatement, indexOfFirstStatement));
+            }
+
+            // End the lexical environment.
+            addRange(statements, endLexicalEnvironment());
+            return setMultiLine(
+                createBlock(
+                    createNodeArray(
+                        statements,
+                        /*location*/ constructor ? constructor.body.statements : node.members
+                    ),
+                    /*location*/ constructor ? constructor.body : undefined
+                ),
+                true
+            );
+        }
+
+        /**
+         * Adds super call and preceding prologue directives into the list of statements.
+         *
+         * @param ctor The constructor node.
+         * @returns index of the statement that follows super call
+         */
+        function addPrologueDirectivesAndInitialSuperCall(ctor: ConstructorDeclaration, result: Statement[]): number {
+            if (ctor.body) {
+                const statements = ctor.body.statements;
+                // add prologue directives to the list (if any)
+                const index = addPrologueDirectives(result, statements, /*ensureUseStrict*/ false, visitor);
+                if (index === statements.length) {
+                    // list contains nothing but prologue directives (or empty) - exit
+                    return index;
+                }
+
+                const statement = statements[index];
+                if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((<ExpressionStatement>statement).expression)) {
+                    result.push(visitNode(statement, visitor, isStatement));
+                    return index + 1;
+                }
+
+                return index;
+            }
+
+            return 0;
+        }
+
+        /**
+         * Gets all parameters of a constructor that should be transformed into property assignments.
+         *
+         * @param node The constructor node.
+         */
+        function getParametersWithPropertyAssignments(node: ConstructorDeclaration): ParameterDeclaration[] {
+            return filter(node.parameters, isParameterWithPropertyAssignment);
+        }
+
+        /**
+         * Determines whether a parameter should be transformed into a property assignment.
+         *
+         * @param parameter The parameter node.
+         */
+        function isParameterWithPropertyAssignment(parameter: ParameterDeclaration) {
+            return hasModifier(parameter, ModifierFlags.ParameterPropertyModifier)
+                && isIdentifier(parameter.name);
+        }
+
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node: ParameterDeclaration) {
+            Debug.assert(isIdentifier(node.name));
+            const name = node.name as Identifier;
+            const propertyName = getMutableClone(name);
+            setNodeEmitFlags(propertyName, NodeEmitFlags.NoComments | NodeEmitFlags.NoSourceMap);
+
+            const localName = getMutableClone(name);
+            setNodeEmitFlags(localName, NodeEmitFlags.NoComments);
+
+            return startOnNewLine(
+                createStatement(
+                    createAssignment(
+                        createPropertyAccess(
+                            createThis(),
+                            propertyName,
+                            /*location*/ node.name
+                        ),
+                        localName
+                    ),
+                    /*location*/ moveRangePos(node, -1)
+                )
+            );
+        }
+
+        /**
+         * Gets all property declarations with initializers on either the static or instance side of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+         */
+        function getInitializedProperties(node: ClassExpression | ClassDeclaration, isStatic: boolean): PropertyDeclaration[] {
+            return filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+        }
+
+        /**
+         * Gets a value indicating whether a class element is a static property declaration with an initializer.
+         *
+         * @param member The class element node.
+         */
+        function isStaticInitializedProperty(member: ClassElement): member is PropertyDeclaration {
+            return isInitializedProperty(member, /*isStatic*/ true);
+        }
+
+        /**
+         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+         *
+         * @param member The class element node.
+         */
+        function isInstanceInitializedProperty(member: ClassElement): member is PropertyDeclaration {
+            return isInitializedProperty(member, /*isStatic*/ false);
+        }
+
+        /**
+         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+         *
+         * @param member The class element node.
+         * @param isStatic A value indicating whether the member should be a static or instance member.
+         */
+        function isInitializedProperty(member: ClassElement, isStatic: boolean) {
+            return member.kind === SyntaxKind.PropertyDeclaration
+                && isStatic === hasModifier(member, ModifierFlags.Static)
+                && (<PropertyDeclaration>member).initializer !== undefined;
+        }
+
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param node The class node.
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements: Statement[], node: ClassExpression | ClassDeclaration, properties: PropertyDeclaration[], receiver: LeftHandSideExpression) {
+            for (const property of properties) {
+                const statement = createStatement(transformInitializedProperty(node, property, receiver));
+                setSourceMapRange(statement, moveRangePastModifiers(property));
+                setCommentRange(statement, property);
+                statements.push(statement);
+            }
+        }
+
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param node The class node.
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(node: ClassExpression | ClassDeclaration, properties: PropertyDeclaration[], receiver: LeftHandSideExpression) {
+            const expressions: Expression[] = [];
+            for (const property of properties) {
+                const expression = transformInitializedProperty(node, property, receiver);
+                expression.startsOnNewLine = true;
+                setSourceMapRange(expression, moveRangePastModifiers(property));
+                setCommentRange(expression, property);
+                expressions.push(expression);
+            }
+
+            return expressions;
+        }
+
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param node The class containing the property.
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(node: ClassExpression | ClassDeclaration, property: PropertyDeclaration, receiver: LeftHandSideExpression) {
+            const propertyName = visitPropertyNameOfClassElement(property);
+            const initializer = visitNode(property.initializer, visitor, isExpression);
+            const memberAccess = createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+
+            return createAssignment(memberAccess, initializer);
+        }
+
+        /**
+         * Gets either the static or instance members of a class that are decorated, or have
+         * parameters that are decorated.
+         *
+         * @param node The class containing the member.
+         * @param isStatic A value indicating whether to retrieve static or instance members of
+         *                 the class.
+         */
+        function getDecoratedClassElements(node: ClassExpression | ClassDeclaration, isStatic: boolean): ClassElement[] {
+            return filter(node.members, isStatic ? isStaticDecoratedClassElement : isInstanceDecoratedClassElement);
+        }
+
+        /**
+         * Determines whether a class member is a static member of a class that is decorated, or
+         * has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isStaticDecoratedClassElement(member: ClassElement) {
+            return isDecoratedClassElement(member, /*isStatic*/ true);
+        }
+
+        /**
+         * Determines whether a class member is an instance member of a class that is decorated,
+         * or has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isInstanceDecoratedClassElement(member: ClassElement) {
+            return isDecoratedClassElement(member, /*isStatic*/ false);
+        }
+
+        /**
+         * Determines whether a class member is either a static or an instance member of a class
+         * that is decorated, or has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isDecoratedClassElement(member: ClassElement, isStatic: boolean) {
+            return nodeOrChildIsDecorated(member)
+                && isStatic === hasModifier(member, ModifierFlags.Static);
+        }
+
+        /**
+         * A structure describing the decorators for a class element.
+         */
+        interface AllDecorators {
+            decorators: Decorator[];
+            parameters?: Decorator[][];
+        }
+
+        /**
+         * Gets an array of arrays of decorators for the parameters of a function-like node.
+         * The offset into the result array should correspond to the offset of the parameter.
+         *
+         * @param node The function-like node.
+         */
+        function getDecoratorsOfParameters(node: FunctionLikeDeclaration) {
+            let decorators: Decorator[][];
+            if (node) {
+                const parameters = node.parameters;
+                for (let i = 0; i < parameters.length; i++) {
+                    const parameter = parameters[i];
+                    if (decorators || parameter.decorators) {
+                        if (!decorators) {
+                            decorators = new Array(parameters.length);
+                        }
+
+                        decorators[i] = parameter.decorators;
+                    }
+                }
+            }
+
+            return decorators;
+        }
+
+        /**
+         * Gets an AllDecorators object containing the decorators for the class and the decorators for the
+         * parameters of the constructor of the class.
+         *
+         * @param node The class node.
+         */
+        function getAllDecoratorsOfConstructor(node: ClassExpression | ClassDeclaration): AllDecorators {
+            const decorators = node.decorators;
+            const parameters = getDecoratorsOfParameters(getFirstConstructorWithBody(node));
+            if (!decorators && !parameters) {
+                return undefined;
+            }
+
+            return {
+                decorators,
+                parameters
+            };
+        }
+
+        /**
+         * Gets an AllDecorators object containing the decorators for the member and its parameters.
+         *
+         * @param node The class node that contains the member.
+         * @param member The class member.
+         */
+        function getAllDecoratorsOfClassElement(node: ClassExpression | ClassDeclaration, member: ClassElement): AllDecorators {
+            switch (member.kind) {
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return getAllDecoratorsOfAccessors(node, <AccessorDeclaration>member);
+
+                case SyntaxKind.MethodDeclaration:
+                    return getAllDecoratorsOfMethod(<MethodDeclaration>member);
+
+                case SyntaxKind.PropertyDeclaration:
+                    return getAllDecoratorsOfProperty(<PropertyDeclaration>member);
+
+                default:
+                    return undefined;
+            }
+        }
+
+        /**
+         * Gets an AllDecorators object containing the decorators for the accessor and its parameters.
+         *
+         * @param node The class node that contains the accessor.
+         * @param accessor The class accessor member.
+         */
+        function getAllDecoratorsOfAccessors(node: ClassExpression | ClassDeclaration, accessor: AccessorDeclaration): AllDecorators {
+            if (!accessor.body) {
+                return undefined;
+            }
+
+            const { firstAccessor, secondAccessor, setAccessor } = getAllAccessorDeclarations(node.members, accessor);
+            if (accessor !== firstAccessor) {
+                return undefined;
+            }
+
+            const decorators = firstAccessor.decorators || (secondAccessor && secondAccessor.decorators);
+            const parameters = getDecoratorsOfParameters(setAccessor);
+            if (!decorators && !parameters) {
+                return undefined;
+            }
+
+            return { decorators, parameters };
+        }
+
+        /**
+         * Gets an AllDecorators object containing the decorators for the method and its parameters.
+         *
+         * @param method The class method member.
+         */
+        function getAllDecoratorsOfMethod(method: MethodDeclaration): AllDecorators {
+            if (!method.body) {
+                return undefined;
+            }
+
+            const decorators = method.decorators;
+            const parameters = getDecoratorsOfParameters(method);
+            if (!decorators && !parameters) {
+                return undefined;
+            }
+
+            return { decorators, parameters };
+        }
+
+        /**
+         * Gets an AllDecorators object containing the decorators for the property.
+         *
+         * @param property The class property member.
+         */
+        function getAllDecoratorsOfProperty(property: PropertyDeclaration): AllDecorators {
+            const decorators = property.decorators;
+            if (!decorators) {
+                return undefined;
+
+            }
+
+            return { decorators };
+        }
+
+        /**
+         * Transforms all of the decorators for a declaration into an array of expressions.
+         *
+         * @param node The declaration node.
+         * @param allDecorators An object containing all of the decorators for the declaration.
+         */
+        function transformAllDecoratorsOfDeclaration(node: Declaration, allDecorators: AllDecorators) {
+            if (!allDecorators) {
+                return undefined;
+            }
+
+            const decoratorExpressions: Expression[] = [];
+            addRange(decoratorExpressions, map(allDecorators.decorators, transformDecorator));
+            addRange(decoratorExpressions, flatMap(allDecorators.parameters, transformDecoratorsOfParameter));
+            addTypeMetadata(node, decoratorExpressions);
+            return decoratorExpressions;
+        }
+
+        /**
+         * Generates statements used to apply decorators to either the static or instance members
+         * of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate statements for static or
+         *                 instance members.
+         */
+        function addClassElementDecorationStatements(statements: Statement[], node: ClassDeclaration, isStatic: boolean) {
+            addRange(statements, map(generateClassElementDecorationExpressions(node, isStatic), expressionToStatement));
+        }
+
+        /**
+         * Generates expressions used to apply decorators to either the static or instance members
+         * of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate expressions for static or
+         *                 instance members.
+         */
+        function generateClassElementDecorationExpressions(node: ClassExpression | ClassDeclaration, isStatic: boolean) {
+            const members = getDecoratedClassElements(node, isStatic);
+            let expressions: Expression[];
+            for (const member of members) {
+                const expression = generateClassElementDecorationExpression(node, member);
+                if (expression) {
+                    if (!expressions) {
+                        expressions = [expression];
+                    }
+                    else {
+                        expressions.push(expression);
+                    }
+                }
+            }
+            return expressions;
+        }
+
+        /**
+         * Generates an expression used to evaluate class element decorators at runtime.
+         *
+         * @param node The class node that contains the member.
+         * @param member The class member.
+         */
+        function generateClassElementDecorationExpression(node: ClassExpression | ClassDeclaration, member: ClassElement) {
+            const allDecorators = getAllDecoratorsOfClassElement(node, member);
+            const decoratorExpressions = transformAllDecoratorsOfDeclaration(member, allDecorators);
+            if (!decoratorExpressions) {
+                return undefined;
+            }
+
+            // Emit the call to __decorate. Given the following:
+            //
+            //   class C {
+            //     @dec method(@dec2 x) {}
+            //     @dec get accessor() {}
+            //     @dec prop;
+            //   }
+            //
+            // The emit for a method is:
+            //
+            //   __decorate([
+            //       dec,
+            //       __param(0, dec2),
+            //       __metadata("design:type", Function),
+            //       __metadata("design:paramtypes", [Object]),
+            //       __metadata("design:returntype", void 0)
+            //   ], C.prototype, "method", undefined);
+            //
+            // The emit for an accessor is:
+            //
+            //   __decorate([
+            //       dec
+            //   ], C.prototype, "accessor", undefined);
+            //
+            // The emit for a property is:
+            //
+            //   __decorate([
+            //       dec
+            //   ], C.prototype, "prop");
+            //
+
+            const prefix = getClassMemberPrefix(node, member);
+            const memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
+            const descriptor = languageVersion > ScriptTarget.ES3
+                ? member.kind === SyntaxKind.PropertyDeclaration
+                    // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
+                    // should not invoke `Object.getOwnPropertyDescriptor`.
+                    ? createVoidZero()
+
+                    // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly.
+                    // We have this extra argument here so that we can inject an explicit property descriptor at a later date.
+                    : createNull()
+                : undefined;
+
+            const helper = createDecorateHelper(
+                currentSourceFileExternalHelpersModuleName,
+                decoratorExpressions,
+                prefix,
+                memberName,
+                descriptor,
+                moveRangePastDecorators(member)
+            );
+
+            setNodeEmitFlags(helper, NodeEmitFlags.NoComments);
+            return helper;
+        }
+
+        /**
+         * Generates a __decorate helper call for a class constructor.
+         *
+         * @param node The class node.
+         */
+        function addConstructorDecorationStatement(statements: Statement[], node: ClassDeclaration, decoratedClassAlias: Identifier) {
+            const expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
+            if (expression) {
+                statements.push(setOriginalNode(createStatement(expression), node));
+            }
+        }
+
+        /**
+         * Generates a __decorate helper call for a class constructor.
+         *
+         * @param node The class node.
+         */
+        function generateConstructorDecorationExpression(node: ClassExpression | ClassDeclaration, decoratedClassAlias: Identifier) {
+            const allDecorators = getAllDecoratorsOfConstructor(node);
+            const decoratorExpressions = transformAllDecoratorsOfDeclaration(node, allDecorators);
+            if (!decoratorExpressions) {
+                return undefined;
+            }
+
+            // Emit the call to __decorate. Given the class:
+            //
+            //   @dec
+            //   class C {
+            //   }
+            //
+            // The emit for the class is:
+            //
+            //   C = C_1 = __decorate([dec], C);
+            //
+            if (decoratedClassAlias) {
+                const expression = createAssignment(
+                    decoratedClassAlias,
+                    createDecorateHelper(
+                        currentSourceFileExternalHelpersModuleName,
+                        decoratorExpressions,
+                        getDeclarationName(node)
+                    )
+                );
+
+                const result = createAssignment(getDeclarationName(node), expression, moveRangePastDecorators(node));
+                setNodeEmitFlags(result, NodeEmitFlags.NoComments);
+                return result;
+            }
+            // Emit the call to __decorate. Given the class:
+            //
+            //   @dec
+            //   export declare class C {
+            //   }
+            //
+            // The emit for the class is:
+            //
+            //   C = __decorate([dec], C);
+            //
+            else {
+                const result = createAssignment(
+                    getDeclarationName(node),
+                    createDecorateHelper(
+                        currentSourceFileExternalHelpersModuleName,
+                        decoratorExpressions,
+                        getDeclarationName(node)
+                    ),
+                    moveRangePastDecorators(node)
+                );
+
+                setNodeEmitFlags(result, NodeEmitFlags.NoComments);
+                return result;
+            }
+        }
+
+        /**
+         * Transforms a decorator into an expression.
+         *
+         * @param decorator The decorator node.
+         */
+        function transformDecorator(decorator: Decorator) {
+            return visitNode(decorator.expression, visitor, isExpression);
+        }
+
+        /**
+         * Transforms the decorators of a parameter.
+         *
+         * @param decorators The decorators for the parameter at the provided offset.
+         * @param parameterOffset The offset of the parameter.
+         */
+        function transformDecoratorsOfParameter(decorators: Decorator[], parameterOffset: number) {
+            let expressions: Expression[];
+            if (decorators) {
+                expressions = [];
+                for (const decorator of decorators) {
+                    const helper = createParamHelper(
+                        currentSourceFileExternalHelpersModuleName,
+                        transformDecorator(decorator),
+                        parameterOffset,
+                        /*location*/ decorator.expression);
+                    setNodeEmitFlags(helper, NodeEmitFlags.NoComments);
+                    expressions.push(helper);
+                }
+            }
+
+            return expressions;
+        }
+
+        /**
+         * Adds optional type metadata for a declaration.
+         *
+         * @param node The declaration node.
+         * @param decoratorExpressions The destination array to which to add new decorator expressions.
+         */
+        function addTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
+            if (USE_NEW_TYPE_METADATA_FORMAT) {
+                addNewTypeMetadata(node, decoratorExpressions);
+            }
+            else {
+                addOldTypeMetadata(node, decoratorExpressions);
+            }
+        }
+
+        function addOldTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
+            if (compilerOptions.emitDecoratorMetadata) {
+                if (shouldAddTypeMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                }
+                if (shouldAddParamTypesMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                }
+                if (shouldAddReturnTypeMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                }
+            }
+        }
+
+        function addNewTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
+            if (compilerOptions.emitDecoratorMetadata) {
+                let properties: ObjectLiteralElement[];
+                if (shouldAddTypeMetadata(node)) {
+                    (properties || (properties = [])).push(createPropertyAssignment("type", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeTypeOfNode(node))));
+                }
+                if (shouldAddParamTypesMetadata(node)) {
+                    (properties || (properties = [])).push(createPropertyAssignment("paramTypes", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeParameterTypesOfNode(node))));
+                }
+                if (shouldAddReturnTypeMetadata(node)) {
+                    (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeReturnTypeOfNode(node))));
+                }
+                if (properties) {
+                    decoratorExpressions.push(createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
+                }
+            }
+        }
+
+        /**
+         * Determines whether to emit the "design:type" metadata based on the node's kind.
+         * The caller should have already tested whether the node has decorators and whether the
+         * emitDecoratorMetadata compiler option is set.
+         *
+         * @param node The node to test.
+         */
+        function shouldAddTypeMetadata(node: Declaration): boolean {
+            const kind = node.kind;
+            return kind === SyntaxKind.MethodDeclaration
+                || kind === SyntaxKind.GetAccessor
+                || kind === SyntaxKind.SetAccessor
+                || kind === SyntaxKind.PropertyDeclaration;
+        }
+
+        /**
+         * Determines whether to emit the "design:returntype" metadata based on the node's kind.
+         * The caller should have already tested whether the node has decorators and whether the
+         * emitDecoratorMetadata compiler option is set.
+         *
+         * @param node The node to test.
+         */
+        function shouldAddReturnTypeMetadata(node: Declaration): boolean {
+            return node.kind === SyntaxKind.MethodDeclaration;
+        }
+
+        /**
+         * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
+         * The caller should have already tested whether the node has decorators and whether the
+         * emitDecoratorMetadata compiler option is set.
+         *
+         * @param node The node to test.
+         */
+        function shouldAddParamTypesMetadata(node: Declaration): boolean {
+            const kind = node.kind;
+            return kind === SyntaxKind.ClassDeclaration
+                || kind === SyntaxKind.ClassExpression
+                || kind === SyntaxKind.MethodDeclaration
+                || kind === SyntaxKind.GetAccessor
+                || kind === SyntaxKind.SetAccessor;
+        }
+
+        /**
+         * Serializes the type of a node for use with decorator type metadata.
+         *
+         * @param node The node that should have its type serialized.
+         */
+        function serializeTypeOfNode(node: Node): Expression {
+            switch (node.kind) {
+                case SyntaxKind.PropertyDeclaration:
+                case SyntaxKind.Parameter:
+                case SyntaxKind.GetAccessor:
+                    return serializeTypeNode((<PropertyDeclaration | ParameterDeclaration | GetAccessorDeclaration>node).type);
+                case SyntaxKind.SetAccessor:
+                    return serializeTypeNode(getSetAccessorTypeAnnotationNode(<SetAccessorDeclaration>node));
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.ClassExpression:
+                case SyntaxKind.MethodDeclaration:
+                    return createIdentifier("Function");
+                default:
+                    return createVoidZero();
+            }
+        }
+
+        /**
+         * Gets the most likely element type for a TypeNode. This is not an exhaustive test
+         * as it assumes a rest argument can only be an array type (either T[], or Array<T>).
+         *
+         * @param node The type node.
+         */
+        function getRestParameterElementType(node: TypeNode) {
+            if (node && node.kind === SyntaxKind.ArrayType) {
+                return (<ArrayTypeNode>node).elementType;
+            }
+            else if (node && node.kind === SyntaxKind.TypeReference) {
+                return singleOrUndefined((<TypeReferenceNode>node).typeArguments);
+            }
+            else {
+                return undefined;
+            }
+        }
+
+        /**
+         * Serializes the types of the parameters of a node for use with decorator type metadata.
+         *
+         * @param node The node that should have its parameter types serialized.
+         */
+        function serializeParameterTypesOfNode(node: Node): Expression {
+            const valueDeclaration =
+                isClassLike(node)
+                    ? getFirstConstructorWithBody(node)
+                    : isFunctionLike(node) && nodeIsPresent(node.body)
+                        ? node
+                        : undefined;
+
+            const expressions: Expression[] = [];
+            if (valueDeclaration) {
+                const parameters = valueDeclaration.parameters;
+                const numParameters = parameters.length;
+                for (let i = 0; i < numParameters; i++) {
+                    const parameter = parameters[i];
+                    if (i === 0 && isIdentifier(parameter.name) && parameter.name.text === "this") {
+                        continue;
+                    }
+                    if (parameter.dotDotDotToken) {
+                        expressions.push(serializeTypeNode(getRestParameterElementType(parameter.type)));
+                    }
+                    else {
+                        expressions.push(serializeTypeOfNode(parameter));
+                    }
+                }
+            }
+
+            return createArrayLiteral(expressions);
+        }
+
+        /**
+         * Serializes the return type of a node for use with decorator type metadata.
+         *
+         * @param node The node that should have its return type serialized.
+         */
+        function serializeReturnTypeOfNode(node: Node): Expression {
+            if (isFunctionLike(node) && node.type) {
+                return serializeTypeNode(node.type);
+            }
+            else if (isAsyncFunctionLike(node)) {
+                return createIdentifier("Promise");
+            }
+
+            return createVoidZero();
+        }
+
+        /**
+         * Serializes a type node for use with decorator type metadata.
+         *
+         * Types are serialized in the following fashion:
+         * - Void types point to "undefined" (e.g. "void 0")
+         * - Function and Constructor types point to the global "Function" constructor.
+         * - Interface types with a call or construct signature types point to the global
+         *   "Function" constructor.
+         * - Array and Tuple types point to the global "Array" constructor.
+         * - Type predicates and booleans point to the global "Boolean" constructor.
+         * - String literal types and strings point to the global "String" constructor.
+         * - Enum and number types point to the global "Number" constructor.
+         * - Symbol types point to the global "Symbol" constructor.
+         * - Type references to classes (or class-like variables) point to the constructor for the class.
+         * - Anything else points to the global "Object" constructor.
+         *
+         * @param node The type node to serialize.
+         */
+        function serializeTypeNode(node: TypeNode): Expression {
+            if (node === undefined) {
+                return createIdentifier("Object");
+            }
+
+            switch (node.kind) {
+                case SyntaxKind.VoidKeyword:
+                    return createVoidZero();
+
+                case SyntaxKind.ParenthesizedType:
+                    return serializeTypeNode((<ParenthesizedTypeNode>node).type);
+
+                case SyntaxKind.FunctionType:
+                case SyntaxKind.ConstructorType:
+                    return createIdentifier("Function");
+
+                case SyntaxKind.ArrayType:
+                case SyntaxKind.TupleType:
+                    return createIdentifier("Array");
+
+                case SyntaxKind.TypePredicate:
+                case SyntaxKind.BooleanKeyword:
+                    return createIdentifier("Boolean");
+
+                case SyntaxKind.StringKeyword:
+                    return createIdentifier("String");
+
+                case SyntaxKind.LiteralType:
+                    switch ((<LiteralTypeNode>node).literal.kind) {
+                        case SyntaxKind.StringLiteral:
+                            return createIdentifier("String");
+
+                        case SyntaxKind.NumericLiteral:
+                            return createIdentifier("Number");
+
+                        case SyntaxKind.TrueKeyword:
+                        case SyntaxKind.FalseKeyword:
+                            return createIdentifier("Boolean");
+
+                        default:
+                            Debug.failBadSyntaxKind((<LiteralTypeNode>node).literal);
+                            break;
+                    }
+                    break;
+
+                case SyntaxKind.NumberKeyword:
+                    return createIdentifier("Number");
+
+                case SyntaxKind.SymbolKeyword:
+                    return languageVersion < ScriptTarget.ES6
+                        ? getGlobalSymbolNameWithFallback()
+                        : createIdentifier("Symbol");
+
+                case SyntaxKind.TypeReference:
+                    return serializeTypeReferenceNode(<TypeReferenceNode>node);
+
+                case SyntaxKind.TypeQuery:
+                case SyntaxKind.TypeLiteral:
+                case SyntaxKind.UnionType:
+                case SyntaxKind.IntersectionType:
+                case SyntaxKind.AnyKeyword:
+                case SyntaxKind.ThisType:
+                    break;
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    break;
+            }
+
+            return createIdentifier("Object");
+        }
+
+        /**
+         * Serializes a TypeReferenceNode to an appropriate JS constructor value for use with
+         * decorator type metadata.
+         *
+         * @param node The type reference node.
+         */
+        function serializeTypeReferenceNode(node: TypeReferenceNode) {
+            switch (resolver.getTypeReferenceSerializationKind(node.typeName, currentScope)) {
+                case TypeReferenceSerializationKind.Unknown:
+                    const serialized = serializeEntityNameAsExpression(node.typeName, /*useFallback*/ true);
+                    const temp = createTempVariable(hoistVariableDeclaration);
+                    return createLogicalOr(
+                        createLogicalAnd(
+                            createStrictEquality(
+                                createTypeOf(
+                                    createAssignment(temp, serialized)
+                                ),
+                                createLiteral("function")
+                            ),
+                            temp
+                        ),
+                        createIdentifier("Object")
+                    );
+
+                case TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
+                    return serializeEntityNameAsExpression(node.typeName, /*useFallback*/ false);
+
+                case TypeReferenceSerializationKind.VoidNullableOrNeverType:
+                    return createVoidZero();
+
+                case TypeReferenceSerializationKind.BooleanType:
+                    return createIdentifier("Boolean");
+
+                case TypeReferenceSerializationKind.NumberLikeType:
+                    return createIdentifier("Number");
+
+                case TypeReferenceSerializationKind.StringLikeType:
+                    return createIdentifier("String");
+
+                case TypeReferenceSerializationKind.ArrayLikeType:
+                    return createIdentifier("Array");
+
+                case TypeReferenceSerializationKind.ESSymbolType:
+                    return languageVersion < ScriptTarget.ES6
+                        ? getGlobalSymbolNameWithFallback()
+                        : createIdentifier("Symbol");
+
+                case TypeReferenceSerializationKind.TypeWithCallSignature:
+                    return createIdentifier("Function");
+
+                case TypeReferenceSerializationKind.Promise:
+                    return createIdentifier("Promise");
+
+                case TypeReferenceSerializationKind.ObjectType:
+                default:
+                    return createIdentifier("Object");
+            }
+        }
+
+        /**
+         * Serializes an entity name as an expression for decorator type metadata.
+         *
+         * @param node The entity name to serialize.
+         * @param useFallback A value indicating whether to use logical operators to test for the
+         *                    entity name at runtime.
+         */
+        function serializeEntityNameAsExpression(node: EntityName, useFallback: boolean): Expression {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    // Create a clone of the name with a new parent, and treat it as if it were
+                    // a source tree node for the purposes of the checker.
+                    const name = getMutableClone(<Identifier>node);
+                    name.flags &= ~NodeFlags.Synthesized;
+                    name.original = undefined;
+                    name.parent = currentScope;
+                    if (useFallback) {
+                        return createLogicalAnd(
+                            createStrictInequality(
+                                createTypeOf(name),
+                                createLiteral("undefined")
+                            ),
+                            name
+                        );
+                    }
+
+                    return name;
+
+                case SyntaxKind.QualifiedName:
+                    return serializeQualifiedNameAsExpression(<QualifiedName>node, useFallback);
+            }
+        }
+
+        /**
+         * Serializes an qualified name as an expression for decorator type metadata.
+         *
+         * @param node The qualified name to serialize.
+         * @param useFallback A value indicating whether to use logical operators to test for the
+         *                    qualified name at runtime.
+         */
+        function serializeQualifiedNameAsExpression(node: QualifiedName, useFallback: boolean): Expression {
+            let left: Expression;
+            if (node.left.kind === SyntaxKind.Identifier) {
+                left = serializeEntityNameAsExpression(node.left, useFallback);
+            }
+            else if (useFallback) {
+                const temp = createTempVariable(hoistVariableDeclaration);
+                left = createLogicalAnd(
+                    createAssignment(
+                        temp,
+                        serializeEntityNameAsExpression(node.left, /*useFallback*/ true)
+                    ),
+                    temp
+                );
+            }
+            else {
+                left = serializeEntityNameAsExpression(node.left, /*useFallback*/ false);
+            }
+
+            return createPropertyAccess(left, node.right);
+        }
+
+        /**
+         * Gets an expression that points to the global "Symbol" constructor at runtime if it is
+         * available.
+         */
+        function getGlobalSymbolNameWithFallback(): Expression {
+            return createConditional(
+                createStrictEquality(
+                    createTypeOf(createIdentifier("Symbol")),
+                    createLiteral("function")
+                ),
+                createToken(SyntaxKind.QuestionToken),
+                createIdentifier("Symbol"),
+                createToken(SyntaxKind.ColonToken),
+                createIdentifier("Object")
+            );
+        }
+
+        /**
+         * Gets an expression that represents a property name. For a computed property, a
+         * name is generated for the node.
+         *
+         * @param member The member whose name should be converted into an expression.
+         */
+        function getExpressionForPropertyName(member: ClassElement | EnumMember, generateNameForComputedPropertyName: boolean): Expression {
+            const name = member.name;
+            if (isComputedPropertyName(name)) {
+                return generateNameForComputedPropertyName
+                    ? getGeneratedNameForNode(name)
+                    : (<ComputedPropertyName>name).expression;
+            }
+            else if (isIdentifier(name)) {
+                return createLiteral(name.text);
+            }
+            else {
+                return getSynthesizedClone(name);
+            }
+        }
+
+        /**
+         * Visits the property name of a class element, for use when emitting property
+         * initializers. For a computed property on a node with decorators, a temporary
+         * value is stored for later use.
+         *
+         * @param member The member whose name should be visited.
+         */
+        function visitPropertyNameOfClassElement(member: ClassElement): PropertyName {
+            const name = member.name;
+            if (isComputedPropertyName(name)) {
+                let expression = visitNode(name.expression, visitor, isExpression);
+                if (member.decorators) {
+                    const generatedName = getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    expression = createAssignment(generatedName, expression);
+                }
+
+                return setOriginalNode(
+                    createComputedPropertyName(expression, /*location*/ name),
+                    name
+                );
+            }
+            else {
+                return name;
+            }
+        }
+
+        /**
+         * Transforms a HeritageClause with TypeScript syntax.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The node is a non-`extends` heritage clause that should be elided.
+         * - The node is an `extends` heritage clause that should be visited, but only allow a single type.
+         *
+         * @param node The HeritageClause to transform.
+         */
+        function visitHeritageClause(node: HeritageClause): HeritageClause {
+            if (node.token === SyntaxKind.ExtendsKeyword) {
+                const types = visitNodes(node.types, visitor, isExpressionWithTypeArguments, 0, 1);
+                return createHeritageClause(
+                    SyntaxKind.ExtendsKeyword,
+                    types,
+                    node
+                );
+            }
+
+            return undefined;
+        }
+
+        /**
+         * Transforms an ExpressionWithTypeArguments with TypeScript syntax.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The node contains type arguments that should be elided.
+         *
+         * @param node The ExpressionWithTypeArguments to transform.
+         */
+        function visitExpressionWithTypeArguments(node: ExpressionWithTypeArguments): ExpressionWithTypeArguments {
+            const expression = visitNode(node.expression, visitor, isLeftHandSideExpression);
+            return createExpressionWithTypeArguments(
+                /*typeArguments*/ undefined,
+                expression,
+                node
+            );
+        }
+
+        /**
+         * Determines whether to emit a function-like declaration. We should not emit the
+         * declaration if it does not have a body.
+         *
+         * @param node The declaration node.
+         */
+        function shouldEmitFunctionLikeDeclaration(node: FunctionLikeDeclaration) {
+            return !nodeIsMissing(node.body);
+        }
+
+        /**
+         * Visits a method declaration of a class.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is an overload
+         * - The node is marked as abstract, async, public, private, protected, or readonly
+         * - The node has both a decorator and a computed property name
+         *
+         * @param node The method node.
+         */
+        function visitMethodDeclaration(node: MethodDeclaration) {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return undefined;
+            }
+
+            const method = createMethod(
+                /*decorators*/ undefined,
+                visitNodes(node.modifiers, visitor, isModifier),
+                node.asteriskToken,
+                visitPropertyNameOfClassElement(node),
+                /*typeParameters*/ undefined,
+                visitNodes(node.parameters, visitor, isParameter),
+                /*type*/ undefined,
+                transformFunctionBody(node),
+                /*location*/ node
+            );
+
+            // While we emit the source map for the node after skipping decorators and modifiers,
+            // we need to emit the comments for the original range.
+            setCommentRange(method, node);
+            setSourceMapRange(method, moveRangePastDecorators(node));
+            setOriginalNode(method, node);
+
+            return method;
+        }
+
+        /**
+         * Determines whether to emit an accessor declaration. We should not emit the
+         * declaration if it does not have a body and is abstract.
+         *
+         * @param node The declaration node.
+         */
+        function shouldEmitAccessorDeclaration(node: AccessorDeclaration) {
+            return !(nodeIsMissing(node.body) && hasModifier(node, ModifierFlags.Abstract));
+        }
+
+        /**
+         * Visits a get accessor declaration of a class.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked as abstract, public, private, or protected
+         * - The node has both a decorator and a computed property name
+         *
+         * @param node The get accessor node.
+         */
+        function visitGetAccessor(node: GetAccessorDeclaration) {
+            if (!shouldEmitAccessorDeclaration(node)) {
+                return undefined;
+            }
+
+            const accessor = createGetAccessor(
+                /*decorators*/ undefined,
+                visitNodes(node.modifiers, visitor, isModifier),
+                visitPropertyNameOfClassElement(node),
+                visitNodes(node.parameters, visitor, isParameter),
+                /*type*/ undefined,
+                node.body ? visitEachChild(node.body, visitor, context) : createBlock([]),
+                /*location*/ node
+            );
+
+            // While we emit the source map for the node after skipping decorators and modifiers,
+            // we need to emit the comments for the original range.
+            setCommentRange(accessor, node);
+            setSourceMapRange(accessor, moveRangePastDecorators(node));
+            setOriginalNode(accessor, node);
+
+            return accessor;
+        }
+
+        /**
+         * Visits a set accessor declaration of a class.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked as abstract, public, private, or protected
+         * - The node has both a decorator and a computed property name
+         *
+         * @param node The set accessor node.
+         */
+        function visitSetAccessor(node: SetAccessorDeclaration) {
+            if (!shouldEmitAccessorDeclaration(node)) {
+                return undefined;
+            }
+
+            const accessor = createSetAccessor(
+                /*decorators*/ undefined,
+                visitNodes(node.modifiers, visitor, isModifier),
+                visitPropertyNameOfClassElement(node),
+                visitNodes(node.parameters, visitor, isParameter),
+                node.body ? visitEachChild(node.body, visitor, context) : createBlock([]),
+                /*location*/ node
+            );
+
+            // While we emit the source map for the node after skipping decorators and modifiers,
+            // we need to emit the comments for the original range.
+            setCommentRange(accessor, node);
+            setSourceMapRange(accessor, moveRangePastDecorators(node));
+            setOriginalNode(accessor, node);
+
+            return accessor;
+        }
+
+        /**
+         * Visits a function declaration.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is an overload
+         * - The node is marked async
+         * - The node is exported from a TypeScript namespace
+         *
+         * @param node The function node.
+         */
+        function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return createNotEmittedStatement(node);
+            }
+
+            const func = createFunctionDeclaration(
+                /*decorators*/ undefined,
+                visitNodes(node.modifiers, visitor, isModifier),
+                node.asteriskToken,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitNodes(node.parameters, visitor, isParameter),
+                /*type*/ undefined,
+                transformFunctionBody(node),
+                /*location*/ node
+            );
+            setOriginalNode(func, node);
+
+            if (isNamespaceExport(node)) {
+                const statements: Statement[] = [func];
+                addExportMemberAssignment(statements, node);
+                return statements;
+            }
+
+            return func;
+        }
+
+        /**
+         * Visits a function expression node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked async
+         *
+         * @param node The function expression node.
+         */
+        function visitFunctionExpression(node: FunctionExpression) {
+            if (nodeIsMissing(node.body)) {
+                return createOmittedExpression();
+            }
+
+            const func = createFunctionExpression(
+                node.asteriskToken,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitNodes(node.parameters, visitor, isParameter),
+                /*type*/ undefined,
+                transformFunctionBody(node),
+                /*location*/ node
+            );
+
+            setOriginalNode(func, node);
+
+            return func;
+        }
+
+        /**
+         * @remarks
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked async
+         */
+        function visitArrowFunction(node: ArrowFunction) {
+            const func = createArrowFunction(
+                /*modifiers*/ undefined,
+                /*typeParameters*/ undefined,
+                visitNodes(node.parameters, visitor, isParameter),
+                /*type*/ undefined,
+                node.equalsGreaterThanToken,
+                transformConciseBody(node),
+                /*location*/ node
+            );
+
+            setOriginalNode(func, node);
+
+            return func;
+        }
+
+        function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
+            if (isAsyncFunctionLike(node)) {
+                return <FunctionBody>transformAsyncFunctionBody(node);
+            }
+
+            return transformFunctionBodyWorker(node.body);
+        }
+
+        function transformFunctionBodyWorker(body: Block, start = 0) {
+            const savedCurrentScope = currentScope;
+            currentScope = body;
+            startLexicalEnvironment();
+
+            const statements = visitNodes(body.statements, visitor, isStatement, start);
+            const visited = updateBlock(body, statements);
+            const declarations = endLexicalEnvironment();
+            currentScope = savedCurrentScope;
+            return mergeFunctionBodyLexicalEnvironment(visited, declarations);
+        }
+
+        function transformConciseBody(node: ArrowFunction): ConciseBody {
+            if (isAsyncFunctionLike(node)) {
+                return transformAsyncFunctionBody(node);
+            }
+
+            return transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ false);
+        }
+
+        function transformConciseBodyWorker(body: Block | Expression, forceBlockFunctionBody: boolean) {
+            if (isBlock(body)) {
+                return transformFunctionBodyWorker(body);
+            }
+            else {
+                startLexicalEnvironment();
+                const visited: Expression | Block = visitNode(body, visitor, isConciseBody);
+                const declarations = endLexicalEnvironment();
+                const merged = mergeFunctionBodyLexicalEnvironment(visited, declarations);
+                if (forceBlockFunctionBody && !isBlock(merged)) {
+                    return createBlock([
+                        createReturn(<Expression>merged)
+                    ]);
+                }
+                else {
+                    return merged;
+                }
+            }
+        }
+
+        function getPromiseConstructor(type: TypeNode) {
+            const typeName = getEntityNameFromTypeNode(type);
+            if (typeName && isEntityName(typeName)) {
+                const serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                if (serializationKind === TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                    || serializationKind === TypeReferenceSerializationKind.Unknown) {
+                    return typeName;
+                }
+            }
+
+            return undefined;
+        }
+
+        function transformAsyncFunctionBody(node: FunctionLikeDeclaration): ConciseBody | FunctionBody {
+            const promiseConstructor = languageVersion < ScriptTarget.ES6 ? getPromiseConstructor(node.type) : undefined;
+            const isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
+            const hasLexicalArguments = (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureArguments) !== 0;
+
+            // An async function is emit as an outer function that calls an inner
+            // generator function. To preserve lexical bindings, we pass the current
+            // `this` and `arguments` objects to `__awaiter`. The generator function
+            // passed to `__awaiter` is executed inside of the callback to the
+            // promise constructor.
+
+
+            if (!isArrowFunction) {
+                const statements: Statement[] = [];
+                const statementOffset = addPrologueDirectives(statements, (<Block>node.body).statements, /*ensureUseStrict*/ false, visitor);
+                statements.push(
+                    createReturn(
+                        createAwaiterHelper(
+                            currentSourceFileExternalHelpersModuleName,
+                            hasLexicalArguments,
+                            promiseConstructor,
+                            transformFunctionBodyWorker(<Block>node.body, statementOffset)
+                        )
+                    )
+                );
+
+                const block = createBlock(statements, /*location*/ node.body, /*multiLine*/ true);
+
+                // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
+                // This step isn't needed if we eventually transform this to ES5.
+                if (languageVersion >= ScriptTarget.ES6) {
+                    if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuperBinding) {
+                        enableSubstitutionForAsyncMethodsWithSuper();
+                        setNodeEmitFlags(block, NodeEmitFlags.EmitAdvancedSuperHelper);
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) {
+                        enableSubstitutionForAsyncMethodsWithSuper();
+                        setNodeEmitFlags(block, NodeEmitFlags.EmitSuperHelper);
+                    }
+                }
+
+                return block;
+            }
+            else {
+                return createAwaiterHelper(
+                    currentSourceFileExternalHelpersModuleName,
+                    hasLexicalArguments,
+                    promiseConstructor,
+                    <Block>transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ true)
+                );
+            }
+        }
+
+        /**
+         * Visits a parameter declaration node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node has an accessibility modifier.
+         * - The node has a questionToken.
+         * - The node's kind is ThisKeyword.
+         *
+         * @param node The parameter declaration node.
+         */
+        function visitParameter(node: ParameterDeclaration) {
+            if (node.name && isIdentifier(node.name) && node.name.originalKeywordKind === SyntaxKind.ThisKeyword) {
+                return undefined;
+            }
+
+            const parameter = createParameterDeclaration(
+                /*decorators*/ undefined,
+                /*modifiers*/ undefined,
+                node.dotDotDotToken,
+                visitNode(node.name, visitor, isBindingName),
+                /*questionToken*/ undefined,
+                /*type*/ undefined,
+                visitNode(node.initializer, visitor, isExpression),
+                /*location*/ moveRangePastModifiers(node)
+            );
+
+            // While we emit the source map for the node after skipping decorators and modifiers,
+            // we need to emit the comments for the original range.
+            setOriginalNode(parameter, node);
+            setCommentRange(parameter, node);
+            setSourceMapRange(parameter, moveRangePastModifiers(node));
+            setNodeEmitFlags(parameter.name, NodeEmitFlags.NoTrailingSourceMap);
+
+            return parameter;
+        }
+
+        /**
+         * Visits a variable statement in a namespace.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is exported from a TypeScript namespace.
+         */
+        function visitVariableStatement(node: VariableStatement): Statement {
+            if (isNamespaceExport(node)) {
+                const variables = getInitializedVariables(node.declarationList);
+                if (variables.length === 0) {
+                    // elide statement if there are no initialized variables.
+                    return undefined;
+                }
+
+                return createStatement(
+                    inlineExpressions(
+                        map(variables, transformInitializedVariable)
+                    ),
+                    /*location*/ node
+                );
+            }
+            else {
+                return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function transformInitializedVariable(node: VariableDeclaration): Expression {
+            const name = node.name;
+            if (isBindingPattern(name)) {
+                return flattenVariableDestructuringToExpression(
+                    context,
+                    node,
+                    hoistVariableDeclaration,
+                    getNamespaceMemberNameWithSourceMapsAndWithoutComments,
+                    visitor
+                );
+            }
+            else {
+                return createAssignment(
+                    getNamespaceMemberNameWithSourceMapsAndWithoutComments(name),
+                    visitNode(node.initializer, visitor, isExpression),
+                    /*location*/ node
+                );
+            }
+        }
+
+        /**
+         * Visits an await expression.
+         *
+         * This function will be called any time a TypeScript await expression is encountered.
+         *
+         * @param node The await expression node.
+         */
+        function visitAwaitExpression(node: AwaitExpression): Expression {
+            return setOriginalNode(
+                createYield(
+                    /*asteriskToken*/ undefined,
+                    visitNode(node.expression, visitor, isExpression),
+                    /*location*/ node
+                ),
+                node
+            );
+        }
+
+        /**
+         * Visits a parenthesized expression that contains either a type assertion or an `as`
+         * expression.
+         *
+         * @param node The parenthesized expression node.
+         */
+        function visitParenthesizedExpression(node: ParenthesizedExpression): Expression {
+            const innerExpression = skipOuterExpressions(node.expression, ~OuterExpressionKinds.Assertions);
+            if (isAssertionExpression(innerExpression)) {
+                // Make sure we consider all nested cast expressions, e.g.:
+                // (<any><number><any>-A).x;
+                const expression = visitNode(node.expression, visitor, isExpression);
+
+                // We have an expression of the form: (<Type>SubExpr). Emitting this as (SubExpr)
+                // is really not desirable. We would like to emit the subexpression as-is. Omitting
+                // the parentheses, however, could cause change in the semantics of the generated
+                // code if the casted expression has a lower precedence than the rest of the
+                // expression.
+                //
+                // Due to the auto-parenthesization rules used by the visitor and factory functions
+                // we can safely elide the parentheses here, as a new synthetic
+                // ParenthesizedExpression will be inserted if we remove parentheses too
+                // aggressively.
+                //
+                // To preserve comments, we return a "PartiallyEmittedExpression" here which will
+                // preserve the position information of the original expression.
+                return createPartiallyEmittedExpression(expression, node);
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitAssertionExpression(node: AssertionExpression): Expression {
+            const expression = visitNode(node.expression, visitor, isExpression);
+            return createPartiallyEmittedExpression(expression, node);
+        }
+
+        function visitNonNullExpression(node: NonNullExpression): Expression {
+            const expression = visitNode(node.expression, visitor, isLeftHandSideExpression);
+            return createPartiallyEmittedExpression(expression, node);
+        }
+
+        /**
+         * Determines whether to emit an enum declaration.
+         *
+         * @param node The enum declaration node.
+         */
+        function shouldEmitEnumDeclaration(node: EnumDeclaration) {
+            return !isConst(node)
+                || compilerOptions.preserveConstEnums
+                || compilerOptions.isolatedModules;
+        }
+
+        function shouldEmitVarForEnumDeclaration(node: EnumDeclaration | ModuleDeclaration) {
+            return !hasModifier(node, ModifierFlags.Export)
+                || (isES6ExportedDeclaration(node) && isFirstDeclarationOfKind(node, node.kind));
+        }
+
+        /*
+         * Adds a trailing VariableStatement for an enum or module declaration.
+         */
+        function addVarForEnumExportedFromNamespace(statements: Statement[], node: EnumDeclaration | ModuleDeclaration) {
+            const statement = createVariableStatement(
+                /*modifiers*/ undefined,
+                [createVariableDeclaration(
+                    getDeclarationName(node),
+                    /*type*/ undefined,
+                    getExportName(node)
+                )]
+            );
+            setSourceMapRange(statement, node);
+            statements.push(statement);
+        }
+
+        /**
+         * Visits an enum declaration.
+         *
+         * This function will be called any time a TypeScript enum is encountered.
+         *
+         * @param node The enum declaration node.
+         */
+        function visitEnumDeclaration(node: EnumDeclaration): VisitResult<Statement> {
+            if (!shouldEmitEnumDeclaration(node)) {
+                return undefined;
+            }
+
+            const statements: Statement[] = [];
+
+            // We request to be advised when the printer is about to print this node. This allows
+            // us to set up the correct state for later substitutions.
+            let emitFlags = NodeEmitFlags.AdviseOnEmitNode;
+
+            // If needed, we should emit a variable declaration for the enum. If we emit
+            // a leading variable declaration, we should not emit leading comments for the
+            // enum body.
+            if (shouldEmitVarForEnumDeclaration(node)) {
+                addVarForEnumOrModuleDeclaration(statements, node);
+
+                // We should still emit the comments if we are emitting a system module.
+                if (moduleKind !== ModuleKind.System || currentScope !== currentSourceFile) {
+                    emitFlags |= NodeEmitFlags.NoLeadingComments;
+                }
+            }
+
+            // `parameterName` is the declaration name used inside of the enum.
+            const parameterName = getNamespaceParameterName(node);
+
+            // `containerName` is the expression used inside of the enum for assignments.
+            const containerName = getNamespaceContainerName(node);
+
+            // `exportName` is the expression used within this node's container for any exported references.
+            const exportName = getExportName(node);
+
+            //  (function (x) {
+            //      x[x["y"] = 0] = "y";
+            //      ...
+            //  })(x || (x = {}));
+            const enumStatement = createStatement(
+                createCall(
+                    createFunctionExpression(
+                        /*asteriskToken*/ undefined,
+                        /*name*/ undefined,
+                        /*typeParameters*/ undefined,
+                        [createParameter(parameterName)],
+                        /*type*/ undefined,
+                        transformEnumBody(node, containerName)
+                    ),
+                    /*typeArguments*/ undefined,
+                    [createLogicalOr(
+                        exportName,
+                        createAssignment(
+                            exportName,
+                            createObjectLiteral()
+                        )
+                    )]
+                ),
+                /*location*/ node
+            );
+
+            setOriginalNode(enumStatement, node);
+            setNodeEmitFlags(enumStatement, emitFlags);
+            statements.push(enumStatement);
+
+            if (isNamespaceExport(node)) {
+                addVarForEnumExportedFromNamespace(statements, node);
+            }
+
+            return statements;
+        }
+
+        /**
+         * Transforms the body of an enum declaration.
+         *
+         * @param node The enum declaration node.
+         */
+        function transformEnumBody(node: EnumDeclaration, localName: Identifier): Block {
+            const savedCurrentNamespaceLocalName = currentNamespaceContainerName;
+            currentNamespaceContainerName = localName;
+
+            const statements: Statement[] = [];
+            startLexicalEnvironment();
+            addRange(statements, map(node.members, transformEnumMember));
+            addRange(statements, endLexicalEnvironment());
+
+            currentNamespaceContainerName = savedCurrentNamespaceLocalName;
+            return createBlock(
+                createNodeArray(statements, /*location*/ node.members),
+                /*location*/ undefined,
+                /*multiLine*/ true
+            );
+        }
+
+        /**
+         * Transforms an enum member into a statement.
+         *
+         * @param member The enum member node.
+         */
+        function transformEnumMember(member: EnumMember): Statement {
+            // enums don't support computed properties
+            // we pass false as 'generateNameForComputedPropertyName' for a backward compatibility purposes
+            // old emitter always generate 'expression' part of the name as-is.
+            const name = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ false);
+            return createStatement(
+                createAssignment(
+                    createElementAccess(
+                        currentNamespaceContainerName,
+                        createAssignment(
+                            createElementAccess(
+                                currentNamespaceContainerName,
+                                name
+                            ),
+                            transformEnumMemberDeclarationValue(member)
+                        )
+                    ),
+                    name,
+                    /*location*/ member
+                ),
+                /*location*/ member
+            );
+        }
+
+        /**
+         * Transforms the value of an enum member.
+         *
+         * @param member The enum member node.
+         */
+        function transformEnumMemberDeclarationValue(member: EnumMember): Expression {
+            const value = resolver.getConstantValue(member);
+            if (value !== undefined) {
+                return createLiteral(value);
+            }
+            else {
+                enableSubstitutionForNonQualifiedEnumMembers();
+                if (member.initializer) {
+                    return visitNode(member.initializer, visitor, isExpression);
+                }
+                else {
+                    return createVoidZero();
+                }
+            }
+        }
+
+        /**
+         * Determines whether to elide a module declaration.
+         *
+         * @param node The module declaration node.
+         */
+        function shouldEmitModuleDeclaration(node: ModuleDeclaration) {
+            return isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
+        }
+
+        function isModuleMergedWithES6Class(node: ModuleDeclaration) {
+            return languageVersion === ScriptTarget.ES6
+                && isMergedWithClass(node);
+        }
+
+        function isES6ExportedDeclaration(node: Node) {
+            return isExternalModuleExport(node)
+                && moduleKind === ModuleKind.ES6;
+        }
+
+        function shouldEmitVarForModuleDeclaration(node: ModuleDeclaration) {
+            return !isModuleMergedWithES6Class(node)
+                && (!isES6ExportedDeclaration(node)
+                    || isFirstDeclarationOfKind(node, node.kind));
+        }
+
+        /**
+         * Adds a leading VariableStatement for a enum or module declaration.
+         */
+        function addVarForEnumOrModuleDeclaration(statements: Statement[], node: ModuleDeclaration | EnumDeclaration) {
+            // Emit a variable statement for the module.
+            const statement = createVariableStatement(
+                isES6ExportedDeclaration(node)
+                    ? visitNodes(node.modifiers, visitor, isModifier)
+                    : undefined,
+                [
+                    createVariableDeclaration(
+                        getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                    )
+                ]
+            );
+
+            setOriginalNode(statement, /*original*/ node);
+
+            // Adjust the source map emit to match the old emitter.
+            if (node.kind === SyntaxKind.EnumDeclaration) {
+                setSourceMapRange(statement.declarationList, node);
+            }
+            else {
+                setSourceMapRange(statement, node);
+            }
+
+            // Trailing comments for module declaration should be emitted after the function closure
+            // instead of the variable statement:
+            //
+            //     /** Module comment*/
+            //     module m1 {
+            //         function foo4Export() {
+            //         }
+            //     } // trailing comment module
+            //
+            // Should emit:
+            //
+            //     /** Module comment*/
+            //     var m1;
+            //     (function (m1) {
+            //         function foo4Export() {
+            //         }
+            //     })(m1 || (m1 = {})); // trailing comment module
+            //
+            setCommentRange(statement, node);
+            setNodeEmitFlags(statement, NodeEmitFlags.NoTrailingComments);
+            statements.push(statement);
+        }
+
+        /**
+         * Visits a module declaration node.
+         *
+         * This function will be called any time a TypeScript namespace (ModuleDeclaration) is encountered.
+         *
+         * @param node The module declaration node.
+         */
+        function visitModuleDeclaration(node: ModuleDeclaration): VisitResult<Statement> {
+            if (!shouldEmitModuleDeclaration(node)) {
+                return createNotEmittedStatement(node);
+            }
+
+            Debug.assert(isIdentifier(node.name), "TypeScript module should have an Identifier name.");
+            enableSubstitutionForNamespaceExports();
+
+            const statements: Statement[] = [];
+
+            // We request to be advised when the printer is about to print this node. This allows
+            // us to set up the correct state for later substitutions.
+            let emitFlags = NodeEmitFlags.AdviseOnEmitNode;
+
+            // If needed, we should emit a variable declaration for the module. If we emit
+            // a leading variable declaration, we should not emit leading comments for the
+            // module body.
+            if (shouldEmitVarForModuleDeclaration(node)) {
+                addVarForEnumOrModuleDeclaration(statements, node);
+                // We should still emit the comments if we are emitting a system module.
+                if (moduleKind !== ModuleKind.System || currentScope !== currentSourceFile) {
+                    emitFlags |= NodeEmitFlags.NoLeadingComments;
+                }
+            }
+
+            // `parameterName` is the declaration name used inside of the namespace.
+            const parameterName = getNamespaceParameterName(node);
+
+            // `containerName` is the expression used inside of the namespace for exports.
+            const containerName = getNamespaceContainerName(node);
+
+            // `exportName` is the expression used within this node's container for any exported references.
+            const exportName = getExportName(node);
+
+            //  x || (x = {})
+            //  exports.x || (exports.x = {})
+            let moduleArg =
+                createLogicalOr(
+                    exportName,
+                    createAssignment(
+                        exportName,
+                        createObjectLiteral()
+                    )
+                );
+
+            if (hasModifier(node, ModifierFlags.Export) && !isES6ExportedDeclaration(node)) {
+                // `localName` is the expression used within this node's containing scope for any local references.
+                const localName = getLocalName(node);
+
+                //  x = (exports.x || (exports.x = {}))
+                moduleArg = createAssignment(localName, moduleArg);
+            }
+
+            //  (function (x_1) {
+            //      x_1.y = ...;
+            //  })(x || (x = {}));
+            const moduleStatement = createStatement(
+                createCall(
+                    createFunctionExpression(
+                        /*asteriskToken*/ undefined,
+                        /*name*/ undefined,
+                        /*typeParameters*/ undefined,
+                        [createParameter(parameterName)],
+                        /*type*/ undefined,
+                        transformModuleBody(node, containerName)
+                    ),
+                    /*typeArguments*/ undefined,
+                    [moduleArg]
+                ),
+                /*location*/ node
+            );
+
+            setOriginalNode(moduleStatement, node);
+            setNodeEmitFlags(moduleStatement, emitFlags);
+            statements.push(moduleStatement);
+            return statements;
+        }
+
+        /**
+         * Transforms the body of a module declaration.
+         *
+         * @param node The module declaration node.
+         */
+        function transformModuleBody(node: ModuleDeclaration, namespaceLocalName: Identifier): Block {
+            const savedCurrentNamespaceContainerName = currentNamespaceContainerName;
+            const savedCurrentNamespace = currentNamespace;
+            currentNamespaceContainerName = namespaceLocalName;
+            currentNamespace = node;
+
+            const statements: Statement[] = [];
+            startLexicalEnvironment();
+
+            let statementsLocation: TextRange;
+            let blockLocation: TextRange;
+            const body = node.body;
+            if (body.kind === SyntaxKind.ModuleBlock) {
+                addRange(statements, visitNodes((<ModuleBlock>body).statements, namespaceElementVisitor, isStatement));
+                statementsLocation = (<ModuleBlock>body).statements;
+                blockLocation = body;
+            }
+            else {
+                const result = visitModuleDeclaration(<ModuleDeclaration>body);
+                if (result) {
+                    if (isArray(result)) {
+                        addRange(statements, result);
+                    }
+                    else {
+                        statements.push(result);
+                    }
+                }
+
+                const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
+                statementsLocation = moveRangePos(moduleBlock.statements, -1);
+            }
+
+            addRange(statements, endLexicalEnvironment());
+
+            currentNamespaceContainerName = savedCurrentNamespaceContainerName;
+            currentNamespace = savedCurrentNamespace;
+            const block = createBlock(
+                createNodeArray(
+                    statements,
+                    /*location*/ statementsLocation
+                ),
+                /*location*/ blockLocation,
+                /*multiLine*/ true
+            );
+            return block;
+        }
+
+        function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration: ModuleDeclaration): ModuleDeclaration {
+            if (moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
+                const recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(<ModuleDeclaration>moduleDeclaration.body);
+                return recursiveInnerModule || <ModuleDeclaration>moduleDeclaration.body;
+            }
+        }
+
+        /**
+         * Determines whether to emit an import equals declaration.
+         *
+         * @param node The import equals declaration node.
+         */
+        function shouldEmitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
+            // preserve old compiler's behavior: emit 'var' for import declaration (even if we do not consider them referenced) when
+            // - current file is not external module
+            // - import declaration is top level and target is value imported by entity name
+            return resolver.isReferencedAliasDeclaration(node)
+                || (!isExternalModule(currentSourceFile)
+                    && resolver.isTopLevelValueImportEqualsWithEntityName(node));
+        }
+
+        /**
+         * Visits an import equals declaration.
+         *
+         * @param node The import equals declaration node.
+         */
+        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): VisitResult<Statement> {
+            if (isExternalModuleImportEqualsDeclaration(node)) {
+                return visitEachChild(node, visitor, context);
+            }
+
+            if (!shouldEmitImportEqualsDeclaration(node)) {
+                return undefined;
+            }
+
+            const moduleReference = createExpressionFromEntityName(<EntityName>node.moduleReference);
+            setNodeEmitFlags(moduleReference, NodeEmitFlags.NoComments | NodeEmitFlags.NoNestedComments);
+
+            if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
+                //  export var ${name} = ${moduleReference};
+                //  var ${name} = ${moduleReference};
+                return setOriginalNode(
+                    createVariableStatement(
+                        visitNodes(node.modifiers, visitor, isModifier),
+                        createVariableDeclarationList([
+                            createVariableDeclaration(
+                                node.name,
+                                /*type*/ undefined,
+                                moduleReference
+                            )
+                        ]),
+                        node
+                    ),
+                    node
+                );
+            }
+            else {
+                // exports.${name} = ${moduleReference};
+                return setOriginalNode(
+                    createNamespaceExport(
+                        node.name,
+                        moduleReference,
+                        node
+                    ),
+                    node
+                );
+            }
+        }
+
+        /**
+         * Gets a value indicating whether the node is exported from a namespace.
+         *
+         * @param node The node to test.
+         */
+        function isNamespaceExport(node: Node) {
+            return currentNamespace !== undefined && hasModifier(node, ModifierFlags.Export);
+        }
+
+        /**
+         * Gets a value indicating whether the node is exported from an external module.
+         *
+         * @param node The node to test.
+         */
+        function isExternalModuleExport(node: Node) {
+            return currentNamespace === undefined && hasModifier(node, ModifierFlags.Export);
+        }
+
+        /**
+         * Gets a value indicating whether the node is a named export from an external module.
+         *
+         * @param node The node to test.
+         */
+        function isNamedExternalModuleExport(node: Node) {
+            return isExternalModuleExport(node)
+                && !hasModifier(node, ModifierFlags.Default);
+        }
+
+        /**
+         * Gets a value indicating whether the node is the default export of an external module.
+         *
+         * @param node The node to test.
+         */
+        function isDefaultExternalModuleExport(node: Node) {
+            return isExternalModuleExport(node)
+                && hasModifier(node, ModifierFlags.Default);
+        }
+
+        /**
+         * Creates a statement for the provided expression. This is used in calls to `map`.
+         */
+        function expressionToStatement(expression: Expression) {
+            return createStatement(expression, /*location*/ undefined);
+        }
+
+        function addExportMemberAssignment(statements: Statement[], node: DeclarationStatement) {
+            const expression = createAssignment(
+                getExportName(node),
+                getLocalName(node, /*noSourceMaps*/ true)
+            );
+            setSourceMapRange(expression, createRange(node.name.pos, node.end));
+
+            const statement = createStatement(expression);
+            setSourceMapRange(statement, createRange(-1, node.end));
+            statements.push(statement);
+        }
+
+        function createNamespaceExport(exportName: Identifier, exportValue: Expression, location?: TextRange) {
+            return createStatement(
+                createAssignment(
+                    getNamespaceMemberName(exportName, /*allowComments*/ false, /*allowSourceMaps*/ true),
+                    exportValue
+                ),
+                location
+            );
+        }
+
+        function createExternalModuleExport(exportName: Identifier) {
+            return createExportDeclaration(
+                /*decorators*/ undefined,
+                /*modifiers*/ undefined,
+                createNamedExports([
+                    createExportSpecifier(exportName)
+                ])
+            );
+        }
+
+        function getNamespaceMemberName(name: Identifier, allowComments?: boolean, allowSourceMaps?: boolean): Expression {
+            const qualifiedName = createPropertyAccess(currentNamespaceContainerName, getSynthesizedClone(name), /*location*/ name);
+            let emitFlags: NodeEmitFlags;
+            if (!allowComments) {
+                emitFlags |= NodeEmitFlags.NoComments;
+            }
+            if (!allowSourceMaps) {
+                emitFlags |= NodeEmitFlags.NoSourceMap;
+            }
+            if (emitFlags) {
+                setNodeEmitFlags(qualifiedName, emitFlags);
+            }
+            return qualifiedName;
+        }
+
+        function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name: Identifier) {
+            return getNamespaceMemberName(name, /*allowComments*/ false, /*allowSourceMaps*/ true);
+        }
+
+        /**
+         * Gets the declaration name used inside of a namespace or enum.
+         */
+        function getNamespaceParameterName(node: ModuleDeclaration | EnumDeclaration) {
+            const name = getGeneratedNameForNode(node);
+            setSourceMapRange(name, node.name);
+            return name;
+        }
+
+        /**
+         * Gets the expression used to refer to a namespace or enum within the body
+         * of its declaration.
+         */
+        function getNamespaceContainerName(node: ModuleDeclaration | EnumDeclaration) {
+            return getGeneratedNameForNode(node);
+        }
+
+        /**
+         * Gets the local name for a declaration for use in expressions.
+         *
+         * A local name will *never* be prefixed with an module or namespace export modifier like
+         * "exports.".
+         *
+         * @param node The declaration.
+         * @param noSourceMaps A value indicating whether source maps may not be emitted for the name.
+         * @param allowComments A value indicating whether comments may be emitted for the name.
+         */
+        function getLocalName(node: DeclarationStatement | ClassExpression, noSourceMaps?: boolean, allowComments?: boolean) {
+            return getDeclarationName(node, allowComments, !noSourceMaps, NodeEmitFlags.LocalName);
+        }
+
+        /**
+         * Gets the export name for a declaration for use in expressions.
+         *
+         * An export name will *always* be prefixed with an module or namespace export modifier
+         * like "exports." if one is required.
+         *
+         * @param node The declaration.
+         * @param noSourceMaps A value indicating whether source maps may not be emitted for the name.
+         * @param allowComments A value indicating whether comments may be emitted for the name.
+         */
+        function getExportName(node: DeclarationStatement | ClassExpression, noSourceMaps?: boolean, allowComments?: boolean) {
+            if (isNamespaceExport(node)) {
+                return getNamespaceMemberName(getDeclarationName(node), allowComments, !noSourceMaps);
+            }
+
+            return getDeclarationName(node, allowComments, !noSourceMaps, NodeEmitFlags.ExportName);
+        }
+
+        /**
+         * Gets the name for a declaration for use in declarations.
+         *
+         * @param node The declaration.
+         * @param allowComments A value indicating whether comments may be emitted for the name.
+         * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+         * @param emitFlags Additional NodeEmitFlags to specify for the name.
+         */
+        function getDeclarationName(node: DeclarationStatement | ClassExpression, allowComments?: boolean, allowSourceMaps?: boolean, emitFlags?: NodeEmitFlags) {
+            if (node.name) {
+                const name = getMutableClone(node.name);
+                emitFlags |= getNodeEmitFlags(node.name);
+                if (!allowSourceMaps) {
+                    emitFlags |= NodeEmitFlags.NoSourceMap;
+                }
+
+                if (!allowComments) {
+                    emitFlags |= NodeEmitFlags.NoComments;
+                }
+
+                if (emitFlags) {
+                    setNodeEmitFlags(name, emitFlags);
+                }
+
+                return name;
+            }
+            else {
+                return getGeneratedNameForNode(node);
+            }
+        }
+
+        function getClassPrototype(node: ClassExpression | ClassDeclaration) {
+            return createPropertyAccess(getDeclarationName(node), "prototype");
+        }
+
+        function getClassMemberPrefix(node: ClassExpression | ClassDeclaration, member: ClassElement) {
+            return hasModifier(member, ModifierFlags.Static)
+                ? getDeclarationName(node)
+                : getClassPrototype(node);
+        }
+
+        function enableSubstitutionForNonQualifiedEnumMembers() {
+            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers) === 0) {
+                enabledSubstitutions |= TypeScriptSubstitutionFlags.NonQualifiedEnumMembers;
+                context.enableSubstitution(SyntaxKind.Identifier);
+            }
+        }
+
+        function enableSubstitutionForAsyncMethodsWithSuper() {
+            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.AsyncMethodsWithSuper) === 0) {
+                enabledSubstitutions |= TypeScriptSubstitutionFlags.AsyncMethodsWithSuper;
+
+                // We need to enable substitutions for call, property access, and element access
+                // if we need to rewrite super calls.
+                context.enableSubstitution(SyntaxKind.CallExpression);
+                context.enableSubstitution(SyntaxKind.PropertyAccessExpression);
+                context.enableSubstitution(SyntaxKind.ElementAccessExpression);
+
+                // We need to be notified when entering and exiting declarations that bind super.
+                context.enableEmitNotification(SyntaxKind.ClassDeclaration);
+                context.enableEmitNotification(SyntaxKind.MethodDeclaration);
+                context.enableEmitNotification(SyntaxKind.GetAccessor);
+                context.enableEmitNotification(SyntaxKind.SetAccessor);
+                context.enableEmitNotification(SyntaxKind.Constructor);
+            }
+        }
+
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.ClassAliases) === 0) {
+                enabledSubstitutions |= TypeScriptSubstitutionFlags.ClassAliases;
+
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(SyntaxKind.Identifier);
+
+                // Keep track of class aliases.
+                classAliases = createMap<Identifier>();
+            }
+        }
+
+        function enableSubstitutionForNamespaceExports() {
+            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports) === 0) {
+                enabledSubstitutions |= TypeScriptSubstitutionFlags.NamespaceExports;
+
+                // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
+                // substitute the names of exported members of a namespace.
+                context.enableSubstitution(SyntaxKind.Identifier);
+                context.enableSubstitution(SyntaxKind.ShorthandPropertyAssignment);
+
+                // We need to be notified when entering and exiting namespaces.
+                context.enableEmitNotification(SyntaxKind.ModuleDeclaration);
+            }
+        }
+
+        function isSuperContainer(node: Node): node is SuperContainer {
+            const kind = node.kind;
+            return kind === SyntaxKind.ClassDeclaration
+                || kind === SyntaxKind.Constructor
+                || kind === SyntaxKind.MethodDeclaration
+                || kind === SyntaxKind.GetAccessor
+                || kind === SyntaxKind.SetAccessor;
+        }
+
+        function isTransformedModuleDeclaration(node: Node): boolean {
+            return getOriginalNode(node).kind === SyntaxKind.ModuleDeclaration;
+        }
+
+        function isTransformedEnumDeclaration(node: Node): boolean {
+            return getOriginalNode(node).kind === SyntaxKind.EnumDeclaration;
+        }
+
+        /**
+         * Hook for node emit.
+         *
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(node: Node, emit: (node: Node) => void): void {
+            const savedApplicableSubstitutions = applicableSubstitutions;
+            const savedCurrentSuperContainer = currentSuperContainer;
+            // If we need to support substitutions for `super` in an async method,
+            // we should track it here.
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.AsyncMethodsWithSuper && isSuperContainer(node)) {
+                currentSuperContainer = node;
+            }
+
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && isTransformedModuleDeclaration(node)) {
+                applicableSubstitutions |= TypeScriptSubstitutionFlags.NamespaceExports;
+            }
+
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers && isTransformedEnumDeclaration(node)) {
+                applicableSubstitutions |= TypeScriptSubstitutionFlags.NonQualifiedEnumMembers;
+            }
+
+            previousOnEmitNode(node, emit);
+
+            applicableSubstitutions = savedApplicableSubstitutions;
+            currentSuperContainer = savedCurrentSuperContainer;
+        }
+
+        /**
+         * Hooks node substitutions.
+         *
+         * @param node The node to substitute.
+         * @param isExpression A value indicating whether the node is to be used in an expression
+         *                     position.
+         */
+        function onSubstituteNode(node: Node, isExpression: boolean) {
+            node = previousOnSubstituteNode(node, isExpression);
+            if (isExpression) {
+                return substituteExpression(<Expression>node);
+            }
+            else if (isShorthandPropertyAssignment(node)) {
+                return substituteShorthandPropertyAssignment(node);
+            }
+
+            return node;
+        }
+
+        function substituteShorthandPropertyAssignment(node: ShorthandPropertyAssignment): ObjectLiteralElement {
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports) {
+                const name = node.name;
+                const exportedName = trySubstituteNamespaceExportedName(name);
+                if (exportedName) {
+                    // A shorthand property with an assignment initializer is probably part of a
+                    // destructuring assignment
+                    if (node.objectAssignmentInitializer) {
+                        const initializer = createAssignment(exportedName, node.objectAssignmentInitializer);
+                        return createPropertyAssignment(name, initializer, /*location*/ node);
+                    }
+                    return createPropertyAssignment(name, exportedName, /*location*/ node);
+                }
+            }
+            return node;
+        }
+
+        function substituteExpression(node: Expression) {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return substituteExpressionIdentifier(<Identifier>node);
+            }
+
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.AsyncMethodsWithSuper) {
+                switch (node.kind) {
+                    case SyntaxKind.CallExpression:
+                        return substituteCallExpression(<CallExpression>node);
+                    case SyntaxKind.PropertyAccessExpression:
+                        return substitutePropertyAccessExpression(<PropertyAccessExpression>node);
+                    case SyntaxKind.ElementAccessExpression:
+                        return substituteElementAccessExpression(<ElementAccessExpression>node);
+                }
+            }
+
+            return node;
+        }
+
+        function substituteExpressionIdentifier(node: Identifier): Expression {
+            return trySubstituteClassAlias(node)
+                || trySubstituteNamespaceExportedName(node)
+                || node;
+        }
+
+        function trySubstituteClassAlias(node: Identifier): Expression {
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.ClassAliases) {
+                if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ConstructorReferenceInClass) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    const declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        const classAlias = classAliases[declaration.id];
+                        if (classAlias) {
+                            const clone = getSynthesizedClone(classAlias);
+                            setSourceMapRange(clone, node);
+                            setCommentRange(clone, node);
+                            return clone;
+                        }
+                    }
+                }
+            }
+
+            return undefined;
+        }
+
+        function trySubstituteNamespaceExportedName(node: Identifier): Expression {
+            // If this is explicitly a local name, do not substitute.
+            if (enabledSubstitutions & applicableSubstitutions && (getNodeEmitFlags(node) & NodeEmitFlags.LocalName) === 0) {
+                // If we are nested within a namespace declaration, we may need to qualifiy
+                // an identifier that is exported from a merged namespace.
+                const container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
+                if (container) {
+                    const substitute =
+                        (applicableSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && container.kind === SyntaxKind.ModuleDeclaration) ||
+                        (applicableSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers && container.kind === SyntaxKind.EnumDeclaration);
+                    if (substitute) {
+                        return createPropertyAccess(getGeneratedNameForNode(container), node, /*location*/ node);
+                    }
+                }
+            }
+
+            return undefined;
+        }
+
+        function substituteCallExpression(node: CallExpression): Expression {
+            const expression = node.expression;
+            if (isSuperProperty(expression)) {
+                const flags = getSuperContainerAsyncMethodFlags();
+                if (flags) {
+                    const argumentExpression = isPropertyAccessExpression(expression)
+                        ? substitutePropertyAccessExpression(expression)
+                        : substituteElementAccessExpression(expression);
+                    return createCall(
+                        createPropertyAccess(argumentExpression, "call"),
+                        /*typeArguments*/ undefined,
+                        [
+                            createThis(),
+                            ...node.arguments
+                        ]
+                    );
+                }
+            }
+            return node;
+        }
+
+        function substitutePropertyAccessExpression(node: PropertyAccessExpression) {
+            if (node.expression.kind === SyntaxKind.SuperKeyword) {
+                const flags = getSuperContainerAsyncMethodFlags();
+                if (flags) {
+                    return createSuperAccessInAsyncMethod(
+                        createLiteral(node.name.text),
+                        flags,
+                        node
+                    );
+                }
+            }
+
+            return node;
+        }
+
+        function substituteElementAccessExpression(node: ElementAccessExpression) {
+            if (node.expression.kind === SyntaxKind.SuperKeyword) {
+                const flags = getSuperContainerAsyncMethodFlags();
+                if (flags) {
+                    return createSuperAccessInAsyncMethod(
+                        node.argumentExpression,
+                        flags,
+                        node
+                    );
+                }
+            }
+
+            return node;
+        }
+
+        function createSuperAccessInAsyncMethod(argumentExpression: Expression, flags: NodeCheckFlags, location: TextRange): LeftHandSideExpression {
+            if (flags & NodeCheckFlags.AsyncMethodWithSuperBinding) {
+                return createPropertyAccess(
+                    createCall(
+                        createIdentifier("_super"),
+                        /*typeArguments*/ undefined,
+                        [argumentExpression]
+                    ),
+                    "value",
+                    location
+                );
+            }
+            else {
+                return createCall(
+                    createIdentifier("_super"),
+                    /*typeArguments*/ undefined,
+                    [argumentExpression],
+                    location
+                );
+            }
+        }
+
+        function getSuperContainerAsyncMethodFlags() {
+            return currentSuperContainer !== undefined
+                && resolver.getNodeCheckFlags(currentSuperContainer) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding);
+        }
+    }
+}
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 62b58609086..916d32841a4 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -6,6 +6,11 @@ namespace ts {
         fileWatcher?: FileWatcher;
     }
 
+    interface Statistic {
+        name: string;
+        value: string;
+    }
+
     const defaultFormatDiagnosticsHost: FormatDiagnosticsHost = {
         getCurrentDirectory: () => sys.getCurrentDirectory(),
         getNewLine: () => sys.newLine,
@@ -230,18 +235,6 @@ namespace ts {
         return s;
     }
 
-    function reportStatisticalValue(name: string, value: string) {
-        sys.write(padRight(name + ":", 12) + padLeft(value.toString(), 10) + sys.newLine);
-    }
-
-    function reportCountStatistic(name: string, count: number) {
-        reportStatisticalValue(name, "" + count);
-    }
-
-    function reportTimeStatistic(name: string, time: number) {
-        reportStatisticalValue(name, (time / 1000).toFixed(2) + "s");
-    }
-
     function isJSONSupported() {
         return typeof JSON === "object" && typeof JSON.parse === "function";
     }
@@ -489,10 +482,7 @@ namespace ts {
             sourceFile.fileWatcher.close();
             sourceFile.fileWatcher = undefined;
             if (removed) {
-                const index = rootFileNames.indexOf(sourceFile.fileName);
-                if (index >= 0) {
-                    rootFileNames.splice(index, 1);
-                }
+                unorderedRemoveItem(rootFileNames, sourceFile.fileName);
             }
             startTimerForRecompilation();
         }
@@ -550,7 +540,11 @@ namespace ts {
 
     function compile(fileNames: string[], compilerOptions: CompilerOptions, compilerHost: CompilerHost) {
         const hasDiagnostics = compilerOptions.diagnostics || compilerOptions.extendedDiagnostics;
-        if (hasDiagnostics) performance.enable();
+        let statistics: Statistic[];
+        if (hasDiagnostics) {
+            performance.enable();
+            statistics = [];
+        }
 
         const program = createProgram(fileNames, compilerOptions, compilerHost);
         const exitStatus = compileProgram();
@@ -594,6 +588,7 @@ namespace ts {
                 reportTimeStatistic("Emit time", emitTime);
             }
             reportTimeStatistic("Total time", programTime + bindTime + checkTime + emitTime);
+            reportStatistics();
 
             performance.disable();
         }
@@ -635,6 +630,36 @@ namespace ts {
             }
             return ExitStatus.Success;
         }
+
+        function reportStatistics() {
+            let nameSize = 0;
+            let valueSize = 0;
+            for (const { name, value } of statistics) {
+                if (name.length > nameSize) {
+                    nameSize = name.length;
+                }
+
+                if (value.length > valueSize) {
+                    valueSize = value.length;
+                }
+            }
+
+            for (const { name, value } of statistics) {
+                sys.write(padRight(name + ":", nameSize + 2) + padLeft(value.toString(), valueSize) + sys.newLine);
+            }
+        }
+
+        function reportStatisticalValue(name: string, value: string) {
+            statistics.push({ name, value });
+        }
+
+        function reportCountStatistic(name: string, count: number) {
+            reportStatisticalValue(name, "" + count);
+        }
+
+        function reportTimeStatistic(name: string, time: number) {
+            reportStatisticalValue(name, (time / 1000).toFixed(2) + "s");
+        }
     }
 
     function printVersion() {
@@ -771,4 +796,8 @@ namespace ts {
     }
 }
 
+if (ts.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))) {
+    ts.sys.tryEnableSourceMapsForHost();
+}
+
 ts.executeCommandLine(ts.sys.args);
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index cc9bfddcece..f128c994af1 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -20,6 +20,19 @@
         "utilities.ts",
         "binder.ts",
         "checker.ts",
+        "factory.ts",
+        "visitor.ts",
+        "transformers/ts.ts",
+        "transformers/jsx.ts",
+        "transformers/es7.ts",
+        "transformers/es6.ts",
+        "transformers/generators.ts",
+        "transformers/destructuring.ts",
+        "transformers/module/module.ts",
+        "transformers/module/system.ts",
+        "transformers/module/es6.ts",
+        "transformer.ts",
+        "comments.ts",
         "sourcemap.ts",
         "declarationEmitter.ts",
         "emitter.ts",
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 50beef52bf8..f7b92b643ca 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -357,11 +357,18 @@ namespace ts {
 
         // Synthesized list
         SyntaxList,
+
+        // Transformation nodes
+        NotEmittedStatement,
+        PartiallyEmittedExpression,
+
         // Enum value count
         Count,
         // Markers
         FirstAssignment = EqualsToken,
         LastAssignment = CaretEqualsToken,
+        FirstCompoundAssignment = PlusEqualsToken,
+        LastCompoundAssignment = CaretEqualsToken,
         FirstReservedWord = BreakKeyword,
         LastReservedWord = WithKeyword,
         FirstKeyword = BreakKeyword,
@@ -390,6 +397,45 @@ namespace ts {
     }
 
     export const enum NodeFlags {
+        None =               0,
+        Let =                1 << 0,  // Variable declaration
+        Const =              1 << 1,  // Variable declaration
+        NestedNamespace =    1 << 2,  // Namespace declaration
+        Synthesized =        1 << 3,  // Node was synthesized during transformation
+        Namespace =          1 << 4,  // Namespace declaration
+        ExportContext =      1 << 5,  // Export context (initialized by binding)
+        ContainsThis =       1 << 6,  // Interface contains references to "this"
+        HasImplicitReturn =  1 << 7,  // If function implicitly returns on one of codepaths (initialized by binding)
+        HasExplicitReturn =  1 << 8,  // If function has explicit reachable return on one of codepaths (initialized by binding)
+        GlobalAugmentation = 1 << 9,  // Set if module declaration is an augmentation for the global scope
+        HasClassExtends =    1 << 10, // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding)
+        HasDecorators =      1 << 11, // If the file has decorators (initialized by binding)
+        HasParamDecorators = 1 << 12, // If the file has parameter decorators (initialized by binding)
+        HasAsyncFunctions =  1 << 13, // If the file has async functions (initialized by binding)
+        HasJsxSpreadAttributes = 1 << 14, // If the file as JSX spread attributes (initialized by binding)
+        DisallowInContext =  1 << 15, // If node was parsed in a context where 'in-expressions' are not allowed
+        YieldContext =       1 << 16, // If node was parsed in the 'yield' context created when parsing a generator
+        DecoratorContext =   1 << 17, // If node was parsed as part of a decorator
+        AwaitContext =       1 << 18, // If node was parsed in the 'await' context created when parsing an async function
+        ThisNodeHasError =   1 << 19, // If the parser encountered an error when parsing the code that created this node
+        JavaScriptFile =     1 << 20, // If node was parsed in a JavaScript
+        ThisNodeOrAnySubNodesHasError = 1 << 21, // If this node or any of its children had an error
+        HasAggregatedChildData = 1 << 22, // If we've computed data from children and cached it in this node
+
+        BlockScoped = Let | Const,
+
+        ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn,
+        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions | HasJsxSpreadAttributes,
+        ReachabilityAndEmitFlags = ReachabilityCheckFlags | EmitHelperFlags,
+
+        // Parsing context flags
+        ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext | JavaScriptFile,
+
+        // Exclude these flags when parsing a Type
+        TypeExcludesFlags = YieldContext | AwaitContext,
+    }
+
+    export const enum ModifierFlags {
         None =               0,
         Export =             1 << 0,  // Declarations
         Ambient =            1 << 1,  // Declarations
@@ -401,43 +447,14 @@ namespace ts {
         Abstract =           1 << 7,  // Class/Method/ConstructSignature
         Async =              1 << 8,  // Property/Method/Function
         Default =            1 << 9,  // Function/Class (export default declaration)
-        Let =                1 << 10,  // Variable declaration
-        Const =              1 << 11,  // Variable declaration
-        Namespace =          1 << 12,  // Namespace declaration
-        ExportContext =      1 << 13,  // Export context (initialized by binding)
-        ContainsThis =       1 << 14,  // Interface contains references to "this"
-        HasImplicitReturn =  1 << 15,  // If function implicitly returns on one of codepaths (initialized by binding)
-        HasExplicitReturn =  1 << 16,  // If function has explicit reachable return on one of codepaths (initialized by binding)
-        GlobalAugmentation = 1 << 17,  // Set if module declaration is an augmentation for the global scope
-        HasClassExtends =    1 << 18,  // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding)
-        HasDecorators =      1 << 19,  // If the file has decorators (initialized by binding)
-        HasParamDecorators = 1 << 20,  // If the file has parameter decorators (initialized by binding)
-        HasAsyncFunctions =  1 << 21,  // If the file has async functions (initialized by binding)
-        DisallowInContext =  1 << 22,  // If node was parsed in a context where 'in-expressions' are not allowed
-        YieldContext =       1 << 23,  // If node was parsed in the 'yield' context created when parsing a generator
-        DecoratorContext =   1 << 24,  // If node was parsed as part of a decorator
-        AwaitContext =       1 << 25,  // If node was parsed in the 'await' context created when parsing an async function
-        ThisNodeHasError =   1 << 26,  // If the parser encountered an error when parsing the code that created this node
-        JavaScriptFile =     1 << 27,  // If node was parsed in a JavaScript
-        ThisNodeOrAnySubNodesHasError = 1 << 28,  // If this node or any of its children had an error
-        HasAggregatedChildData = 1 << 29,  // If we've computed data from children and cached it in this node
-        HasJsxSpreadAttribute = 1 << 30,
+        Const =              1 << 11, // Variable declaration
+
+        HasComputedFlags =   1 << 29, // Modifier flags have been computed
 
-        Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async | Readonly,
         AccessibilityModifier = Public | Private | Protected,
         // Accessibility modifiers and 'readonly' can be attached to a parameter in a constructor to make it a property.
         ParameterPropertyModifier = AccessibilityModifier | Readonly,
-        BlockScoped = Let | Const,
-
-        ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn,
-        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions,
-        ReachabilityAndEmitFlags = ReachabilityCheckFlags | EmitHelperFlags,
-
-        // Parsing context flags
-        ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext | JavaScriptFile,
-
-        // Exclude these flags when parsing a Type
-        TypeExcludesFlags = YieldContext | AwaitContext,
+        NonPublicAccessibilityModifier = Private | Protected,
     }
 
     export const enum JsxFlags {
@@ -460,26 +477,30 @@ namespace ts {
     export interface Node extends TextRange {
         kind: SyntaxKind;
         flags: NodeFlags;
+        /* @internal */ modifierFlagsCache?: ModifierFlags;
+        /* @internal */ transformFlags?: TransformFlags;
         decorators?: NodeArray<Decorator>;              // Array of decorators (in document order)
-        modifiers?: ModifiersArray;                     // Array of modifiers
+        modifiers?: NodeArray<Modifier>;                // Array of modifiers
         /* @internal */ id?: number;                    // Unique id (used to look up NodeLinks)
-        parent?: Node;                                  // Parent node (initialized by binding
+        parent?: Node;                                  // Parent node (initialized by binding)
+        /* @internal */ original?: Node;                // The original node if this is an updated node.
+        /* @internal */ startsOnNewLine?: boolean;      // Whether a synthesized node should start on a new line (used by transforms).
         /* @internal */ jsDocComments?: JSDocComment[]; // JSDoc for the node, if it has any.  Only for .js files.
         /* @internal */ symbol?: Symbol;                // Symbol declared by node (initialized by binding)
         /* @internal */ locals?: SymbolTable;           // Locals associated with node (initialized by binding)
         /* @internal */ nextContainer?: Node;           // Next container in declaration order (initialized by binding)
         /* @internal */ localSymbol?: Symbol;           // Local symbol declared by node (initialized by binding only for exported nodes)
         /* @internal */ flowNode?: FlowNode;            // Associated FlowNode (initialized by binding)
+        /* @internal */ transformId?: number;           // Associates transient transformation properties with a specific transformation (initialized by transformation).
+        /* @internal */ emitFlags?: NodeEmitFlags;      // Transient emit flags for a synthesized node (initialized by transformation).
+        /* @internal */ sourceMapRange?: TextRange;     // Transient custom sourcemap range for a synthesized node (initialized by transformation).
+        /* @internal */ commentRange?: TextRange;       // Transient custom comment range for a synthesized node (initialized by transformation).
     }
 
-    export interface NodeArray<T> extends Array<T>, TextRange {
+    export interface NodeArray<T extends Node> extends Array<T>, TextRange {
         hasTrailingComma?: boolean;
     }
 
-    export interface ModifiersArray extends NodeArray<Modifier> {
-        flags: NodeFlags;
-    }
-
     export interface Token extends Node {
         __tokenTag: any;
     }
@@ -496,10 +517,26 @@ namespace ts {
     // @kind(SyntaxKind.StaticKeyword)
     export interface Modifier extends Token { }
 
+    /*@internal*/
+    export const enum GeneratedIdentifierKind {
+        None,   // Not automatically generated.
+        Auto,   // Automatically generated identifier.
+        Loop,   // Automatically generated identifier with a preference for '_i'.
+        Unique, // Unique name based on the 'text' property.
+        Node,   // Unique name based on the node in the 'original' property.
+    }
+
     // @kind(SyntaxKind.Identifier)
     export interface Identifier extends PrimaryExpression {
         text: string;                                  // Text of identifier (with escapes converted to characters)
         originalKeywordKind?: SyntaxKind;              // Original syntaxKind which get set so that we can report an error later
+        /*@internal*/ autoGenerateKind?: GeneratedIdentifierKind; // Specifies whether to auto-generate the text for an identifier.
+        /*@internal*/ autoGenerateId?: number;         // Ensures unique generated identifiers get unique names, but clones get the same name.
+    }
+
+    // Transient identifier node (marked by id === -1)
+    export interface TransientIdentifier extends Identifier {
+        resolvedSymbol: Symbol;
     }
 
     // @kind(SyntaxKind.QualifiedName)
@@ -556,10 +593,12 @@ namespace ts {
     // @kind(SyntaxKind.ConstructSignature)
     export interface ConstructSignatureDeclaration extends SignatureDeclaration, TypeElement { }
 
+    export type BindingName = Identifier | BindingPattern;
+
     // @kind(SyntaxKind.VariableDeclaration)
     export interface VariableDeclaration extends Declaration {
         parent?: VariableDeclarationList;
-        name: Identifier | BindingPattern;  // Declared variable name
+        name: BindingName;                  // Declared variable name
         type?: TypeNode;                    // Optional type annotation
         initializer?: Expression;           // Optional initializer
     }
@@ -572,7 +611,7 @@ namespace ts {
     // @kind(SyntaxKind.Parameter)
     export interface ParameterDeclaration extends Declaration {
         dotDotDotToken?: Node;              // Present on rest parameter
-        name: Identifier | BindingPattern;  // Declared parameter name
+        name: BindingName;                  // Declared parameter name
         questionToken?: Node;               // Present on optional parameter
         type?: TypeNode;                    // Optional type annotation
         initializer?: Expression;           // Optional initializer
@@ -582,7 +621,7 @@ namespace ts {
     export interface BindingElement extends Declaration {
         propertyName?: PropertyName;        // Binding property name (in object binding pattern)
         dotDotDotToken?: Node;              // Present on rest binding element
-        name: Identifier | BindingPattern;  // Declared binding element name
+        name: BindingName;                  // Declared binding element name
         initializer?: Expression;           // Optional initializer
     }
 
@@ -810,6 +849,8 @@ namespace ts {
     // @kind(SyntaxKind.StringLiteral)
     export interface StringLiteral extends LiteralExpression {
         _stringLiteralBrand: any;
+        /* @internal */
+        textSourceNode?: Identifier | StringLiteral; // Allows a StringLiteral to get its text from another node (used by transforms).
     }
 
     // Note: 'brands' in our syntax nodes serve to give us a small amount of nominal typing.
@@ -827,6 +868,14 @@ namespace ts {
     // @kind(SyntaxKind.OmittedExpression)
     export interface OmittedExpression extends Expression { }
 
+    // Represents an expression that is elided as part of a transformation to emit comments on a
+    // not-emitted node. The 'expression' property of a NotEmittedExpression should be emitted.
+    // @internal
+    // @kind(SyntaxKind.NotEmittedExpression)
+    export interface PartiallyEmittedExpression extends LeftHandSideExpression {
+        expression: Expression;
+    }
+
     export interface UnaryExpression extends Expression {
         _unaryExpressionBrand: any;
     }
@@ -937,13 +986,18 @@ namespace ts {
     // The text property of a LiteralExpression stores the interpreted value of the literal in text form. For a StringLiteral,
     // or any literal of a template, this means quotes have been removed and escapes have been converted to actual characters.
     // For a NumericLiteral, the stored value is the toString() representation of the number. For example 1, 1.00, and 1e0 are all stored as just "1".
-    // @kind(SyntaxKind.NumericLiteral)
     // @kind(SyntaxKind.RegularExpressionLiteral)
     // @kind(SyntaxKind.NoSubstitutionTemplateLiteral)
     export interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
         _literalExpressionBrand: any;
     }
 
+    // @kind(SyntaxKind.NumericLiteral)
+    export interface NumericLiteral extends LiteralExpression {
+        _numericLiteralBrand: any;
+        trailingComment?: string;
+    }
+
     // @kind(SyntaxKind.TemplateHead)
     // @kind(SyntaxKind.TemplateMiddle)
     // @kind(SyntaxKind.TemplateTail)
@@ -951,6 +1005,8 @@ namespace ts {
         _templateLiteralFragmentBrand: any;
     }
 
+    export type Template = TemplateExpression | LiteralExpression;
+
     // @kind(SyntaxKind.TemplateExpression)
     export interface TemplateExpression extends PrimaryExpression {
         head: TemplateLiteralFragment;
@@ -1029,7 +1085,7 @@ namespace ts {
     // @kind(SyntaxKind.TaggedTemplateExpression)
     export interface TaggedTemplateExpression extends MemberExpression {
         tag: LeftHandSideExpression;
-        template: LiteralExpression | TemplateExpression;
+        template: Template;
     }
 
     export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator;
@@ -1080,11 +1136,13 @@ namespace ts {
     /// Either the opening tag in a <Tag>...</Tag> pair, or the lone <Tag /> in a self-closing form
     export type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
 
+    export type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute;
+
     // @kind(SyntaxKind.JsxAttribute)
     export interface JsxAttribute extends Node {
         name: Identifier;
         /// JSX attribute initializers are optional; <X y /> is sugar for <X y={true} />
-        initializer?: Expression;
+        initializer?: StringLiteral | JsxExpression;
     }
 
     // @kind(SyntaxKind.JsxSpreadAttribute)
@@ -1113,6 +1171,13 @@ namespace ts {
         _statementBrand: any;
     }
 
+    // Represents a statement that is elided as part of a transformation to emit comments on a
+    // not-emitted node.
+    // @internal
+    // @kind(SyntaxKind.NotEmittedStatement)
+    export interface NotEmittedStatement extends Statement {
+    }
+
     // @kind(SyntaxKind.EmptyStatement)
     export interface EmptyStatement extends Statement { }
 
@@ -1129,6 +1194,7 @@ namespace ts {
     // @kind(SyntaxKind.Block)
     export interface Block extends Statement {
         statements: NodeArray<Statement>;
+        /*@internal*/ multiLine?: boolean;
     }
 
     // @kind(SyntaxKind.VariableStatement)
@@ -1162,22 +1228,24 @@ namespace ts {
         expression: Expression;
     }
 
+    export type ForInitializer = VariableDeclarationList | Expression;
+
     // @kind(SyntaxKind.ForStatement)
     export interface ForStatement extends IterationStatement {
-        initializer?: VariableDeclarationList | Expression;
+        initializer?: ForInitializer;
         condition?: Expression;
         incrementor?: Expression;
     }
 
     // @kind(SyntaxKind.ForInStatement)
     export interface ForInStatement extends IterationStatement {
-        initializer: VariableDeclarationList | Expression;
+        initializer: ForInitializer;
         expression: Expression;
     }
 
     // @kind(SyntaxKind.ForOfStatement)
     export interface ForOfStatement extends IterationStatement {
-        initializer: VariableDeclarationList | Expression;
+        initializer: ForInitializer;
         expression: Expression;
     }
 
@@ -1307,7 +1375,7 @@ namespace ts {
     export interface EnumMember extends Declaration {
         // This does include ComputedPropertyName, but the parser will give an error
         // if it parses a ComputedPropertyName in an EnumMember
-        name: DeclarationName;
+        name: PropertyName;
         initializer?: Expression;
     }
 
@@ -1319,6 +1387,8 @@ namespace ts {
 
     export type ModuleBody = ModuleBlock | ModuleDeclaration;
 
+    export type ModuleName = Identifier | StringLiteral;
+
     // @kind(SyntaxKind.ModuleDeclaration)
     export interface ModuleDeclaration extends DeclarationStatement {
         name: Identifier | LiteralExpression;
@@ -1330,13 +1400,15 @@ namespace ts {
         statements: NodeArray<Statement>;
     }
 
+    export type ModuleReference = EntityName | ExternalModuleReference;
+
     // @kind(SyntaxKind.ImportEqualsDeclaration)
     export interface ImportEqualsDeclaration extends DeclarationStatement {
         name: Identifier;
 
         // 'EntityName' for an internal module reference, 'ExternalModuleReference' for an external
         // module reference.
-        moduleReference: EntityName | ExternalModuleReference;
+        moduleReference: ModuleReference;
     }
 
     // @kind(SyntaxKind.ExternalModuleReference)
@@ -1354,6 +1426,8 @@ namespace ts {
         moduleSpecifier: Expression;
     }
 
+    export type NamedImportBindings = NamespaceImport | NamedImports;
+
     // In case of:
     // import d from "mod" => name = d, namedBinding = undefined
     // import * as ns from "mod" => name = undefined, namedBinding: NamespaceImport = { name: ns }
@@ -1363,7 +1437,7 @@ namespace ts {
     // @kind(SyntaxKind.ImportClause)
     export interface ImportClause extends Declaration {
         name?: Identifier; // Default binding
-        namedBindings?: NamespaceImport | NamedImports;
+        namedBindings?: NamedImportBindings;
     }
 
     // @kind(SyntaxKind.NamespaceImport)
@@ -1702,6 +1776,8 @@ namespace ts {
         /* @internal */ imports: LiteralExpression[];
         /* @internal */ moduleAugmentations: LiteralExpression[];
         /* @internal */ patternAmbientModules?: PatternAmbientModule[];
+        // The synthesized identifier for an imported external helpers module.
+        /* @internal */ externalHelpersModuleName?: Identifier;
     }
 
     export interface ScriptReferenceHost {
@@ -1889,6 +1965,7 @@ namespace ts {
         getJsxElementAttributesType(elementNode: JsxOpeningLikeElement): Type;
         getJsxIntrinsicTagNames(): Symbol[];
         isOptionalParameter(node: ParameterDeclaration): boolean;
+        getAmbientModules(): Symbol[];
 
         // Should not be called directly.  Should only be accessed through the Program instance.
         /* @internal */ getDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
@@ -2019,12 +2096,13 @@ namespace ts {
                                             // function that can be reached at runtime (e.g. a `class`
                                             // declaration or a `var` declaration for the static side
                                             // of a type, such as the global `Promise` type in lib.d.ts).
-        VoidType,                           // The TypeReferenceNode resolves to a Void-like type.
+        VoidNullableOrNeverType,            // The TypeReferenceNode resolves to a Void-like, Nullable, or Never type.
         NumberLikeType,                     // The TypeReferenceNode resolves to a Number-like type.
         StringLikeType,                     // The TypeReferenceNode resolves to a String-like type.
         BooleanType,                        // The TypeReferenceNode resolves to a Boolean-like type.
         ArrayLikeType,                      // The TypeReferenceNode resolves to an Array-like type.
         ESSymbolType,                       // The TypeReferenceNode resolves to the ESSymbol type.
+        Promise,                            // The TypeReferenceNode resolved to the global Promise constructor symbol.
         TypeWithCallSignature,              // The TypeReferenceNode resolves to a Function type or a type
                                             // with call signatures.
         ObjectType,                         // The TypeReferenceNode resolves to any other type.
@@ -2033,7 +2111,7 @@ namespace ts {
     /* @internal */
     export interface EmitResolver {
         hasGlobalName(name: string): boolean;
-        getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration;
+        getReferencedExportContainer(node: Identifier, prefixLocals?: boolean): SourceFile | ModuleDeclaration | EnumDeclaration;
         getReferencedImportDeclaration(node: Identifier): Declaration;
         getReferencedDeclarationWithCollidingName(node: Identifier): Declaration;
         isDeclarationWithCollidingName(node: Declaration): boolean;
@@ -2053,7 +2131,7 @@ namespace ts {
         // Returns the constant value this property access resolves to, or 'undefined' for a non-constant
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         getReferencedValueDeclaration(reference: Identifier): Declaration;
-        getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind;
+        getTypeReferenceSerializationKind(typeName: EntityName, location?: Node): TypeReferenceSerializationKind;
         isOptionalParameter(node: ParameterDeclaration): boolean;
         moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean;
         isArgumentsLocalBinding(node: Identifier): boolean;
@@ -2228,6 +2306,8 @@ namespace ts {
         BodyScopedClassBinding              = 0x00100000,  // Binding to a decorated class inside of the class's body.
         NeedsLoopOutParameter               = 0x00200000,  // Block scoped binding whose value should be explicitly copied outside of the converted loop
         AssignmentsMarked                   = 0x00400000,  // Parameter assignments have been marked
+        ClassWithConstructorReference       = 0x00800000,  // Class that contains a binding to its constructor inside of the class body.
+        ConstructorReferenceInClass         = 0x01000000,  // Binding to a class constructor inside of the class's body.
     }
 
     /* @internal */
@@ -2596,6 +2676,7 @@ namespace ts {
         experimentalDecorators?: boolean;
         forceConsistentCasingInFileNames?: boolean;
         /*@internal*/help?: boolean;
+        importHelpers?: boolean;
         /*@internal*/init?: boolean;
         inlineSourceMap?: boolean;
         inlineSources?: boolean;
@@ -2983,8 +3064,117 @@ namespace ts {
          * This method is a companion for 'resolveModuleNames' and is used to resolve 'types' references to actual type declaration files
          */
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
+        getEnvironmentVariable?(name: string): string;
     }
 
+    /* @internal */
+    export const enum TransformFlags {
+        None = 0,
+
+        // Facts
+        // - Flags used to indicate that a node or subtree contains syntax that requires transformation.
+        TypeScript = 1 << 0,
+        ContainsTypeScript = 1 << 1,
+        Jsx = 1 << 2,
+        ContainsJsx = 1 << 3,
+        ES7 = 1 << 4,
+        ContainsES7 = 1 << 5,
+        ES6 = 1 << 6,
+        ContainsES6 = 1 << 7,
+        DestructuringAssignment = 1 << 8,
+        Generator = 1 << 9,
+        ContainsGenerator = 1 << 10,
+
+        // Markers
+        // - Flags used to indicate that a subtree contains a specific transformation.
+        ContainsDecorators = 1 << 11,
+        ContainsPropertyInitializer = 1 << 12,
+        ContainsLexicalThis = 1 << 13,
+        ContainsCapturedLexicalThis = 1 << 14,
+        ContainsLexicalThisInComputedPropertyName = 1 << 15,
+        ContainsDefaultValueAssignments = 1 << 16,
+        ContainsParameterPropertyAssignments = 1 << 17,
+        ContainsSpreadElementExpression = 1 << 18,
+        ContainsComputedPropertyName = 1 << 19,
+        ContainsBlockScopedBinding = 1 << 20,
+        ContainsBindingPattern = 1 << 21,
+        ContainsYield = 1 << 22,
+        ContainsHoistedDeclarationOrCompletion = 1 << 23,
+
+        HasComputedFlags = 1 << 29, // Transform flags have been computed.
+
+        // Assertions
+        // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
+        AssertTypeScript = TypeScript | ContainsTypeScript,
+        AssertJsx = Jsx | ContainsJsx,
+        AssertES7 = ES7 | ContainsES7,
+        AssertES6 = ES6 | ContainsES6,
+        AssertGenerator = Generator | ContainsGenerator,
+
+        // Scope Exclusions
+        // - Bitmasks that exclude flags from propagating out of a specific context
+        //   into the subtree flags of their container.
+        NodeExcludes = TypeScript | Jsx | ES7 | ES6 | DestructuringAssignment | Generator | HasComputedFlags,
+        ArrowFunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
+        FunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
+        ConstructorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
+        MethodOrAccessorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
+        ClassExcludes = NodeExcludes | ContainsDecorators | ContainsPropertyInitializer | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsComputedPropertyName | ContainsParameterPropertyAssignments | ContainsLexicalThisInComputedPropertyName,
+        ModuleExcludes = NodeExcludes | ContainsDecorators | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsHoistedDeclarationOrCompletion,
+        TypeExcludes = ~ContainsTypeScript,
+        ObjectLiteralExcludes = NodeExcludes | ContainsDecorators | ContainsComputedPropertyName | ContainsLexicalThisInComputedPropertyName,
+        ArrayLiteralOrCallOrNewExcludes = NodeExcludes | ContainsSpreadElementExpression,
+        VariableDeclarationListExcludes = NodeExcludes | ContainsBindingPattern,
+        ParameterExcludes = NodeExcludes | ContainsBindingPattern,
+
+        // Masks
+        // - Additional bitmasks
+        TypeScriptClassSyntaxMask = ContainsParameterPropertyAssignments | ContainsPropertyInitializer | ContainsDecorators,
+        ES6FunctionSyntaxMask = ContainsCapturedLexicalThis | ContainsDefaultValueAssignments,
+    }
+
+    /* @internal */
+    export const enum NodeEmitFlags {
+        EmitEmitHelpers = 1 << 0,                // Any emit helpers should be written to this node.
+        EmitExportStar = 1 << 1,                 // The export * helper should be written to this node.
+        EmitSuperHelper = 1 << 2,                // Emit the basic _super helper for async methods.
+        EmitAdvancedSuperHelper = 1 << 3,        // Emit the advanced _super helper for async methods.
+        UMDDefine = 1 << 4,                      // This node should be replaced with the UMD define helper.
+        SingleLine = 1 << 5,                     // The contents of this node should be emitted on a single line.
+        AdviseOnEmitNode = 1 << 6,               // The printer should invoke the onEmitNode callback when printing this node.
+        NoSubstitution = 1 << 7,                 // Disables further substitution of an expression.
+        CapturesThis = 1 << 8,                   // The function captures a lexical `this`
+        NoLeadingSourceMap = 1 << 9,             // Do not emit a leading source map location for this node.
+        NoTrailingSourceMap = 1 << 10,           // Do not emit a trailing source map location for this node.
+        NoSourceMap = NoLeadingSourceMap | NoTrailingSourceMap, // Do not emit a source map location for this node.
+        NoNestedSourceMaps = 1 << 11,            // Do not emit source map locations for children of this node.
+        NoTokenLeadingSourceMaps = 1 << 12,      // Do not emit leading source map location for token nodes.
+        NoTokenTrailingSourceMaps = 1 << 13,     // Do not emit trailing source map location for token nodes.
+        NoTokenSourceMaps = NoTokenLeadingSourceMaps | NoTokenTrailingSourceMaps, // Do not emit source map locations for tokens of this node.
+        NoLeadingComments = 1 << 14,             // Do not emit leading comments for this node.
+        NoTrailingComments = 1 << 15,            // Do not emit trailing comments for this node.
+        NoComments = NoLeadingComments | NoTrailingComments, // Do not emit comments for this node.
+        NoNestedComments = 1 << 16,
+        ExportName = 1 << 17,                    // Ensure an export prefix is added for an identifier that points to an exported declaration with a local name (see SymbolFlags.ExportHasLocal).
+        LocalName = 1 << 18,                     // Ensure an export prefix is not added for an identifier that points to an exported declaration.
+        Indented = 1 << 19,                      // Adds an explicit extra indentation level for class and function bodies when printing (used to match old emitter).
+        NoIndentation = 1 << 20,                 // Do not indent the node.
+        AsyncFunctionBody = 1 << 21,
+        ReuseTempVariableScope = 1 << 22,        // Reuse the existing temp variable scope during emit.
+        CustomPrologue = 1 << 23,                // Treat the statement as if it were a prologue directive (NOTE: Prologue directives are *not* transformed).
+    }
+
+    /** Additional context provided to `visitEachChild` */
+    /* @internal */
+    export interface LexicalEnvironment {
+        /** Starts a new lexical environment. */
+        startLexicalEnvironment(): void;
+
+        /** Ends a lexical environment, returning any declarations. */
+        endLexicalEnvironment(): Statement[];
+    }
+
+
     export interface TextSpan {
         start: number;
         length: number;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 0c026fc6b6d..2b734c98044 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2,6 +2,8 @@
 
 /* @internal */
 namespace ts {
+    export const externalHelpersModuleNameText = "tslib";
+
     export interface ReferencePathMatchResult {
         fileReference?: FileReference;
         diagnosticMessage?: DiagnosticMessage;
@@ -9,12 +11,6 @@ namespace ts {
         isTypeReferenceDirective?: boolean;
     }
 
-    export interface SynthesizedNode extends Node {
-        leadingCommentRanges?: CommentRange[];
-        trailingCommentRanges?: CommentRange[];
-        startsOnNewLine: boolean;
-    }
-
     export function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration {
         const declarations = symbol.declarations;
         if (declarations) {
@@ -107,7 +103,7 @@ namespace ts {
     }
 
     export function hasResolvedModule(sourceFile: SourceFile, moduleNameText: string): boolean {
-        return !!(sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
+        return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
     }
 
     export function getResolvedModule(sourceFile: SourceFile, moduleNameText: string): ResolvedModule {
@@ -220,6 +216,10 @@ namespace ts {
         return node.pos;
     }
 
+    export function isDefined(value: any): boolean {
+        return value !== undefined;
+    }
+
     export function getEndLinePosition(line: number, sourceFile: SourceFile): number {
         Debug.assert(line >= 0);
         const lineStarts = getLineStarts(sourceFile);
@@ -260,7 +260,7 @@ namespace ts {
     // However, this node will be 'missing' in the sense that no actual source-code/tokens are
     // contained within it.
     export function nodeIsMissing(node: Node) {
-        if (!node) {
+        if (node === undefined) {
             return true;
         }
 
@@ -334,6 +334,60 @@ namespace ts {
         return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
     }
 
+    export function getLiteralText(node: LiteralLikeNode, sourceFile: SourceFile, languageVersion: ScriptTarget) {
+        // Any template literal or string literal with an extended escape
+        // (e.g. "\u{0067}") will need to be downleveled as a escaped string literal.
+        if (languageVersion < ScriptTarget.ES6 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
+            return getQuotedEscapedLiteralText('"', node.text, '"');
+        }
+
+        // If we don't need to downlevel and we can reach the original source text using
+        // the node's parent reference, then simply get the text as it was originally written.
+        if (!nodeIsSynthesized(node) && node.parent) {
+            const text = getSourceTextOfNodeFromSourceFile(sourceFile, node);
+            if (languageVersion < ScriptTarget.ES6 && isBinaryOrOctalIntegerLiteral(node, text)) {
+                return node.text;
+            }
+            return text;
+        }
+
+        // If we can't reach the original source text, use the canonical form if it's a number,
+        // or an escaped quoted form of the original text if it's string-like.
+        switch (node.kind) {
+            case SyntaxKind.StringLiteral:
+                return getQuotedEscapedLiteralText('"', node.text, '"');
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
+                return getQuotedEscapedLiteralText("`", node.text, "`");
+            case SyntaxKind.TemplateHead:
+                return getQuotedEscapedLiteralText("`", node.text, "${");
+            case SyntaxKind.TemplateMiddle:
+                return getQuotedEscapedLiteralText("}", node.text, "${");
+            case SyntaxKind.TemplateTail:
+                return getQuotedEscapedLiteralText("}", node.text, "`");
+            case SyntaxKind.NumericLiteral:
+                return node.text;
+        }
+
+        Debug.fail(`Literal kind '${node.kind}' not accounted for.`);
+    }
+
+    export function isBinaryOrOctalIntegerLiteral(node: LiteralLikeNode, text: string) {
+        if (node.kind === SyntaxKind.NumericLiteral && text.length > 1) {
+            switch (text.charCodeAt(1)) {
+                case CharacterCodes.b:
+                case CharacterCodes.B:
+                case CharacterCodes.o:
+                case CharacterCodes.O:
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    function getQuotedEscapedLiteralText(leftQuote: string, text: string, rightQuote: string) {
+        return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
+    }
+
     // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__'
     export function escapeIdentifier(identifier: string): string {
         return identifier.length >= 2 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? "_" + identifier : identifier;
@@ -368,8 +422,7 @@ namespace ts {
     export function isBlockScopedContainerTopLevel(node: Node): boolean {
         return node.kind === SyntaxKind.SourceFile ||
             node.kind === SyntaxKind.ModuleDeclaration ||
-            isFunctionLike(node) ||
-            isFunctionBlock(node);
+            isFunctionLike(node);
     }
 
     export function isGlobalScopeAugmentation(module: ModuleDeclaration): boolean {
@@ -392,30 +445,41 @@ namespace ts {
         return false;
     }
 
+    export function isBlockScope(node: Node, parentNode: Node) {
+        switch (node.kind)  {
+            case SyntaxKind.SourceFile:
+            case SyntaxKind.CaseBlock:
+            case SyntaxKind.CatchClause:
+            case SyntaxKind.ModuleDeclaration:
+            case SyntaxKind.ForStatement:
+            case SyntaxKind.ForInStatement:
+            case SyntaxKind.ForOfStatement:
+            case SyntaxKind.Constructor:
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+            case SyntaxKind.FunctionDeclaration:
+            case SyntaxKind.FunctionExpression:
+            case SyntaxKind.ArrowFunction:
+                return true;
+
+            case SyntaxKind.Block:
+                // function block is not considered block-scope container
+                // see comment in binder.ts: bind(...), case for SyntaxKind.Block
+                return parentNode && !isFunctionLike(parentNode);
+        }
+
+        return false;
+    }
+
     // Gets the nearest enclosing block scope container that has the provided node
     // as a descendant, that is not the provided node.
     export function getEnclosingBlockScopeContainer(node: Node): Node {
         let current = node.parent;
         while (current) {
-            if (isFunctionLike(current)) {
+            if (isBlockScope(current, current.parent)) {
                 return current;
             }
-            switch (current.kind) {
-                case SyntaxKind.SourceFile:
-                case SyntaxKind.CaseBlock:
-                case SyntaxKind.CatchClause:
-                case SyntaxKind.ModuleDeclaration:
-                case SyntaxKind.ForStatement:
-                case SyntaxKind.ForInStatement:
-                case SyntaxKind.ForOfStatement:
-                    return current;
-                case SyntaxKind.Block:
-                    // function block is not considered block-scope container
-                    // see comment in binder.ts: bind(...), case for SyntaxKind.Block
-                    if (!isFunctionLike(current.parent)) {
-                        return current;
-                    }
-            }
 
             current = current.parent;
         }
@@ -540,6 +604,25 @@ namespace ts {
         return node;
     }
 
+    export function getCombinedModifierFlags(node: Node): ModifierFlags {
+        node = walkUpBindingElementsAndPatterns(node);
+        let flags = getModifierFlags(node);
+        if (node.kind === SyntaxKind.VariableDeclaration) {
+            node = node.parent;
+        }
+
+        if (node && node.kind === SyntaxKind.VariableDeclarationList) {
+            flags |= getModifierFlags(node);
+            node = node.parent;
+        }
+
+        if (node && node.kind === SyntaxKind.VariableStatement) {
+            flags |= getModifierFlags(node);
+        }
+
+        return flags;
+    }
+
     // Returns the node flags for this node and all relevant parent nodes.  This is done so that
     // nodes like variable declarations and binding elements can returned a view of their flags
     // that includes the modifiers from their container.  i.e. flags like export/declare aren't
@@ -568,7 +651,8 @@ namespace ts {
     }
 
     export function isConst(node: Node): boolean {
-        return !!(getCombinedNodeFlags(node) & NodeFlags.Const);
+        return !!(getCombinedNodeFlags(node) & NodeFlags.Const)
+            || !!(getCombinedModifierFlags(node) & ModifierFlags.Const);
     }
 
     export function isLet(node: Node): boolean {
@@ -616,7 +700,7 @@ namespace ts {
     export let fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     export let fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
 
-    export function isTypeNode(node: Node): boolean {
+    export function isPartOfTypeNode(node: Node): boolean {
         if (SyntaxKind.FirstTypeNode <= node.kind && node.kind <= SyntaxKind.LastTypeNode) {
             return true;
         }
@@ -647,7 +731,7 @@ namespace ts {
                 }
                 // At this point, node is either a qualified name or an identifier
                 Debug.assert(node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName || node.kind === SyntaxKind.PropertyAccessExpression,
-                    "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
+                    "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             case SyntaxKind.QualifiedName:
             case SyntaxKind.PropertyAccessExpression:
             case SyntaxKind.ThisKeyword:
@@ -655,11 +739,11 @@ namespace ts {
                 if (parent.kind === SyntaxKind.TypeQuery) {
                     return false;
                 }
-                // Do not recursively call isTypeNode on the parent. In the example:
+                // Do not recursively call isPartOfTypeNode on the parent. In the example:
                 //
                 //     let a: A.B.C;
                 //
-                // Calling isTypeNode would consider the qualified name A.B a type node. Only C or
+                // Calling isPartOfTypeNode would consider the qualified name A.B a type node. Only C or
                 // A.B.C is a type node.
                 if (SyntaxKind.FirstTypeNode <= parent.kind && parent.kind <= SyntaxKind.LastTypeNode) {
                     return true;
@@ -763,7 +847,7 @@ namespace ts {
                             return;
                         }
                     }
-                    else if (!isTypeNode(node)) {
+                    else if (!isPartOfTypeNode(node)) {
                         // This is the general case, which should include mostly expressions and statements.
                         // Also includes NodeArrays.
                         forEachChild(node, traverse);
@@ -772,6 +856,7 @@ namespace ts {
         }
     }
 
+
     export function isVariableLike(node: Node): node is VariableLikeDeclaration {
         if (node) {
             switch (node.kind) {
@@ -836,7 +921,7 @@ namespace ts {
         return false;
     }
 
-    export function isIterationStatement(node: Node, lookInLabeledStatements: boolean): boolean {
+    export function isIterationStatement(node: Node, lookInLabeledStatements: boolean): node is IterationStatement {
         switch (node.kind) {
             case SyntaxKind.ForStatement:
             case SyntaxKind.ForInStatement:
@@ -1012,9 +1097,9 @@ namespace ts {
     /**
      * Determines whether a node is a property or element access expression for super.
      */
-    export function isSuperPropertyOrElementAccess(node: Node) {
-        return (node.kind === SyntaxKind.PropertyAccessExpression
-            || node.kind === SyntaxKind.ElementAccessExpression)
+    export function isSuperProperty(node: Node): node is (PropertyAccessExpression | ElementAccessExpression) {
+        const kind = node.kind;
+        return (kind === SyntaxKind.PropertyAccessExpression || kind === SyntaxKind.ElementAccessExpression)
             && (<PropertyAccessExpression | ElementAccessExpression>node).expression.kind === SyntaxKind.SuperKeyword;
     }
 
@@ -1035,6 +1120,18 @@ namespace ts {
         return undefined;
     }
 
+    export function isCallLikeExpression(node: Node): node is CallLikeExpression {
+        switch (node.kind) {
+            case SyntaxKind.CallExpression:
+            case SyntaxKind.NewExpression:
+            case SyntaxKind.TaggedTemplateExpression:
+            case SyntaxKind.Decorator:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     export function getInvokedExpression(node: CallLikeExpression): Expression {
         if (node.kind === SyntaxKind.TaggedTemplateExpression) {
             return (<TaggedTemplateExpression>node).tag;
@@ -1078,12 +1175,18 @@ namespace ts {
             && nodeCanBeDecorated(node);
     }
 
-    export function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression {
-        return node.kind === SyntaxKind.PropertyAccessExpression;
+    export function nodeOrChildIsDecorated(node: Node): boolean {
+        return nodeIsDecorated(node) || childIsDecorated(node);
     }
 
-    export function isElementAccessExpression(node: Node): node is ElementAccessExpression {
-        return node.kind === SyntaxKind.ElementAccessExpression;
+    export function childIsDecorated(node: Node): boolean {
+        switch (node.kind) {
+            case SyntaxKind.ClassDeclaration:
+                return forEach((<ClassDeclaration>node).members, nodeOrChildIsDecorated);
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.SetAccessor:
+                return forEach((<FunctionLikeDeclaration>node).parameters, nodeIsDecorated);
+        }
     }
 
     export function isJSXTagName(node: Node) {
@@ -1096,7 +1199,7 @@ namespace ts {
         return false;
     }
 
-    export function isExpression(node: Node): boolean {
+    export function isPartOfExpression(node: Node): boolean {
         switch (node.kind) {
             case SyntaxKind.ThisKeyword:
             case SyntaxKind.SuperKeyword:
@@ -1192,7 +1295,7 @@ namespace ts {
                     case SyntaxKind.ExpressionWithTypeArguments:
                         return (<ExpressionWithTypeArguments>parent).expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
                     default:
-                        if (isExpression(parent)) {
+                        if (isPartOfExpression(parent)) {
                             return true;
                         }
                 }
@@ -1328,6 +1431,23 @@ namespace ts {
         }
     }
 
+    export function getNamespaceDeclarationNode(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration) {
+        if (node.kind === SyntaxKind.ImportEqualsDeclaration) {
+            return <ImportEqualsDeclaration>node;
+        }
+
+        const importClause = (<ImportDeclaration>node).importClause;
+        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === SyntaxKind.NamespaceImport) {
+            return <NamespaceImport>importClause.namedBindings;
+        }
+    }
+
+    export function isDefaultImport(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration) {
+        return node.kind === SyntaxKind.ImportDeclaration
+            && (<ImportDeclaration>node).importClause
+            && !!(<ImportDeclaration>node).importClause.name;
+    }
+
     export function hasQuestionToken(node: Node) {
         if (node) {
             switch (node.kind) {
@@ -1474,22 +1594,6 @@ namespace ts {
         return node && node.dotDotDotToken !== undefined;
     }
 
-    export function isLiteralKind(kind: SyntaxKind): boolean {
-        return SyntaxKind.FirstLiteralToken <= kind && kind <= SyntaxKind.LastLiteralToken;
-    }
-
-    export function isTextualLiteralKind(kind: SyntaxKind): boolean {
-        return kind === SyntaxKind.StringLiteral || kind === SyntaxKind.NoSubstitutionTemplateLiteral;
-    }
-
-    export function isTemplateLiteralKind(kind: SyntaxKind): boolean {
-        return SyntaxKind.FirstTemplateToken <= kind && kind <= SyntaxKind.LastTemplateToken;
-    }
-
-    export function isBindingPattern(node: Node): node is BindingPattern {
-        return !!node && (node.kind === SyntaxKind.ArrayBindingPattern || node.kind === SyntaxKind.ObjectBindingPattern);
-    }
-
     // A node is an assignment target if it is on the left hand side of an '=' token, if it is parented by a property
     // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
     // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
@@ -1515,7 +1619,7 @@ namespace ts {
         }
     }
 
-    export function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
+    export function isNodeDescendantOf(node: Node, ancestor: Node): boolean {
         while (node) {
             if (node === ancestor) return true;
             node = node.parent;
@@ -1525,7 +1629,7 @@ namespace ts {
 
     export function isInAmbientContext(node: Node): boolean {
         while (node) {
-            if (node.flags & NodeFlags.Ambient || (node.kind === SyntaxKind.SourceFile && (node as SourceFile).isDeclarationFile)) {
+            if (hasModifier(node, ModifierFlags.Ambient) || (node.kind === SyntaxKind.SourceFile && (node as SourceFile).isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -1533,85 +1637,6 @@ namespace ts {
         return false;
     }
 
-    export function isDeclaration(node: Node): boolean {
-        switch (node.kind) {
-            case SyntaxKind.ArrowFunction:
-            case SyntaxKind.BindingElement:
-            case SyntaxKind.ClassDeclaration:
-            case SyntaxKind.ClassExpression:
-            case SyntaxKind.Constructor:
-            case SyntaxKind.EnumDeclaration:
-            case SyntaxKind.EnumMember:
-            case SyntaxKind.ExportSpecifier:
-            case SyntaxKind.FunctionDeclaration:
-            case SyntaxKind.FunctionExpression:
-            case SyntaxKind.GetAccessor:
-            case SyntaxKind.ImportClause:
-            case SyntaxKind.ImportEqualsDeclaration:
-            case SyntaxKind.ImportSpecifier:
-            case SyntaxKind.InterfaceDeclaration:
-            case SyntaxKind.MethodDeclaration:
-            case SyntaxKind.MethodSignature:
-            case SyntaxKind.ModuleDeclaration:
-            case SyntaxKind.NamespaceImport:
-            case SyntaxKind.NamespaceExportDeclaration:
-            case SyntaxKind.Parameter:
-            case SyntaxKind.PropertyAssignment:
-            case SyntaxKind.PropertyDeclaration:
-            case SyntaxKind.PropertySignature:
-            case SyntaxKind.SetAccessor:
-            case SyntaxKind.ShorthandPropertyAssignment:
-            case SyntaxKind.TypeAliasDeclaration:
-            case SyntaxKind.TypeParameter:
-            case SyntaxKind.VariableDeclaration:
-            case SyntaxKind.JSDocTypedefTag:
-                return true;
-        }
-        return false;
-    }
-
-    export function isStatement(n: Node): boolean {
-        switch (n.kind) {
-            case SyntaxKind.BreakStatement:
-            case SyntaxKind.ContinueStatement:
-            case SyntaxKind.DebuggerStatement:
-            case SyntaxKind.DoStatement:
-            case SyntaxKind.ExpressionStatement:
-            case SyntaxKind.EmptyStatement:
-            case SyntaxKind.ForInStatement:
-            case SyntaxKind.ForOfStatement:
-            case SyntaxKind.ForStatement:
-            case SyntaxKind.IfStatement:
-            case SyntaxKind.LabeledStatement:
-            case SyntaxKind.ReturnStatement:
-            case SyntaxKind.SwitchStatement:
-            case SyntaxKind.ThrowStatement:
-            case SyntaxKind.TryStatement:
-            case SyntaxKind.VariableStatement:
-            case SyntaxKind.WhileStatement:
-            case SyntaxKind.WithStatement:
-            case SyntaxKind.ExportAssignment:
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    export function isClassElement(n: Node): boolean {
-        switch (n.kind) {
-            case SyntaxKind.Constructor:
-            case SyntaxKind.PropertyDeclaration:
-            case SyntaxKind.MethodDeclaration:
-            case SyntaxKind.GetAccessor:
-            case SyntaxKind.SetAccessor:
-            case SyntaxKind.MethodSignature:
-            case SyntaxKind.IndexSignature:
-                return true;
-            default:
-                return false;
-        }
-    }
-
     // True if the given identifier, string literal, or number literal is the name of a declaration node
     export function isDeclarationName(name: Node): boolean {
         if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) {
@@ -1784,7 +1809,7 @@ namespace ts {
     }
 
     export function isAsyncFunctionLike(node: Node): boolean {
-        return isFunctionLike(node) && (node.flags & NodeFlags.Async) !== 0 && !isAccessor(node);
+        return isFunctionLike(node) && hasModifier(node, ModifierFlags.Async) && !isAccessor(node);
     }
 
     export function isStringOrNumericLiteral(kind: SyntaxKind): boolean {
@@ -1876,81 +1901,290 @@ namespace ts {
         return node;
     }
 
-    export function nodeStartsNewLexicalEnvironment(n: Node): boolean {
-        return isFunctionLike(n) || n.kind === SyntaxKind.ModuleDeclaration || n.kind === SyntaxKind.SourceFile;
+    export function nodeStartsNewLexicalEnvironment(node: Node): boolean {
+        const kind = node.kind;
+        return kind === SyntaxKind.Constructor
+            || kind === SyntaxKind.FunctionExpression
+            || kind === SyntaxKind.FunctionDeclaration
+            || kind === SyntaxKind.ArrowFunction
+            || kind === SyntaxKind.MethodDeclaration
+            || kind === SyntaxKind.GetAccessor
+            || kind === SyntaxKind.SetAccessor
+            || kind === SyntaxKind.ModuleDeclaration
+            || kind === SyntaxKind.SourceFile;
     }
 
-    /**
-     * Creates a shallow, memberwise clone of a node. The "kind", "pos", "end", "flags", and "parent"
-     * properties are excluded by default, and can be provided via the "location", "flags", and
-     * "parent" parameters.
-     * @param node The node to clone.
-     * @param location An optional TextRange to use to supply the new position.
-     * @param flags The NodeFlags to use for the cloned node.
-     * @param parent The parent for the new node.
-     */
-    export function cloneNode<T extends Node>(node: T, location?: TextRange, flags?: NodeFlags, parent?: Node): T {
-        // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of
-        // the original node. We also need to exclude specific properties and only include own-
-        // properties (to skip members already defined on the shared prototype).
-        const clone = location !== undefined
-            ? <T>createNode(node.kind, location.pos, location.end)
-            : <T>createSynthesizedNode(node.kind);
+    export function nodeIsSynthesized(node: TextRange): boolean {
+        return positionIsSynthesized(node.pos)
+            || positionIsSynthesized(node.end);
+    }
 
-        for (const key in node) {
-            if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) {
-                continue;
+    export function positionIsSynthesized(pos: number): boolean {
+        // This is a fast way of testing the following conditions:
+        //  pos === undefined || pos === null || isNaN(pos) || pos < 0;
+        return !(pos >= 0);
+    }
+
+    export function getOriginalNode(node: Node): Node {
+        if (node) {
+            while (node.original !== undefined) {
+                node = node.original;
             }
-
-            (<any>clone)[key] = (<any>node)[key];
         }
 
-        if (flags !== undefined) {
-            clone.flags = flags;
-        }
-
-        if (parent !== undefined) {
-            clone.parent = parent;
-        }
-
-        return clone;
-    }
-
-    /**
-     * Creates a deep clone of an EntityName, with new parent pointers.
-     * @param node The EntityName to clone.
-     * @param parent The parent for the cloned node.
-     */
-    export function cloneEntityName(node: EntityName, parent?: Node): EntityName {
-        const clone = cloneNode(node, node, node.flags, parent);
-        if (isQualifiedName(clone)) {
-            const { left, right } = clone;
-            clone.left = cloneEntityName(left, clone);
-            clone.right = cloneNode(right, right, right.flags, parent);
-        }
-
-        return clone;
-    }
-
-    export function isQualifiedName(node: Node): node is QualifiedName {
-        return node.kind === SyntaxKind.QualifiedName;
-    }
-
-    export function nodeIsSynthesized(node: Node): boolean {
-        return node.pos === -1;
-    }
-
-    export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node {
-        const node = <SynthesizedNode>createNode(kind, /* pos */ -1, /* end */ -1);
-        node.startsOnNewLine = startsOnNewLine;
         return node;
     }
 
-    export function createSynthesizedNodeArray(): NodeArray<any> {
-        const array = <NodeArray<any>>[];
-        array.pos = -1;
-        array.end = -1;
-        return array;
+    /**
+     * Gets a value indicating whether a node originated in the parse tree.
+     *
+     * @param node The node to test.
+     */
+    export function isParseTreeNode(node: Node): boolean {
+        return (node.flags & NodeFlags.Synthesized) === 0;
+    }
+
+    /**
+     * Gets the original parse tree node for a node.
+     *
+     * @param node The original node.
+     * @returns The original parse tree node if found; otherwise, undefined.
+     */
+    export function getParseTreeNode(node: Node): Node;
+
+    /**
+     * Gets the original parse tree node for a node.
+     *
+     * @param node The original node.
+     * @param nodeTest A callback used to ensure the correct type of parse tree node is returned.
+     * @returns The original parse tree node if found; otherwise, undefined.
+     */
+    export function getParseTreeNode<T extends Node>(node: Node, nodeTest?: (node: Node) => node is T): T;
+    export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => boolean): Node {
+        if (isParseTreeNode(node)) {
+            return node;
+        }
+
+        node = getOriginalNode(node);
+
+        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
+            return node;
+        }
+
+        return undefined;
+    }
+
+    export function getOriginalSourceFiles(sourceFiles: SourceFile[]) {
+        const originalSourceFiles: SourceFile[] = [];
+        for (const sourceFile of sourceFiles) {
+            const originalSourceFile = getParseTreeNode(sourceFile, isSourceFile);
+            if (originalSourceFile) {
+                originalSourceFiles.push(originalSourceFile);
+            }
+        }
+
+        return originalSourceFiles;
+    }
+
+    export function getOriginalNodeId(node: Node) {
+        node = getOriginalNode(node);
+        return node ? getNodeId(node) : 0;
+    }
+
+    export const enum Associativity {
+        Left,
+        Right
+    }
+
+    export function getExpressionAssociativity(expression: Expression) {
+        const operator = getOperator(expression);
+        const hasArguments = expression.kind === SyntaxKind.NewExpression && (<NewExpression>expression).arguments !== undefined;
+        return getOperatorAssociativity(expression.kind, operator, hasArguments);
+    }
+
+    export function getOperatorAssociativity(kind: SyntaxKind, operator: SyntaxKind, hasArguments?: boolean) {
+        switch (kind) {
+            case SyntaxKind.NewExpression:
+                return hasArguments ? Associativity.Left : Associativity.Right;
+
+            case SyntaxKind.PrefixUnaryExpression:
+            case SyntaxKind.TypeOfExpression:
+            case SyntaxKind.VoidExpression:
+            case SyntaxKind.DeleteExpression:
+            case SyntaxKind.AwaitExpression:
+            case SyntaxKind.ConditionalExpression:
+            case SyntaxKind.YieldExpression:
+                return Associativity.Right;
+
+            case SyntaxKind.BinaryExpression:
+                switch (operator) {
+                    case SyntaxKind.AsteriskAsteriskToken:
+                    case SyntaxKind.EqualsToken:
+                    case SyntaxKind.PlusEqualsToken:
+                    case SyntaxKind.MinusEqualsToken:
+                    case SyntaxKind.AsteriskAsteriskEqualsToken:
+                    case SyntaxKind.AsteriskEqualsToken:
+                    case SyntaxKind.SlashEqualsToken:
+                    case SyntaxKind.PercentEqualsToken:
+                    case SyntaxKind.LessThanLessThanEqualsToken:
+                    case SyntaxKind.GreaterThanGreaterThanEqualsToken:
+                    case SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken:
+                    case SyntaxKind.AmpersandEqualsToken:
+                    case SyntaxKind.CaretEqualsToken:
+                    case SyntaxKind.BarEqualsToken:
+                        return Associativity.Right;
+                }
+        }
+        return Associativity.Left;
+    }
+
+    export function getExpressionPrecedence(expression: Expression) {
+        const operator = getOperator(expression);
+        const hasArguments = expression.kind === SyntaxKind.NewExpression && (<NewExpression>expression).arguments !== undefined;
+        return getOperatorPrecedence(expression.kind, operator, hasArguments);
+    }
+
+    export function getOperator(expression: Expression) {
+        if (expression.kind === SyntaxKind.BinaryExpression) {
+            return (<BinaryExpression>expression).operatorToken.kind;
+        }
+        else if (expression.kind === SyntaxKind.PrefixUnaryExpression || expression.kind === SyntaxKind.PostfixUnaryExpression) {
+            return (<PrefixUnaryExpression | PostfixUnaryExpression>expression).operator;
+        }
+        else {
+            return expression.kind;
+        }
+    }
+
+    export function getOperatorPrecedence(nodeKind: SyntaxKind, operatorKind: SyntaxKind, hasArguments?: boolean) {
+        switch (nodeKind) {
+            case SyntaxKind.ThisKeyword:
+            case SyntaxKind.SuperKeyword:
+            case SyntaxKind.Identifier:
+            case SyntaxKind.NullKeyword:
+            case SyntaxKind.TrueKeyword:
+            case SyntaxKind.FalseKeyword:
+            case SyntaxKind.NumericLiteral:
+            case SyntaxKind.StringLiteral:
+            case SyntaxKind.ArrayLiteralExpression:
+            case SyntaxKind.ObjectLiteralExpression:
+            case SyntaxKind.FunctionExpression:
+            case SyntaxKind.ArrowFunction:
+            case SyntaxKind.ClassExpression:
+            case SyntaxKind.JsxElement:
+            case SyntaxKind.JsxSelfClosingElement:
+            case SyntaxKind.RegularExpressionLiteral:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
+            case SyntaxKind.TemplateExpression:
+            case SyntaxKind.ParenthesizedExpression:
+            case SyntaxKind.OmittedExpression:
+                return 19;
+
+            case SyntaxKind.TaggedTemplateExpression:
+            case SyntaxKind.PropertyAccessExpression:
+            case SyntaxKind.ElementAccessExpression:
+                return 18;
+
+            case SyntaxKind.NewExpression:
+                return hasArguments ? 18 : 17;
+
+            case SyntaxKind.CallExpression:
+                return 17;
+
+            case SyntaxKind.PostfixUnaryExpression:
+                return 16;
+
+            case SyntaxKind.PrefixUnaryExpression:
+            case SyntaxKind.TypeOfExpression:
+            case SyntaxKind.VoidExpression:
+            case SyntaxKind.DeleteExpression:
+            case SyntaxKind.AwaitExpression:
+                return 15;
+
+            case SyntaxKind.BinaryExpression:
+                switch (operatorKind) {
+                    case SyntaxKind.ExclamationToken:
+                    case SyntaxKind.TildeToken:
+                        return 15;
+
+                    case SyntaxKind.AsteriskAsteriskToken:
+                    case SyntaxKind.AsteriskToken:
+                    case SyntaxKind.SlashToken:
+                    case SyntaxKind.PercentToken:
+                        return 14;
+
+                    case SyntaxKind.PlusToken:
+                    case SyntaxKind.MinusToken:
+                        return 13;
+
+                    case SyntaxKind.LessThanLessThanToken:
+                    case SyntaxKind.GreaterThanGreaterThanToken:
+                    case SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
+                        return 12;
+
+                    case SyntaxKind.LessThanToken:
+                    case SyntaxKind.LessThanEqualsToken:
+                    case SyntaxKind.GreaterThanToken:
+                    case SyntaxKind.GreaterThanEqualsToken:
+                    case SyntaxKind.InKeyword:
+                    case SyntaxKind.InstanceOfKeyword:
+                        return 11;
+
+                    case SyntaxKind.EqualsEqualsToken:
+                    case SyntaxKind.EqualsEqualsEqualsToken:
+                    case SyntaxKind.ExclamationEqualsToken:
+                    case SyntaxKind.ExclamationEqualsEqualsToken:
+                        return 10;
+
+                    case SyntaxKind.AmpersandToken:
+                        return 9;
+
+                    case SyntaxKind.CaretToken:
+                        return 8;
+
+                    case SyntaxKind.BarToken:
+                        return 7;
+
+                    case SyntaxKind.AmpersandAmpersandToken:
+                        return 6;
+
+                    case SyntaxKind.BarBarToken:
+                        return 5;
+
+                    case SyntaxKind.EqualsToken:
+                    case SyntaxKind.PlusEqualsToken:
+                    case SyntaxKind.MinusEqualsToken:
+                    case SyntaxKind.AsteriskAsteriskEqualsToken:
+                    case SyntaxKind.AsteriskEqualsToken:
+                    case SyntaxKind.SlashEqualsToken:
+                    case SyntaxKind.PercentEqualsToken:
+                    case SyntaxKind.LessThanLessThanEqualsToken:
+                    case SyntaxKind.GreaterThanGreaterThanEqualsToken:
+                    case SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken:
+                    case SyntaxKind.AmpersandEqualsToken:
+                    case SyntaxKind.CaretEqualsToken:
+                    case SyntaxKind.BarEqualsToken:
+                        return 3;
+
+                    case SyntaxKind.CommaToken:
+                        return 0;
+
+                    default:
+                        return -1;
+                }
+
+            case SyntaxKind.ConditionalExpression:
+                return 4;
+
+            case SyntaxKind.YieldExpression:
+                return 2;
+
+            case SyntaxKind.SpreadElementExpression:
+                return 1;
+
+            default:
+                return -1;
+        }
     }
 
     export function createDiagnosticCollection(): DiagnosticCollection {
@@ -1973,11 +2207,12 @@ namespace ts {
         }
 
         function reattachFileDiagnostics(newFile: SourceFile): void {
-            const diagnostics = fileDiagnostics[newFile.fileName];
-            if (diagnostics) {
-                for (const diagnostic of diagnostics) {
-                    diagnostic.file = newFile;
-                }
+            if (!hasProperty(fileDiagnostics, newFile.fileName)) {
+                return;
+            }
+
+            for (const diagnostic of fileDiagnostics[newFile.fileName]) {
+                diagnostic.file = newFile;
             }
         }
 
@@ -2108,6 +2343,7 @@ namespace ts {
         getLine(): number;
         getColumn(): number;
         getIndent(): number;
+        isAtStartOfLine(): boolean;
         reset(): void;
     }
 
@@ -2196,10 +2432,23 @@ namespace ts {
             getLine: () => lineCount + 1,
             getColumn: () => lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1,
             getText: () => output,
+            isAtStartOfLine: () => lineStart,
             reset
         };
     }
 
+    export function getResolvedExternalModuleName(host: EmitHost, file: SourceFile): string {
+        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
+    }
+
+    export function getExternalModuleNameFromDeclaration(host: EmitHost, resolver: EmitResolver, declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): string {
+        const file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+
     /**
      * Resolves a local path to a path which is absolute to the base of the emit
      */
@@ -2252,6 +2501,110 @@ namespace ts {
         declarationFilePath: string;
     }
 
+    /**
+     * Gets the source files that are expected to have an emit output.
+     *
+     * Originally part of `forEachExpectedEmitFile`, this functionality was extracted to support
+     * transformations.
+     *
+     * @param host An EmitHost.
+     * @param targetSourceFile An optional target source file to emit.
+     */
+    export function getSourceFilesToEmit(host: EmitHost, targetSourceFile?: SourceFile) {
+        const options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            const moduleKind = getEmitModuleKind(options);
+            const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
+            const sourceFiles = host.getSourceFiles();
+            // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
+            return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
+        }
+        else {
+            const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            return filter(sourceFiles, isNonDeclarationFile);
+        }
+    }
+
+    function isNonDeclarationFile(sourceFile: SourceFile) {
+        return !isDeclarationFile(sourceFile);
+    }
+
+    function isBundleEmitNonExternalModule(sourceFile: SourceFile) {
+        return !isDeclarationFile(sourceFile) && !isExternalModule(sourceFile);
+    }
+
+    /**
+     * Iterates over each source file to emit. The source files are expected to have been
+     * transformed for use by the pretty printer.
+     *
+     * Originally part of `forEachExpectedEmitFile`, this functionality was extracted to support
+     * transformations.
+     *
+     * @param host An EmitHost.
+     * @param sourceFiles The transformed source files to emit.
+     * @param action The action to execute.
+     */
+    export function forEachTransformedEmitFile(host: EmitHost, sourceFiles: SourceFile[],
+        action: (jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) => void) {
+        const options = host.getCompilerOptions();
+        // Emit on each source file
+        if (options.outFile || options.out) {
+            onBundledEmit(host, sourceFiles);
+        }
+        else {
+            for (const sourceFile of sourceFiles) {
+                 // Don't emit if source file is a declaration file, or was located under node_modules
+                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                    onSingleFileEmit(host, sourceFile);
+                }
+            }
+        }
+
+        function onSingleFileEmit(host: EmitHost, sourceFile: SourceFile) {
+            // JavaScript files are always LanguageVariant.JSX, as JSX syntax is allowed in .js files also.
+            // So for JavaScript files, '.jsx' is only emitted if the input was '.jsx', and JsxEmit.Preserve.
+            // For TypeScript, the only time to emit with a '.jsx' extension, is on JSX input, and JsxEmit.Preserve
+            let extension = ".js";
+            if (options.jsx === JsxEmit.Preserve) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === LanguageVariant.JSX) {
+                    // TypeScript source file preserving JSX syntax
+                    extension = ".jsx";
+                }
+            }
+            const jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
+            const sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
+            const declarationFilePath = !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
+            action(jsFilePath, sourceMapFilePath, declarationFilePath, [sourceFile], /*isBundledEmit*/ false);
+        }
+
+        function onBundledEmit(host: EmitHost, sourceFiles: SourceFile[]) {
+            if (sourceFiles.length) {
+                const jsFilePath = options.outFile || options.out;
+                const sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
+                const declarationFilePath = options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined;
+                action(jsFilePath, sourceMapFilePath, declarationFilePath, sourceFiles, /*isBundledEmit*/ true);
+            }
+        }
+    }
+
+    function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) {
+        return options.sourceMap ? jsFilePath + ".map" : undefined;
+    }
+
+    /**
+     * Iterates over the source files that are expected to have an emit output. This function
+     * is used by the legacy emitter and the declaration emitter and should not be used by
+     * the tree transforming emitter.
+     *
+     * @param host An EmitHost.
+     * @param action The action to execute.
+     * @param targetSourceFile An optional target source file to emit.
+     */
     export function forEachExpectedEmitFile(host: EmitHost,
         action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean) => void,
         targetSourceFile?: SourceFile) {
@@ -2313,10 +2666,6 @@ namespace ts {
                 action(emitFileNames, bundledSources, /*isBundledEmit*/true);
             }
         }
-
-        function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) {
-            return options.sourceMap ? jsFilePath + ".map" : undefined;
-        }
     }
 
     export function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) {
@@ -2358,7 +2707,14 @@ namespace ts {
         }
     }
 
-    export function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration) {
+    export interface AllAccessorDeclarations {
+        firstAccessor: AccessorDeclaration;
+        secondAccessor: AccessorDeclaration;
+        getAccessor: AccessorDeclaration;
+        setAccessor: AccessorDeclaration;
+    }
+
+    export function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration): AllAccessorDeclarations {
         let firstAccessor: AccessorDeclaration;
         let secondAccessor: AccessorDeclaration;
         let getAccessor: AccessorDeclaration;
@@ -2378,7 +2734,7 @@ namespace ts {
         else {
             forEach(declarations, (member: Declaration) => {
                 if ((member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor)
-                    && (member.flags & NodeFlags.Static) === (accessor.flags & NodeFlags.Static)) {
+                    && hasModifier(member, ModifierFlags.Static) === hasModifier(accessor, ModifierFlags.Static)) {
                     const memberName = getPropertyNameForPropertyNameNode(member.name);
                     const accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -2409,33 +2765,52 @@ namespace ts {
     }
 
     export function emitNewLineBeforeLeadingComments(lineMap: number[], writer: EmitTextWriter, node: TextRange, leadingComments: CommentRange[]) {
+        emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, node.pos, leadingComments);
+    }
+
+    export function emitNewLineBeforeLeadingCommentsOfPosition(lineMap: number[], writer: EmitTextWriter, pos: number, leadingComments: CommentRange[]) {
         // If the leading comments start on different line than the start of node, write new line
-        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
+        if (leadingComments && leadingComments.length && pos !== leadingComments[0].pos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
 
-    export function emitComments(text: string, lineMap: number[], writer: EmitTextWriter, comments: CommentRange[], trailingSeparator: boolean, newLine: string,
-        writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) => void) {
-        let emitLeadingSpace = !trailingSeparator;
-        forEach(comments, comment => {
-            if (emitLeadingSpace) {
-                writer.write(" ");
-                emitLeadingSpace = false;
-            }
-            writeComment(text, lineMap, writer, comment, newLine);
-            if (comment.hasTrailingNewLine) {
-                writer.writeLine();
-            }
-            else if (trailingSeparator) {
+    export function emitNewLineBeforeLeadingCommentOfPosition(lineMap: number[], writer: EmitTextWriter, pos: number, commentPos: number) {
+        // If the leading comments start on different line than the start of node, write new line
+        if (pos !== commentPos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, commentPos)) {
+            writer.writeLine();
+        }
+    }
+
+    export function emitComments(text: string, lineMap: number[], writer: EmitTextWriter, comments: CommentRange[], leadingSeparator: boolean, trailingSeparator: boolean, newLine: string,
+        writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void) {
+        if (comments && comments.length > 0) {
+            if (leadingSeparator) {
                 writer.write(" ");
             }
-            else {
-                // Emit leading space to separate comment during next comment emit
-                emitLeadingSpace = true;
+
+            let emitInterveningSeparator = false;
+            for (const comment of comments) {
+                if (emitInterveningSeparator) {
+                    writer.write(" ");
+                    emitInterveningSeparator = false;
+                }
+
+                writeComment(text, lineMap, writer, comment.pos, comment.end, newLine);
+                if (comment.hasTrailingNewLine) {
+                    writer.writeLine();
+                }
+                else {
+                    emitInterveningSeparator = true;
+                }
             }
-        });
+
+            if (emitInterveningSeparator && trailingSeparator) {
+                writer.write(" ");
+            }
+        }
     }
 
     /**
@@ -2443,7 +2818,7 @@ namespace ts {
      * the next statement by space.
      */
     export function emitDetachedComments(text: string, lineMap: number[], writer: EmitTextWriter,
-        writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) => void,
+        writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
         node: TextRange, newLine: string, removeComments: boolean) {
         let leadingComments: CommentRange[];
         let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
@@ -2492,7 +2867,7 @@ namespace ts {
                 if (nodeLine >= lastCommentLine + 2) {
                     // Valid detachedComments
                     emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
-                    emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
+                    emitComments(text, lineMap, writer, detachedComments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeComment);
                     currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: lastOrUndefined(detachedComments).end };
                 }
             }
@@ -2507,20 +2882,20 @@ namespace ts {
 
     }
 
-    export function writeCommentRange(text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) {
-        if (text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk) {
-            const firstCommentLineAndCharacter = computeLineAndCharacterOfPosition(lineMap, comment.pos);
+    export function writeCommentRange(text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) {
+        if (text.charCodeAt(commentPos + 1) === CharacterCodes.asterisk) {
+            const firstCommentLineAndCharacter = computeLineAndCharacterOfPosition(lineMap, commentPos);
             const lineCount = lineMap.length;
             let firstCommentLineIndent: number;
-            for (let pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
+            for (let pos = commentPos, currentLine = firstCommentLineAndCharacter.line; pos < commentEnd; currentLine++) {
                 const nextLineStart = (currentLine + 1) === lineCount
                     ? text.length + 1
                     : lineMap[currentLine + 1];
 
-                if (pos !== comment.pos) {
+                if (pos !== commentPos) {
                     // If we are not emitting first line, we need to write the spaces to adjust the alignment
                     if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], commentPos);
                     }
 
                     // These are number of spaces writer is going to write at current indent
@@ -2561,24 +2936,24 @@ namespace ts {
                 }
 
                 // Write the comment line text
-                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
+                writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart);
 
                 pos = nextLineStart;
             }
         }
         else {
             // Single line comment of style //....
-            writer.write(text.substring(comment.pos, comment.end));
+            writer.write(text.substring(commentPos, commentEnd));
         }
     }
 
-    function writeTrimmedCurrentLine(text: string, comment: CommentRange, writer: EmitTextWriter, newLine: string, pos: number, nextLineStart: number) {
-        const end = Math.min(comment.end, nextLineStart - 1);
+    function writeTrimmedCurrentLine(text: string, commentEnd: number, writer: EmitTextWriter, newLine: string, pos: number, nextLineStart: number) {
+        const end = Math.min(commentEnd, nextLineStart - 1);
         const currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
         if (currentLineText) {
             // trimmed forward and ending spaces text
             writer.write(currentLineText);
-            if (end !== comment.end) {
+            if (end !== commentEnd) {
                 writer.writeLine();
             }
         }
@@ -2604,65 +2979,102 @@ namespace ts {
         return currentLineIndent;
     }
 
-    export function modifierToFlag(token: SyntaxKind): NodeFlags {
-        switch (token) {
-            case SyntaxKind.StaticKeyword: return NodeFlags.Static;
-            case SyntaxKind.PublicKeyword: return NodeFlags.Public;
-            case SyntaxKind.ProtectedKeyword: return NodeFlags.Protected;
-            case SyntaxKind.PrivateKeyword: return NodeFlags.Private;
-            case SyntaxKind.AbstractKeyword: return NodeFlags.Abstract;
-            case SyntaxKind.ExportKeyword: return NodeFlags.Export;
-            case SyntaxKind.DeclareKeyword: return NodeFlags.Ambient;
-            case SyntaxKind.ConstKeyword: return NodeFlags.Const;
-            case SyntaxKind.DefaultKeyword: return NodeFlags.Default;
-            case SyntaxKind.AsyncKeyword: return NodeFlags.Async;
-            case SyntaxKind.ReadonlyKeyword: return NodeFlags.Readonly;
-        }
-        return 0;
+    export function hasModifiers(node: Node) {
+        return getModifierFlags(node) !== ModifierFlags.None;
     }
 
-    export function isLeftHandSideExpression(expr: Expression): boolean {
-        if (expr) {
-            switch (expr.kind) {
-                case SyntaxKind.PropertyAccessExpression:
-                case SyntaxKind.ElementAccessExpression:
-                case SyntaxKind.NewExpression:
-                case SyntaxKind.CallExpression:
-                case SyntaxKind.NonNullExpression:
-                case SyntaxKind.JsxElement:
-                case SyntaxKind.JsxSelfClosingElement:
-                case SyntaxKind.TaggedTemplateExpression:
-                case SyntaxKind.ArrayLiteralExpression:
-                case SyntaxKind.ParenthesizedExpression:
-                case SyntaxKind.ObjectLiteralExpression:
-                case SyntaxKind.ClassExpression:
-                case SyntaxKind.FunctionExpression:
-                case SyntaxKind.Identifier:
-                case SyntaxKind.RegularExpressionLiteral:
-                case SyntaxKind.NumericLiteral:
-                case SyntaxKind.StringLiteral:
-                case SyntaxKind.NoSubstitutionTemplateLiteral:
-                case SyntaxKind.TemplateExpression:
-                case SyntaxKind.FalseKeyword:
-                case SyntaxKind.NullKeyword:
-                case SyntaxKind.ThisKeyword:
-                case SyntaxKind.TrueKeyword:
-                case SyntaxKind.SuperKeyword:
-                    return true;
+    export function hasModifier(node: Node, flags: ModifierFlags) {
+        return (getModifierFlags(node) & flags) !== 0;
+    }
+
+    export function getModifierFlags(node: Node): ModifierFlags {
+        if (node.modifierFlagsCache & ModifierFlags.HasComputedFlags) {
+            return node.modifierFlagsCache & ~ModifierFlags.HasComputedFlags;
+        }
+
+        let flags = ModifierFlags.None;
+        if (node.modifiers) {
+            for (const modifier of node.modifiers) {
+                flags |= modifierToFlag(modifier.kind);
             }
         }
 
-        return false;
+        if (node.flags & NodeFlags.NestedNamespace) {
+            flags |= ModifierFlags.Export;
+        }
+
+        node.modifierFlagsCache = flags | ModifierFlags.HasComputedFlags;
+        return flags;
+    }
+
+    export function modifierToFlag(token: SyntaxKind): ModifierFlags {
+        switch (token) {
+            case SyntaxKind.StaticKeyword: return ModifierFlags.Static;
+            case SyntaxKind.PublicKeyword: return ModifierFlags.Public;
+            case SyntaxKind.ProtectedKeyword: return ModifierFlags.Protected;
+            case SyntaxKind.PrivateKeyword: return ModifierFlags.Private;
+            case SyntaxKind.AbstractKeyword: return ModifierFlags.Abstract;
+            case SyntaxKind.ExportKeyword: return ModifierFlags.Export;
+            case SyntaxKind.DeclareKeyword: return ModifierFlags.Ambient;
+            case SyntaxKind.ConstKeyword: return ModifierFlags.Const;
+            case SyntaxKind.DefaultKeyword: return ModifierFlags.Default;
+            case SyntaxKind.AsyncKeyword: return ModifierFlags.Async;
+            case SyntaxKind.ReadonlyKeyword: return ModifierFlags.Readonly;
+        }
+        return ModifierFlags.None;
+    }
+
+    export function isLogicalOperator(token: SyntaxKind): boolean {
+        return token === SyntaxKind.BarBarToken
+            || token === SyntaxKind.AmpersandAmpersandToken
+            || token === SyntaxKind.ExclamationToken;
     }
 
     export function isAssignmentOperator(token: SyntaxKind): boolean {
         return token >= SyntaxKind.FirstAssignment && token <= SyntaxKind.LastAssignment;
     }
 
-    export function isExpressionWithTypeArgumentsInClassExtendsClause(node: Node): boolean {
-        return node.kind === SyntaxKind.ExpressionWithTypeArguments &&
+    /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
+    export function tryGetClassExtendingExpressionWithTypeArguments(node: Node): ClassLikeDeclaration | undefined {
+        if (node.kind === SyntaxKind.ExpressionWithTypeArguments &&
             (<HeritageClause>node.parent).token === SyntaxKind.ExtendsKeyword &&
-            isClassLike(node.parent.parent);
+            isClassLike(node.parent.parent)) {
+            return node.parent.parent;
+        }
+    }
+
+    export function isDestructuringAssignment(node: Node): node is BinaryExpression {
+        if (isBinaryExpression(node)) {
+            if (node.operatorToken.kind === SyntaxKind.EqualsToken) {
+                const kind = node.left.kind;
+                return kind === SyntaxKind.ObjectLiteralExpression
+                    || kind === SyntaxKind.ArrayLiteralExpression;
+            }
+        }
+
+        return false;
+    }
+
+    // Returns false if this heritage clause element's expression contains something unsupported
+    // (i.e. not a name or dotted name).
+    export function isSupportedExpressionWithTypeArguments(node: ExpressionWithTypeArguments): boolean {
+        return isSupportedExpressionWithTypeArgumentsRest(node.expression);
+    }
+
+    function isSupportedExpressionWithTypeArgumentsRest(node: Expression): boolean {
+        if (node.kind === SyntaxKind.Identifier) {
+            return true;
+        }
+        else if (isPropertyAccessExpression(node)) {
+            return isSupportedExpressionWithTypeArgumentsRest(node.expression);
+        }
+        else {
+            return false;
+        }
+    }
+
+    export function isExpressionWithTypeArgumentsInClassExtendsClause(node: Node): boolean {
+        return tryGetClassExtendingExpressionWithTypeArguments(node) !== undefined;
     }
 
     export function isEntityNameExpression(node: Expression): node is EntityNameExpression {
@@ -2687,7 +3099,7 @@ namespace ts {
     }
 
     export function getLocalSymbolForExportDefault(symbol: Symbol) {
-        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & NodeFlags.Default) ? symbol.valueDeclaration.localSymbol : undefined;
+        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, ModifierFlags.Default) ? symbol.valueDeclaration.localSymbol : undefined;
     }
 
     export function hasJavaScriptFileExtension(fileName: string) {
@@ -2849,6 +3261,874 @@ namespace ts {
         return carriageReturnLineFeed;
     }
 
+    /**
+     * Tests whether a node and its subtree is simple enough to have its position
+     * information ignored when emitting source maps in a destructuring assignment.
+     *
+     * @param node The expression to test.
+     */
+    export function isSimpleExpression(node: Expression): boolean {
+        return isSimpleExpressionWorker(node, 0);
+    }
+
+    function isSimpleExpressionWorker(node: Expression, depth: number): boolean {
+        if (depth <= 5) {
+            const kind = node.kind;
+            if (kind === SyntaxKind.StringLiteral
+                || kind === SyntaxKind.NumericLiteral
+                || kind === SyntaxKind.RegularExpressionLiteral
+                || kind === SyntaxKind.NoSubstitutionTemplateLiteral
+                || kind === SyntaxKind.Identifier
+                || kind === SyntaxKind.ThisKeyword
+                || kind === SyntaxKind.SuperKeyword
+                || kind === SyntaxKind.TrueKeyword
+                || kind === SyntaxKind.FalseKeyword
+                || kind === SyntaxKind.NullKeyword) {
+                return true;
+            }
+            else if (kind === SyntaxKind.PropertyAccessExpression) {
+                return isSimpleExpressionWorker((<PropertyAccessExpression>node).expression, depth + 1);
+            }
+            else if (kind === SyntaxKind.ElementAccessExpression) {
+                return isSimpleExpressionWorker((<ElementAccessExpression>node).expression, depth + 1)
+                    && isSimpleExpressionWorker((<ElementAccessExpression>node).argumentExpression, depth + 1);
+            }
+            else if (kind === SyntaxKind.PrefixUnaryExpression
+                || kind === SyntaxKind.PostfixUnaryExpression) {
+                return isSimpleExpressionWorker((<PrefixUnaryExpression | PostfixUnaryExpression>node).operand, depth + 1);
+            }
+            else if (kind === SyntaxKind.BinaryExpression) {
+                return (<BinaryExpression>node).operatorToken.kind !== SyntaxKind.AsteriskAsteriskToken
+                    && isSimpleExpressionWorker((<BinaryExpression>node).left, depth + 1)
+                    && isSimpleExpressionWorker((<BinaryExpression>node).right, depth + 1);
+            }
+            else if (kind === SyntaxKind.ConditionalExpression) {
+                return isSimpleExpressionWorker((<ConditionalExpression>node).condition, depth + 1)
+                    && isSimpleExpressionWorker((<ConditionalExpression>node).whenTrue, depth + 1)
+                    && isSimpleExpressionWorker((<ConditionalExpression>node).whenFalse, depth + 1);
+            }
+            else if (kind === SyntaxKind.VoidExpression
+                || kind === SyntaxKind.TypeOfExpression
+                || kind === SyntaxKind.DeleteExpression) {
+                return isSimpleExpressionWorker((<VoidExpression | TypeOfExpression | DeleteExpression>node).expression, depth + 1);
+            }
+            else if (kind === SyntaxKind.ArrayLiteralExpression) {
+                return (<ArrayLiteralExpression>node).elements.length === 0;
+            }
+            else if (kind === SyntaxKind.ObjectLiteralExpression) {
+                return (<ObjectLiteralExpression>node).properties.length === 0;
+            }
+            else if (kind === SyntaxKind.CallExpression) {
+                if (!isSimpleExpressionWorker((<CallExpression>node).expression, depth + 1)) {
+                    return false;
+                }
+
+                for (const argument of (<CallExpression>node).arguments) {
+                    if (!isSimpleExpressionWorker(argument, depth + 1)) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    const syntaxKindCache = createMap<string>();
+
+    export function formatSyntaxKind(kind: SyntaxKind): string {
+        const syntaxKindEnum = (<any>ts).SyntaxKind;
+        if (syntaxKindEnum) {
+            if (syntaxKindCache[kind]) {
+                return syntaxKindCache[kind];
+            }
+
+            for (const name in syntaxKindEnum) {
+                if (syntaxKindEnum[name] === kind) {
+                    return syntaxKindCache[kind] = kind.toString() + " (" + name + ")";
+                }
+            }
+        }
+        else {
+            return kind.toString();
+        }
+    }
+
+    /**
+     * Increases (or decreases) a position by the provided amount.
+     *
+     * @param pos The position.
+     * @param value The delta.
+     */
+    export function movePos(pos: number, value: number) {
+        return positionIsSynthesized(pos) ? -1 : pos + value;
+    }
+
+    /**
+     * Creates a new TextRange from the provided pos and end.
+     *
+     * @param pos The start position.
+     * @param end The end position.
+     */
+    export function createRange(pos: number, end: number): TextRange {
+        return { pos, end };
+    }
+
+    /**
+     * Creates a new TextRange from a provided range with a new end position.
+     *
+     * @param range A TextRange.
+     * @param end The new end position.
+     */
+    export function moveRangeEnd(range: TextRange, end: number): TextRange {
+        return createRange(range.pos, end);
+    }
+
+    /**
+     * Creates a new TextRange from a provided range with a new start position.
+     *
+     * @param range A TextRange.
+     * @param pos The new Start position.
+     */
+    export function moveRangePos(range: TextRange, pos: number): TextRange {
+        return createRange(pos, range.end);
+    }
+
+    /**
+     * Moves the start position of a range past any decorators.
+     */
+    export function moveRangePastDecorators(node: Node): TextRange {
+        return node.decorators && node.decorators.length > 0
+            ? moveRangePos(node, node.decorators.end)
+            : node;
+    }
+
+    /**
+     * Moves the start position of a range past any decorators or modifiers.
+     */
+    export function moveRangePastModifiers(node: Node): TextRange {
+        return node.modifiers && node.modifiers.length > 0
+            ? moveRangePos(node, node.modifiers.end)
+            : moveRangePastDecorators(node);
+    }
+
+    /**
+     * Determines whether a TextRange has the same start and end positions.
+     *
+     * @param range A TextRange.
+     */
+    export function isCollapsedRange(range: TextRange) {
+        return range.pos === range.end;
+    }
+
+    /**
+     * Creates a new TextRange from a provided range with its end position collapsed to its
+     * start position.
+     *
+     * @param range A TextRange.
+     */
+    export function collapseRangeToStart(range: TextRange): TextRange {
+        return isCollapsedRange(range) ? range : moveRangeEnd(range, range.pos);
+    }
+
+    /**
+     * Creates a new TextRange from a provided range with its start position collapsed to its
+     * end position.
+     *
+     * @param range A TextRange.
+     */
+    export function collapseRangeToEnd(range: TextRange): TextRange {
+        return isCollapsedRange(range) ? range : moveRangePos(range, range.end);
+    }
+
+    /**
+     * Creates a new TextRange for a token at the provides start position.
+     *
+     * @param pos The start position.
+     * @param token The token.
+     */
+    export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
+        return createRange(pos,  pos + tokenToString(token).length);
+    }
+
+    export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
+        return rangeStartIsOnSameLineAsRangeEnd(range, range, sourceFile);
+    }
+
+    export function rangeStartPositionsAreOnSameLine(range1: TextRange, range2: TextRange, sourceFile: SourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+
+    export function rangeEndPositionsAreOnSameLine(range1: TextRange, range2: TextRange, sourceFile: SourceFile) {
+        return positionsAreOnSameLine(range1.end, range2.end, sourceFile);
+    }
+
+    export function rangeStartIsOnSameLineAsRangeEnd(range1: TextRange, range2: TextRange, sourceFile: SourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+    }
+
+    export function rangeEndIsOnSameLineAsRangeStart(range1: TextRange, range2: TextRange, sourceFile: SourceFile) {
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+
+    export function positionsAreOnSameLine(pos1: number, pos2: number, sourceFile: SourceFile) {
+        return pos1 === pos2 ||
+            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+    }
+
+    export function getStartPositionOfRange(range: TextRange, sourceFile: SourceFile) {
+        return positionIsSynthesized(range.pos) ? -1 : skipTrivia(sourceFile.text, range.pos);
+    }
+
+    export function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver) {
+        const externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[] = [];
+        const exportSpecifiers = createMap<ExportSpecifier[]>();
+        let exportEquals: ExportAssignment = undefined;
+        let hasExportStarsToExportValues = false;
+        for (const node of sourceFile.statements) {
+            switch (node.kind) {
+                case SyntaxKind.ImportDeclaration:
+                    if (!(<ImportDeclaration>node).importClause ||
+                        resolver.isReferencedAliasDeclaration((<ImportDeclaration>node).importClause, /*checkChildren*/ true)) {
+                        // import "mod"
+                        // import x from "mod" where x is referenced
+                        // import * as x from "mod" where x is referenced
+                        // import { x, y } from "mod" where at least one import is referenced
+                        externalImports.push(<ImportDeclaration>node);
+                    }
+                    break;
+
+                case SyntaxKind.ImportEqualsDeclaration:
+                    if ((<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference && resolver.isReferencedAliasDeclaration(node)) {
+                        // import x = require("mod") where x is referenced
+                        externalImports.push(<ImportEqualsDeclaration>node);
+                    }
+                    break;
+
+                case SyntaxKind.ExportDeclaration:
+                    if ((<ExportDeclaration>node).moduleSpecifier) {
+                        if (!(<ExportDeclaration>node).exportClause) {
+                            // export * from "mod"
+                            if (resolver.moduleExportsSomeValue((<ExportDeclaration>node).moduleSpecifier)) {
+                                externalImports.push(<ExportDeclaration>node);
+                                hasExportStarsToExportValues = true;
+                            }
+                        }
+                        else if (resolver.isValueAliasDeclaration(node)) {
+                            // export { x, y } from "mod" where at least one export is a value symbol
+                            externalImports.push(<ExportDeclaration>node);
+                        }
+                    }
+                    else {
+                        // export { x, y }
+                        for (const specifier of (<ExportDeclaration>node).exportClause.elements) {
+                            const name = (specifier.propertyName || specifier.name).text;
+                            (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
+                        }
+                    }
+                    break;
+
+                case SyntaxKind.ExportAssignment:
+                    if ((<ExportAssignment>node).isExportEquals && !exportEquals) {
+                        // export = x
+                        exportEquals = <ExportAssignment>node;
+                    }
+                    break;
+            }
+        }
+
+        return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues };
+    }
+
+    export function getInitializedVariables(node: VariableDeclarationList) {
+        return filter(node.declarations, isInitializedVariable);
+    }
+
+    function isInitializedVariable(node: VariableDeclaration) {
+        return node.initializer !== undefined;
+    }
+
+    /**
+     * Gets a value indicating whether a node is merged with a class declaration in the same scope.
+     */
+    export function isMergedWithClass(node: Node) {
+        if (node.symbol) {
+            for (const declaration of node.symbol.declarations) {
+                if (declaration.kind === SyntaxKind.ClassDeclaration && declaration !== node) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets a value indicating whether a node is the first declaration of its kind.
+     *
+     * @param node A Declaration node.
+     * @param kind The SyntaxKind to find among related declarations.
+     */
+    export function isFirstDeclarationOfKind(node: Node, kind: SyntaxKind) {
+        return node.symbol && getDeclarationOfKind(node.symbol, kind) === node;
+    }
+
+    // Node tests
+    //
+    // All node tests in the following list should *not* reference parent pointers so that
+    // they may be used with transformations.
+
+    // Node Arrays
+
+    export function isNodeArray<T extends Node>(array: T[]): array is NodeArray<T> {
+        return array.hasOwnProperty("pos")
+            && array.hasOwnProperty("end");
+    }
+
+    // Literals
+
+    export function isNoSubstitutionTemplateLiteral(node: Node): node is LiteralExpression {
+        return node.kind === SyntaxKind.NoSubstitutionTemplateLiteral;
+    }
+
+    export function isLiteralKind(kind: SyntaxKind): boolean {
+        return SyntaxKind.FirstLiteralToken <= kind && kind <= SyntaxKind.LastLiteralToken;
+    }
+
+    export function isTextualLiteralKind(kind: SyntaxKind): boolean {
+        return kind === SyntaxKind.StringLiteral || kind === SyntaxKind.NoSubstitutionTemplateLiteral;
+    }
+
+    export function isLiteralExpression(node: Node): node is LiteralExpression {
+        return isLiteralKind(node.kind);
+    }
+
+    // Pseudo-literals
+
+    export function isTemplateLiteralKind(kind: SyntaxKind): boolean {
+        return SyntaxKind.FirstTemplateToken <= kind && kind <= SyntaxKind.LastTemplateToken;
+    }
+
+    function isTemplateLiteralFragmentKind(kind: SyntaxKind) {
+        return kind === SyntaxKind.TemplateHead
+            || kind === SyntaxKind.TemplateMiddle
+            || kind === SyntaxKind.TemplateTail;
+    }
+
+    export function isTemplateLiteralFragment(node: Node): node is TemplateLiteralFragment {
+        return isTemplateLiteralFragmentKind(node.kind);
+    }
+
+    // Identifiers
+
+    export function isIdentifier(node: Node): node is Identifier {
+        return node.kind === SyntaxKind.Identifier;
+    }
+
+    export function isGeneratedIdentifier(node: Node): boolean {
+        // Using `>` here catches both `GeneratedIdentifierKind.None` and `undefined`.
+        return isIdentifier(node) && node.autoGenerateKind > GeneratedIdentifierKind.None;
+    }
+
+    // Keywords
+
+    export function isModifier(node: Node): node is Modifier {
+        return isModifierKind(node.kind);
+    }
+
+    // Names
+
+    export function isQualifiedName(node: Node): node is QualifiedName {
+        return node.kind === SyntaxKind.QualifiedName;
+    }
+
+    export function isComputedPropertyName(node: Node): node is ComputedPropertyName {
+        return node.kind === SyntaxKind.ComputedPropertyName;
+    }
+
+    export function isEntityName(node: Node): node is EntityName {
+        const kind = node.kind;
+        return kind === SyntaxKind.QualifiedName
+            || kind === SyntaxKind.Identifier;
+    }
+
+    export function isPropertyName(node: Node): node is PropertyName {
+        const kind = node.kind;
+        return kind === SyntaxKind.Identifier
+            || kind === SyntaxKind.StringLiteral
+            || kind === SyntaxKind.NumericLiteral
+            || kind === SyntaxKind.ComputedPropertyName;
+    }
+
+    export function isModuleName(node: Node): node is ModuleName {
+        const kind = node.kind;
+        return kind === SyntaxKind.Identifier
+            || kind === SyntaxKind.StringLiteral;
+    }
+
+    export function isBindingName(node: Node): node is BindingName {
+        const kind = node.kind;
+        return kind === SyntaxKind.Identifier
+            || kind === SyntaxKind.ObjectBindingPattern
+            || kind === SyntaxKind.ArrayBindingPattern;
+    }
+
+    // Signature elements
+
+    export function isTypeParameter(node: Node): node is TypeParameterDeclaration {
+        return node.kind === SyntaxKind.TypeParameter;
+    }
+
+    export function isParameter(node: Node): node is ParameterDeclaration {
+        return node.kind === SyntaxKind.Parameter;
+    }
+
+    export function isDecorator(node: Node): node is Decorator {
+        return node.kind === SyntaxKind.Decorator;
+    }
+
+    // Type members
+
+    export function isMethodDeclaration(node: Node): node is MethodDeclaration {
+        return node.kind === SyntaxKind.MethodDeclaration;
+    }
+
+    export function isClassElement(node: Node): node is ClassElement {
+        const kind = node.kind;
+        return kind === SyntaxKind.Constructor
+            || kind === SyntaxKind.PropertyDeclaration
+            || kind === SyntaxKind.MethodDeclaration
+            || kind === SyntaxKind.GetAccessor
+            || kind === SyntaxKind.SetAccessor
+            || kind === SyntaxKind.IndexSignature
+            || kind === SyntaxKind.SemicolonClassElement;
+    }
+
+    export function isObjectLiteralElement(node: Node): node is ObjectLiteralElement {
+        const kind = node.kind;
+        return kind === SyntaxKind.PropertyAssignment
+            || kind === SyntaxKind.ShorthandPropertyAssignment
+            || kind === SyntaxKind.MethodDeclaration
+            || kind === SyntaxKind.GetAccessor
+            || kind === SyntaxKind.SetAccessor
+            || kind === SyntaxKind.MissingDeclaration;
+    }
+
+    // Type
+
+    function isTypeNodeKind(kind: SyntaxKind) {
+        return (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode)
+            || kind === SyntaxKind.AnyKeyword
+            || kind === SyntaxKind.NumberKeyword
+            || kind === SyntaxKind.BooleanKeyword
+            || kind === SyntaxKind.StringKeyword
+            || kind === SyntaxKind.SymbolKeyword
+            || kind === SyntaxKind.VoidKeyword
+            || kind === SyntaxKind.NeverKeyword
+            || kind === SyntaxKind.ExpressionWithTypeArguments;
+    }
+
+    /**
+     * Node test that determines whether a node is a valid type node.
+     * This differs from the `isPartOfTypeNode` function which determines whether a node is *part*
+     * of a TypeNode.
+     */
+    export function isTypeNode(node: Node): node is TypeNode {
+        return isTypeNodeKind(node.kind);
+    }
+
+    // Binding patterns
+
+    export function isBindingPattern(node: Node): node is BindingPattern {
+        if (node) {
+            const kind = node.kind;
+            return kind === SyntaxKind.ArrayBindingPattern
+                || kind === SyntaxKind.ObjectBindingPattern;
+        }
+
+        return false;
+    }
+
+    export function isBindingElement(node: Node): node is BindingElement {
+        return node.kind === SyntaxKind.BindingElement;
+    }
+
+    // Expression
+
+    export function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression {
+        return node.kind === SyntaxKind.PropertyAccessExpression;
+    }
+
+    export function isElementAccessExpression(node: Node): node is ElementAccessExpression {
+        return node.kind === SyntaxKind.ElementAccessExpression;
+    }
+
+    export function isBinaryExpression(node: Node): node is BinaryExpression {
+        return node.kind === SyntaxKind.BinaryExpression;
+    }
+
+    export function isConditionalExpression(node: Node): node is ConditionalExpression {
+        return node.kind === SyntaxKind.ConditionalExpression;
+    }
+
+    export function isCallExpression(node: Node): node is CallExpression {
+        return node.kind === SyntaxKind.CallExpression;
+    }
+
+    export function isTemplate(node: Node): node is Template {
+        const kind = node.kind;
+        return kind === SyntaxKind.TemplateExpression
+            || kind === SyntaxKind.NoSubstitutionTemplateLiteral;
+    }
+
+    export function isSpreadElementExpression(node: Node): node is SpreadElementExpression {
+        return node.kind === SyntaxKind.SpreadElementExpression;
+    }
+
+    export function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments {
+        return node.kind === SyntaxKind.ExpressionWithTypeArguments;
+    }
+
+    function isLeftHandSideExpressionKind(kind: SyntaxKind): boolean {
+        return kind === SyntaxKind.PropertyAccessExpression
+            || kind === SyntaxKind.ElementAccessExpression
+            || kind === SyntaxKind.NewExpression
+            || kind === SyntaxKind.CallExpression
+            || kind === SyntaxKind.JsxElement
+            || kind === SyntaxKind.JsxSelfClosingElement
+            || kind === SyntaxKind.TaggedTemplateExpression
+            || kind === SyntaxKind.ArrayLiteralExpression
+            || kind === SyntaxKind.ParenthesizedExpression
+            || kind === SyntaxKind.ObjectLiteralExpression
+            || kind === SyntaxKind.ClassExpression
+            || kind === SyntaxKind.FunctionExpression
+            || kind === SyntaxKind.Identifier
+            || kind === SyntaxKind.RegularExpressionLiteral
+            || kind === SyntaxKind.NumericLiteral
+            || kind === SyntaxKind.StringLiteral
+            || kind === SyntaxKind.NoSubstitutionTemplateLiteral
+            || kind === SyntaxKind.TemplateExpression
+            || kind === SyntaxKind.FalseKeyword
+            || kind === SyntaxKind.NullKeyword
+            || kind === SyntaxKind.ThisKeyword
+            || kind === SyntaxKind.TrueKeyword
+            || kind === SyntaxKind.SuperKeyword
+            || kind === SyntaxKind.NonNullExpression;
+    }
+
+    export function isLeftHandSideExpression(node: Node): node is LeftHandSideExpression {
+        return isLeftHandSideExpressionKind(skipPartiallyEmittedExpressions(node).kind);
+    }
+
+    function isUnaryExpressionKind(kind: SyntaxKind): boolean {
+        return kind === SyntaxKind.PrefixUnaryExpression
+            || kind === SyntaxKind.PostfixUnaryExpression
+            || kind === SyntaxKind.DeleteExpression
+            || kind === SyntaxKind.TypeOfExpression
+            || kind === SyntaxKind.VoidExpression
+            || kind === SyntaxKind.AwaitExpression
+            || kind === SyntaxKind.TypeAssertionExpression
+            || isLeftHandSideExpressionKind(kind);
+    }
+
+    export function isUnaryExpression(node: Node): node is UnaryExpression {
+        return isUnaryExpressionKind(skipPartiallyEmittedExpressions(node).kind);
+    }
+
+    function isExpressionKind(kind: SyntaxKind) {
+        return kind === SyntaxKind.ConditionalExpression
+            || kind === SyntaxKind.YieldExpression
+            || kind === SyntaxKind.ArrowFunction
+            || kind === SyntaxKind.BinaryExpression
+            || kind === SyntaxKind.SpreadElementExpression
+            || kind === SyntaxKind.AsExpression
+            || kind === SyntaxKind.OmittedExpression
+            || isUnaryExpressionKind(kind);
+    }
+
+    export function isExpression(node: Node): node is Expression {
+        return isExpressionKind(skipPartiallyEmittedExpressions(node).kind);
+    }
+
+    export function isAssertionExpression(node: Node): node is AssertionExpression {
+        const kind = node.kind;
+        return kind === SyntaxKind.TypeAssertionExpression
+            || kind === SyntaxKind.AsExpression;
+    }
+
+    export function isPartiallyEmittedExpression(node: Node): node is PartiallyEmittedExpression {
+        return node.kind === SyntaxKind.PartiallyEmittedExpression;
+    }
+
+    export function isNotEmittedStatement(node: Node): node is NotEmittedStatement {
+        return node.kind === SyntaxKind.NotEmittedStatement;
+    }
+
+    export function isNotEmittedOrPartiallyEmittedNode(node: Node): node is NotEmittedStatement | PartiallyEmittedExpression {
+        return isNotEmittedStatement(node)
+            || isPartiallyEmittedExpression(node);
+    }
+
+    // Misc
+
+    export function isTemplateSpan(node: Node): node is TemplateSpan {
+        return node.kind === SyntaxKind.TemplateSpan;
+    }
+
+    // Element
+
+    export function isBlock(node: Node): node is Block {
+        return node.kind === SyntaxKind.Block;
+    }
+
+    export function isConciseBody(node: Node): node is ConciseBody {
+        return isBlock(node)
+            || isExpression(node);
+    }
+
+    export function isFunctionBody(node: Node): node is FunctionBody {
+        return isBlock(node);
+    }
+
+    export function isForInitializer(node: Node): node is ForInitializer {
+        return isVariableDeclarationList(node)
+            || isExpression(node);
+    }
+
+    export function isVariableDeclaration(node: Node): node is VariableDeclaration {
+        return node.kind === SyntaxKind.VariableDeclaration;
+    }
+
+    export function isVariableDeclarationList(node: Node): node is VariableDeclarationList {
+        return node.kind === SyntaxKind.VariableDeclarationList;
+    }
+
+    export function isCaseBlock(node: Node): node is CaseBlock {
+        return node.kind === SyntaxKind.CaseBlock;
+    }
+
+    export function isModuleBody(node: Node): node is ModuleBody {
+        const kind = node.kind;
+        return kind === SyntaxKind.ModuleBlock
+            || kind === SyntaxKind.ModuleDeclaration;
+    }
+
+    export function isImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration {
+        return node.kind === SyntaxKind.ImportEqualsDeclaration;
+    }
+
+    export function isImportClause(node: Node): node is ImportClause {
+        return node.kind === SyntaxKind.ImportClause;
+    }
+
+    export function isNamedImportBindings(node: Node): node is NamedImportBindings {
+        const kind = node.kind;
+        return kind === SyntaxKind.NamedImports
+            || kind === SyntaxKind.NamespaceImport;
+    }
+
+    export function isImportSpecifier(node: Node): node is ImportSpecifier {
+        return node.kind === SyntaxKind.ImportSpecifier;
+    }
+
+    export function isNamedExports(node: Node): node is NamedExports {
+        return node.kind === SyntaxKind.NamedExports;
+    }
+
+    export function isExportSpecifier(node: Node): node is ExportSpecifier {
+        return node.kind === SyntaxKind.ExportSpecifier;
+    }
+
+    export function isModuleOrEnumDeclaration(node: Node): node is ModuleDeclaration | EnumDeclaration {
+        return node.kind === SyntaxKind.ModuleDeclaration || node.kind === SyntaxKind.EnumDeclaration;
+    }
+
+    function isDeclarationKind(kind: SyntaxKind) {
+        return kind === SyntaxKind.ArrowFunction
+            || kind === SyntaxKind.BindingElement
+            || kind === SyntaxKind.ClassDeclaration
+            || kind === SyntaxKind.ClassExpression
+            || kind === SyntaxKind.Constructor
+            || kind === SyntaxKind.EnumDeclaration
+            || kind === SyntaxKind.EnumMember
+            || kind === SyntaxKind.ExportSpecifier
+            || kind === SyntaxKind.FunctionDeclaration
+            || kind === SyntaxKind.FunctionExpression
+            || kind === SyntaxKind.GetAccessor
+            || kind === SyntaxKind.ImportClause
+            || kind === SyntaxKind.ImportEqualsDeclaration
+            || kind === SyntaxKind.ImportSpecifier
+            || kind === SyntaxKind.InterfaceDeclaration
+            || kind === SyntaxKind.MethodDeclaration
+            || kind === SyntaxKind.MethodSignature
+            || kind === SyntaxKind.ModuleDeclaration
+            || kind === SyntaxKind.NamespaceExportDeclaration
+            || kind === SyntaxKind.NamespaceImport
+            || kind === SyntaxKind.Parameter
+            || kind === SyntaxKind.PropertyAssignment
+            || kind === SyntaxKind.PropertyDeclaration
+            || kind === SyntaxKind.PropertySignature
+            || kind === SyntaxKind.SetAccessor
+            || kind === SyntaxKind.ShorthandPropertyAssignment
+            || kind === SyntaxKind.TypeAliasDeclaration
+            || kind === SyntaxKind.TypeParameter
+            || kind === SyntaxKind.VariableDeclaration
+            || kind === SyntaxKind.JSDocTypedefTag;
+    }
+
+    function isDeclarationStatementKind(kind: SyntaxKind) {
+        return kind === SyntaxKind.FunctionDeclaration
+            || kind === SyntaxKind.MissingDeclaration
+            || kind === SyntaxKind.ClassDeclaration
+            || kind === SyntaxKind.InterfaceDeclaration
+            || kind === SyntaxKind.TypeAliasDeclaration
+            || kind === SyntaxKind.EnumDeclaration
+            || kind === SyntaxKind.ModuleDeclaration
+            || kind === SyntaxKind.ImportDeclaration
+            || kind === SyntaxKind.ImportEqualsDeclaration
+            || kind === SyntaxKind.ExportDeclaration
+            || kind === SyntaxKind.ExportAssignment
+            || kind === SyntaxKind.NamespaceExportDeclaration;
+    }
+
+    function isStatementKindButNotDeclarationKind(kind: SyntaxKind) {
+        return kind === SyntaxKind.BreakStatement
+            || kind === SyntaxKind.ContinueStatement
+            || kind === SyntaxKind.DebuggerStatement
+            || kind === SyntaxKind.DoStatement
+            || kind === SyntaxKind.ExpressionStatement
+            || kind === SyntaxKind.EmptyStatement
+            || kind === SyntaxKind.ForInStatement
+            || kind === SyntaxKind.ForOfStatement
+            || kind === SyntaxKind.ForStatement
+            || kind === SyntaxKind.IfStatement
+            || kind === SyntaxKind.LabeledStatement
+            || kind === SyntaxKind.ReturnStatement
+            || kind === SyntaxKind.SwitchStatement
+            || kind === SyntaxKind.ThrowStatement
+            || kind === SyntaxKind.TryStatement
+            || kind === SyntaxKind.VariableStatement
+            || kind === SyntaxKind.WhileStatement
+            || kind === SyntaxKind.WithStatement
+            || kind === SyntaxKind.NotEmittedStatement;
+    }
+
+    export function isDeclaration(node: Node): node is Declaration {
+        return isDeclarationKind(node.kind);
+    }
+
+    export function isDeclarationStatement(node: Node): node is DeclarationStatement {
+        return isDeclarationStatementKind(node.kind);
+    }
+
+    /**
+     * Determines whether the node is a statement that is not also a declaration
+     */
+    export function isStatementButNotDeclaration(node: Node): node is Statement {
+        return isStatementKindButNotDeclarationKind(node.kind);
+    }
+
+    export function isStatement(node: Node): node is Statement {
+        const kind = node.kind;
+        return isStatementKindButNotDeclarationKind(kind)
+            || isDeclarationStatementKind(kind)
+            || kind === SyntaxKind.Block;
+    }
+
+    // Module references
+
+    export function isModuleReference(node: Node): node is ModuleReference {
+        const kind = node.kind;
+        return kind === SyntaxKind.ExternalModuleReference
+            || kind === SyntaxKind.QualifiedName
+            || kind === SyntaxKind.Identifier;
+    }
+
+    // JSX
+
+    export function isJsxOpeningElement(node: Node): node is JsxOpeningElement {
+        return node.kind === SyntaxKind.JsxOpeningElement;
+    }
+
+    export function isJsxClosingElement(node: Node): node is JsxClosingElement {
+        return node.kind === SyntaxKind.JsxClosingElement;
+    }
+
+    export function isJsxTagNameExpression(node: Node): node is JsxTagNameExpression {
+        const kind = node.kind;
+        return kind === SyntaxKind.ThisKeyword
+            || kind === SyntaxKind.Identifier
+            || kind === SyntaxKind.PropertyAccessExpression;
+    }
+
+    export function isJsxChild(node: Node): node is JsxChild {
+        const kind = node.kind;
+        return kind === SyntaxKind.JsxElement
+            || kind === SyntaxKind.JsxExpression
+            || kind === SyntaxKind.JsxSelfClosingElement
+            || kind === SyntaxKind.JsxText;
+    }
+
+    export function isJsxAttributeLike(node: Node): node is JsxAttributeLike {
+        const kind = node.kind;
+        return kind === SyntaxKind.JsxAttribute
+            || kind === SyntaxKind.JsxSpreadAttribute;
+    }
+
+    export function isJsxSpreadAttribute(node: Node): node is JsxSpreadAttribute {
+        return node.kind === SyntaxKind.JsxSpreadAttribute;
+    }
+
+    export function isJsxAttribute(node: Node): node is JsxAttribute {
+        return node.kind === SyntaxKind.JsxAttribute;
+    }
+
+    export function isStringLiteralOrJsxExpression(node: Node): node is StringLiteral | JsxExpression {
+        const kind = node.kind;
+        return kind === SyntaxKind.StringLiteral
+            || kind === SyntaxKind.JsxExpression;
+    }
+
+    // Clauses
+
+    export function isCaseOrDefaultClause(node: Node): node is CaseOrDefaultClause {
+        const kind = node.kind;
+        return kind === SyntaxKind.CaseClause
+            || kind === SyntaxKind.DefaultClause;
+    }
+
+    export function isHeritageClause(node: Node): node is HeritageClause {
+        return node.kind === SyntaxKind.HeritageClause;
+    }
+
+    export function isCatchClause(node: Node): node is CatchClause {
+        return node.kind === SyntaxKind.CatchClause;
+    }
+
+
+    // Property assignments
+
+    export function isPropertyAssignment(node: Node): node is PropertyAssignment {
+        return node.kind === SyntaxKind.PropertyAssignment;
+    }
+
+    export function isShorthandPropertyAssignment(node: Node): node is ShorthandPropertyAssignment {
+        return node.kind === SyntaxKind.ShorthandPropertyAssignment;
+    }
+
+    // Enum
+
+    export function isEnumMember(node: Node): node is EnumMember {
+        return node.kind === SyntaxKind.EnumMember;
+    }
+
+    // Top-level nodes
+    export function isSourceFile(node: Node): node is SourceFile {
+        return node.kind === SyntaxKind.SourceFile;
+    }
+
     export function isWatchSet(options: CompilerOptions) {
         // Firefox has Object.prototype.watch
         return options.watch && options.hasOwnProperty("watch");
@@ -3088,6 +4368,6 @@ namespace ts {
     }
 
     export function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean {
-        return node.flags & NodeFlags.ParameterPropertyModifier && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
+        return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
     }
 }
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
new file mode 100644
index 00000000000..648fd235c44
--- /dev/null
+++ b/src/compiler/visitor.ts
@@ -0,0 +1,1360 @@
+/// <reference path="checker.ts" />
+/// <reference path="factory.ts" />
+/// <reference path="utilities.ts" />
+
+/* @internal */
+namespace ts {
+    export type VisitResult<T extends Node> = T | T[];
+
+    /**
+     * Describes an edge of a Node, used when traversing a syntax tree.
+     */
+    interface NodeEdge {
+        /** The property name for the edge. */
+        name: string;
+
+        /** Indicates that the result is optional. */
+        optional?: boolean;
+
+        /** A callback used to test whether a node is valid. */
+        test?: (node: Node) => node is Node;
+
+        /** A callback used to lift a NodeArrayNode into a valid node. */
+        lift?: (nodes: NodeArray<Node>) => Node;
+
+        /** A callback used to parenthesize a node to preserve the intended order of operations. */
+        parenthesize?: (value: Node, parentNode: Node) => Node;
+    };
+
+    /**
+     * Describes the shape of a Node.
+     */
+    type NodeTraversalPath = NodeEdge[];
+
+    /**
+     * This map contains information about the shape of each Node in "types.ts" pertaining to how
+     * each node should be traversed during a transformation.
+     *
+     * Each edge corresponds to a property in a Node subtype that should be traversed when visiting
+     * each child. The properties are assigned in the order in which traversal should occur.
+     *
+     * We only add entries for nodes that do not have a create/update pair defined in factory.ts
+     *
+     * NOTE: This needs to be kept up to date with changes to nodes in "types.ts". Currently, this
+     *       map is not comprehensive. Only node edges relevant to tree transformation are
+     *       currently defined. We may extend this to be more comprehensive, and eventually
+     *       supplant the existing `forEachChild` implementation if performance is not
+     *       significantly impacted.
+     */
+    const nodeEdgeTraversalMap = createMap<NodeTraversalPath>({
+        [SyntaxKind.QualifiedName]: [
+            { name: "left", test: isEntityName },
+            { name: "right", test: isIdentifier }
+        ],
+        [SyntaxKind.Decorator]: [
+            { name: "expression", test: isLeftHandSideExpression }
+        ],
+        [SyntaxKind.TypeAssertionExpression]: [
+            { name: "type", test: isTypeNode },
+            { name: "expression", test: isUnaryExpression }
+        ],
+        [SyntaxKind.AsExpression]: [
+            { name: "expression", test: isExpression },
+            { name: "type", test: isTypeNode }
+        ],
+        [SyntaxKind.NonNullExpression]: [
+            { name: "expression", test: isLeftHandSideExpression }
+        ],
+        [SyntaxKind.EnumDeclaration]: [
+            { name: "decorators", test: isDecorator },
+            { name: "modifiers", test: isModifier },
+            { name: "name", test: isIdentifier },
+            { name: "members", test: isEnumMember }
+        ],
+        [SyntaxKind.ModuleDeclaration]: [
+            { name: "decorators", test: isDecorator },
+            { name: "modifiers", test: isModifier },
+            { name: "name", test: isModuleName },
+            { name: "body", test: isModuleBody }
+        ],
+        [SyntaxKind.ModuleBlock]: [
+            { name: "statements", test: isStatement }
+        ],
+        [SyntaxKind.ImportEqualsDeclaration]: [
+            { name: "decorators", test: isDecorator },
+            { name: "modifiers", test: isModifier },
+            { name: "name", test: isIdentifier },
+            { name: "moduleReference", test: isModuleReference }
+        ],
+        [SyntaxKind.ExternalModuleReference]: [
+            { name: "expression", test: isExpression, optional: true }
+        ],
+        [SyntaxKind.EnumMember]: [
+            { name: "name", test: isPropertyName },
+            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList }
+        ]
+    });
+
+    function reduceNode<T>(node: Node, f: (memo: T, node: Node) => T, initial: T) {
+        return node ? f(initial, node) : initial;
+    }
+
+    /**
+     * Similar to `reduceLeft`, performs a reduction against each child of a node.
+     * NOTE: Unlike `forEachChild`, this does *not* visit every node. Only nodes added to the
+     *       `nodeEdgeTraversalMap` above will be visited.
+     *
+     * @param node The node containing the children to reduce.
+     * @param f The callback function
+     * @param initial The initial value to supply to the reduction.
+     */
+    export function reduceEachChild<T>(node: Node, f: (memo: T, node: Node) => T, initial: T): T {
+        if (node === undefined) {
+            return initial;
+        }
+
+        const kind = node.kind;
+
+        // No need to visit nodes with no children.
+        if ((kind > SyntaxKind.FirstToken && kind <= SyntaxKind.LastToken)) {
+            return initial;
+        }
+
+        // We do not yet support types.
+        if ((kind >= SyntaxKind.TypePredicate && kind <= SyntaxKind.LiteralType)) {
+            return initial;
+        }
+
+        let result = initial;
+        switch (node.kind) {
+            // Leaf nodes
+            case SyntaxKind.SemicolonClassElement:
+            case SyntaxKind.EmptyStatement:
+            case SyntaxKind.OmittedExpression:
+            case SyntaxKind.DebuggerStatement:
+            case SyntaxKind.NotEmittedStatement:
+                // No need to visit nodes with no children.
+                break;
+
+            // Names
+            case SyntaxKind.ComputedPropertyName:
+                result = reduceNode((<ComputedPropertyName>node).expression, f, result);
+                break;
+
+            // Signature elements
+            case SyntaxKind.Parameter:
+                result = reduceLeft((<ParameterDeclaration>node).decorators, f, result);
+                result = reduceLeft((<ParameterDeclaration>node).modifiers, f, result);
+                result = reduceNode((<ParameterDeclaration>node).name, f, result);
+                result = reduceNode((<ParameterDeclaration>node).type, f, result);
+                result = reduceNode((<ParameterDeclaration>node).initializer, f, result);
+                break;
+
+            case SyntaxKind.Decorator:
+                result = reduceNode((<Decorator>node).expression, f, result);
+                break;
+
+            // Type member
+            case SyntaxKind.PropertyDeclaration:
+                result = reduceLeft((<PropertyDeclaration>node).decorators, f, result);
+                result = reduceLeft((<PropertyDeclaration>node).modifiers, f, result);
+                result = reduceNode((<PropertyDeclaration>node).name, f, result);
+                result = reduceNode((<PropertyDeclaration>node).type, f, result);
+                result = reduceNode((<PropertyDeclaration>node).initializer, f, result);
+                break;
+
+            case SyntaxKind.MethodDeclaration:
+                result = reduceLeft((<MethodDeclaration>node).decorators, f, result);
+                result = reduceLeft((<MethodDeclaration>node).modifiers, f, result);
+                result = reduceNode((<MethodDeclaration>node).name, f, result);
+                result = reduceLeft((<MethodDeclaration>node).typeParameters, f, result);
+                result = reduceLeft((<MethodDeclaration>node).parameters, f, result);
+                result = reduceNode((<MethodDeclaration>node).type, f, result);
+                result = reduceNode((<MethodDeclaration>node).body, f, result);
+                break;
+
+            case SyntaxKind.Constructor:
+                result = reduceLeft((<ConstructorDeclaration>node).modifiers, f, result);
+                result = reduceLeft((<ConstructorDeclaration>node).parameters, f, result);
+                result = reduceNode((<ConstructorDeclaration>node).body, f, result);
+                break;
+
+            case SyntaxKind.GetAccessor:
+                result = reduceLeft((<GetAccessorDeclaration>node).decorators, f, result);
+                result = reduceLeft((<GetAccessorDeclaration>node).modifiers, f, result);
+                result = reduceNode((<GetAccessorDeclaration>node).name, f, result);
+                result = reduceLeft((<GetAccessorDeclaration>node).parameters, f, result);
+                result = reduceNode((<GetAccessorDeclaration>node).type, f, result);
+                result = reduceNode((<GetAccessorDeclaration>node).body, f, result);
+                break;
+
+            case SyntaxKind.SetAccessor:
+                result = reduceLeft((<GetAccessorDeclaration>node).decorators, f, result);
+                result = reduceLeft((<GetAccessorDeclaration>node).modifiers, f, result);
+                result = reduceNode((<GetAccessorDeclaration>node).name, f, result);
+                result = reduceLeft((<GetAccessorDeclaration>node).parameters, f, result);
+                result = reduceNode((<GetAccessorDeclaration>node).body, f, result);
+                break;
+
+            // Binding patterns
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ArrayBindingPattern:
+                result = reduceLeft((<BindingPattern>node).elements, f, result);
+                break;
+
+            case SyntaxKind.BindingElement:
+                result = reduceNode((<BindingElement>node).propertyName, f, result);
+                result = reduceNode((<BindingElement>node).name, f, result);
+                result = reduceNode((<BindingElement>node).initializer, f, result);
+                break;
+
+            // Expression
+            case SyntaxKind.ArrayLiteralExpression:
+                result = reduceLeft((<ArrayLiteralExpression>node).elements, f, result);
+                break;
+
+            case SyntaxKind.ObjectLiteralExpression:
+                result = reduceLeft((<ObjectLiteralExpression>node).properties, f, result);
+                break;
+
+            case SyntaxKind.PropertyAccessExpression:
+                result = reduceNode((<PropertyAccessExpression>node).expression, f, result);
+                result = reduceNode((<PropertyAccessExpression>node).name, f, result);
+                break;
+
+            case SyntaxKind.ElementAccessExpression:
+                result = reduceNode((<ElementAccessExpression>node).expression, f, result);
+                result = reduceNode((<ElementAccessExpression>node).argumentExpression, f, result);
+                break;
+
+            case SyntaxKind.CallExpression:
+                result = reduceNode((<CallExpression>node).expression, f, result);
+                result = reduceLeft((<CallExpression>node).typeArguments, f, result);
+                result = reduceLeft((<CallExpression>node).arguments, f, result);
+                break;
+
+            case SyntaxKind.NewExpression:
+                result = reduceNode((<NewExpression>node).expression, f, result);
+                result = reduceLeft((<NewExpression>node).typeArguments, f, result);
+                result = reduceLeft((<NewExpression>node).arguments, f, result);
+                break;
+
+            case SyntaxKind.TaggedTemplateExpression:
+                result = reduceNode((<TaggedTemplateExpression>node).tag, f, result);
+                result = reduceNode((<TaggedTemplateExpression>node).template, f, result);
+                break;
+
+            case SyntaxKind.FunctionExpression:
+                result = reduceLeft((<FunctionExpression>node).modifiers, f, result);
+                result = reduceNode((<FunctionExpression>node).name, f, result);
+                result = reduceLeft((<FunctionExpression>node).typeParameters, f, result);
+                result = reduceLeft((<FunctionExpression>node).parameters, f, result);
+                result = reduceNode((<FunctionExpression>node).type, f, result);
+                result = reduceNode((<FunctionExpression>node).body, f, result);
+                break;
+
+            case SyntaxKind.ArrowFunction:
+                result = reduceLeft((<ArrowFunction>node).modifiers, f, result);
+                result = reduceLeft((<ArrowFunction>node).typeParameters, f, result);
+                result = reduceLeft((<ArrowFunction>node).parameters, f, result);
+                result = reduceNode((<ArrowFunction>node).type, f, result);
+                result = reduceNode((<ArrowFunction>node).body, f, result);
+                break;
+
+            case SyntaxKind.ParenthesizedExpression:
+            case SyntaxKind.DeleteExpression:
+            case SyntaxKind.TypeOfExpression:
+            case SyntaxKind.VoidExpression:
+            case SyntaxKind.AwaitExpression:
+            case SyntaxKind.YieldExpression:
+            case SyntaxKind.SpreadElementExpression:
+            case SyntaxKind.NonNullExpression:
+                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadElementExpression | NonNullExpression>node).expression, f, result);
+                break;
+
+            case SyntaxKind.PrefixUnaryExpression:
+            case SyntaxKind.PostfixUnaryExpression:
+                result = reduceNode((<PrefixUnaryExpression | PostfixUnaryExpression>node).operand, f, result);
+                break;
+
+            case SyntaxKind.BinaryExpression:
+                result = reduceNode((<BinaryExpression>node).left, f, result);
+                result = reduceNode((<BinaryExpression>node).right, f, result);
+                break;
+
+            case SyntaxKind.ConditionalExpression:
+                result = reduceNode((<ConditionalExpression>node).condition, f, result);
+                result = reduceNode((<ConditionalExpression>node).whenTrue, f, result);
+                result = reduceNode((<ConditionalExpression>node).whenFalse, f, result);
+                break;
+
+            case SyntaxKind.TemplateExpression:
+                result = reduceNode((<TemplateExpression>node).head, f, result);
+                result = reduceLeft((<TemplateExpression>node).templateSpans, f, result);
+                break;
+
+            case SyntaxKind.ClassExpression:
+                result = reduceLeft((<ClassExpression>node).modifiers, f, result);
+                result = reduceNode((<ClassExpression>node).name, f, result);
+                result = reduceLeft((<ClassExpression>node).typeParameters, f, result);
+                result = reduceLeft((<ClassExpression>node).heritageClauses, f, result);
+                result = reduceLeft((<ClassExpression>node).members, f, result);
+                break;
+
+            case SyntaxKind.ExpressionWithTypeArguments:
+                result = reduceNode((<ExpressionWithTypeArguments>node).expression, f, result);
+                result = reduceLeft((<ExpressionWithTypeArguments>node).typeArguments, f, result);
+                break;
+
+            // Misc
+            case SyntaxKind.TemplateSpan:
+                result = reduceNode((<TemplateSpan>node).expression, f, result);
+                result = reduceNode((<TemplateSpan>node).literal, f, result);
+                break;
+
+            // Element
+            case SyntaxKind.Block:
+                result = reduceLeft((<Block>node).statements, f, result);
+                break;
+
+            case SyntaxKind.VariableStatement:
+                result = reduceLeft((<VariableStatement>node).modifiers, f, result);
+                result = reduceNode((<VariableStatement>node).declarationList, f, result);
+                break;
+
+            case SyntaxKind.ExpressionStatement:
+                result = reduceNode((<ExpressionStatement>node).expression, f, result);
+                break;
+
+            case SyntaxKind.IfStatement:
+                result = reduceNode((<IfStatement>node).expression, f, result);
+                result = reduceNode((<IfStatement>node).thenStatement, f, result);
+                result = reduceNode((<IfStatement>node).elseStatement, f, result);
+                break;
+
+            case SyntaxKind.DoStatement:
+                result = reduceNode((<DoStatement>node).statement, f, result);
+                result = reduceNode((<DoStatement>node).expression, f, result);
+                break;
+
+            case SyntaxKind.WhileStatement:
+            case SyntaxKind.WithStatement:
+                result = reduceNode((<WhileStatement | WithStatement>node).expression, f, result);
+                result = reduceNode((<WhileStatement | WithStatement>node).statement, f, result);
+                break;
+
+            case SyntaxKind.ForStatement:
+                result = reduceNode((<ForStatement>node).initializer, f, result);
+                result = reduceNode((<ForStatement>node).condition, f, result);
+                result = reduceNode((<ForStatement>node).incrementor, f, result);
+                result = reduceNode((<ForStatement>node).statement, f, result);
+                break;
+
+            case SyntaxKind.ForInStatement:
+            case SyntaxKind.ForOfStatement:
+                result = reduceNode((<ForInStatement | ForOfStatement>node).initializer, f, result);
+                result = reduceNode((<ForInStatement | ForOfStatement>node).expression, f, result);
+                result = reduceNode((<ForInStatement | ForOfStatement>node).statement, f, result);
+                break;
+
+            case SyntaxKind.ReturnStatement:
+            case SyntaxKind.ThrowStatement:
+                result = reduceNode((<ReturnStatement>node).expression, f, result);
+                break;
+
+            case SyntaxKind.SwitchStatement:
+                result = reduceNode((<SwitchStatement>node).expression, f, result);
+                result = reduceNode((<SwitchStatement>node).caseBlock, f, result);
+                break;
+
+            case SyntaxKind.LabeledStatement:
+                result = reduceNode((<LabeledStatement>node).label, f, result);
+                result = reduceNode((<LabeledStatement>node).statement, f, result);
+                break;
+
+            case SyntaxKind.TryStatement:
+                result = reduceNode((<TryStatement>node).tryBlock, f, result);
+                result = reduceNode((<TryStatement>node).catchClause, f, result);
+                result = reduceNode((<TryStatement>node).finallyBlock, f, result);
+                break;
+
+            case SyntaxKind.VariableDeclaration:
+                result = reduceNode((<VariableDeclaration>node).name, f, result);
+                result = reduceNode((<VariableDeclaration>node).type, f, result);
+                result = reduceNode((<VariableDeclaration>node).initializer, f, result);
+                break;
+
+            case SyntaxKind.VariableDeclarationList:
+                result = reduceLeft((<VariableDeclarationList>node).declarations, f, result);
+                break;
+
+            case SyntaxKind.FunctionDeclaration:
+                result = reduceLeft((<FunctionDeclaration>node).decorators, f, result);
+                result = reduceLeft((<FunctionDeclaration>node).modifiers, f, result);
+                result = reduceNode((<FunctionDeclaration>node).name, f, result);
+                result = reduceLeft((<FunctionDeclaration>node).typeParameters, f, result);
+                result = reduceLeft((<FunctionDeclaration>node).parameters, f, result);
+                result = reduceNode((<FunctionDeclaration>node).type, f, result);
+                result = reduceNode((<FunctionDeclaration>node).body, f, result);
+                break;
+
+            case SyntaxKind.ClassDeclaration:
+                result = reduceLeft((<ClassDeclaration>node).decorators, f, result);
+                result = reduceLeft((<ClassDeclaration>node).modifiers, f, result);
+                result = reduceNode((<ClassDeclaration>node).name, f, result);
+                result = reduceLeft((<ClassDeclaration>node).typeParameters, f, result);
+                result = reduceLeft((<ClassDeclaration>node).heritageClauses, f, result);
+                result = reduceLeft((<ClassDeclaration>node).members, f, result);
+                break;
+
+            case SyntaxKind.CaseBlock:
+                result = reduceLeft((<CaseBlock>node).clauses, f, result);
+                break;
+
+            case SyntaxKind.ImportDeclaration:
+                result = reduceLeft((<ImportDeclaration>node).decorators, f, result);
+                result = reduceLeft((<ImportDeclaration>node).modifiers, f, result);
+                result = reduceNode((<ImportDeclaration>node).importClause, f, result);
+                result = reduceNode((<ImportDeclaration>node).moduleSpecifier, f, result);
+                break;
+
+            case SyntaxKind.ImportClause:
+                result = reduceNode((<ImportClause>node).name, f, result);
+                result = reduceNode((<ImportClause>node).namedBindings, f, result);
+                break;
+
+            case SyntaxKind.NamespaceImport:
+                result = reduceNode((<NamespaceImport>node).name, f, result);
+                break;
+
+            case SyntaxKind.NamedImports:
+            case SyntaxKind.NamedExports:
+                result = reduceLeft((<NamedImports | NamedExports>node).elements, f, result);
+                break;
+
+            case SyntaxKind.ImportSpecifier:
+            case SyntaxKind.ExportSpecifier:
+                result = reduceNode((<ImportSpecifier | ExportSpecifier>node).propertyName, f, result);
+                result = reduceNode((<ImportSpecifier | ExportSpecifier>node).name, f, result);
+                break;
+
+            case SyntaxKind.ExportAssignment:
+                result = reduceLeft((<ExportAssignment>node).decorators, f, result);
+                result = reduceLeft((<ExportAssignment>node).modifiers, f, result);
+                result = reduceNode((<ExportAssignment>node).expression, f, result);
+                break;
+
+            case SyntaxKind.ExportDeclaration:
+                result = reduceLeft((<ExportDeclaration>node).decorators, f, result);
+                result = reduceLeft((<ExportDeclaration>node).modifiers, f, result);
+                result = reduceNode((<ExportDeclaration>node).exportClause, f, result);
+                result = reduceNode((<ExportDeclaration>node).moduleSpecifier, f, result);
+                break;
+
+            // JSX
+            case SyntaxKind.JsxElement:
+                result = reduceNode((<JsxElement>node).openingElement, f, result);
+                result = reduceLeft((<JsxElement>node).children, f, result);
+                result = reduceNode((<JsxElement>node).closingElement, f, result);
+                break;
+
+            case SyntaxKind.JsxSelfClosingElement:
+            case SyntaxKind.JsxOpeningElement:
+                result = reduceNode((<JsxSelfClosingElement | JsxOpeningElement>node).tagName, f, result);
+                result = reduceLeft((<JsxSelfClosingElement | JsxOpeningElement>node).attributes, f, result);
+                break;
+
+            case SyntaxKind.JsxClosingElement:
+                result = reduceNode((<JsxClosingElement>node).tagName, f, result);
+                break;
+
+            case SyntaxKind.JsxAttribute:
+                result = reduceNode((<JsxAttribute>node).name, f, result);
+                result = reduceNode((<JsxAttribute>node).initializer, f, result);
+                break;
+
+            case SyntaxKind.JsxSpreadAttribute:
+                result = reduceNode((<JsxSpreadAttribute>node).expression, f, result);
+                break;
+
+            case SyntaxKind.JsxExpression:
+                result = reduceNode((<JsxExpression>node).expression, f, result);
+                break;
+
+            // Clauses
+            case SyntaxKind.CaseClause:
+                result = reduceNode((<CaseClause>node).expression, f, result);
+                // fall-through
+
+            case SyntaxKind.DefaultClause:
+                result = reduceLeft((<CaseClause | DefaultClause>node).statements, f, result);
+                break;
+
+            case SyntaxKind.HeritageClause:
+                result = reduceLeft((<HeritageClause>node).types, f, result);
+                break;
+
+            case SyntaxKind.CatchClause:
+                result = reduceNode((<CatchClause>node).variableDeclaration, f, result);
+                result = reduceNode((<CatchClause>node).block, f, result);
+                break;
+
+            // Property assignments
+            case SyntaxKind.PropertyAssignment:
+                result = reduceNode((<PropertyAssignment>node).name, f, result);
+                result = reduceNode((<PropertyAssignment>node).initializer, f, result);
+                break;
+
+            case SyntaxKind.ShorthandPropertyAssignment:
+                result = reduceNode((<ShorthandPropertyAssignment>node).name, f, result);
+                result = reduceNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, f, result);
+                break;
+
+            // Top-level nodes
+            case SyntaxKind.SourceFile:
+                result = reduceLeft((<SourceFile>node).statements, f, result);
+                break;
+
+            case SyntaxKind.PartiallyEmittedExpression:
+                result = reduceNode((<PartiallyEmittedExpression>node).expression, f, result);
+                break;
+
+            default:
+                const edgeTraversalPath = nodeEdgeTraversalMap[kind];
+                if (edgeTraversalPath) {
+                    for (const edge of edgeTraversalPath) {
+                        const value = (<MapLike<any>>node)[edge.name];
+                        if (value !== undefined) {
+                            result = isArray(value)
+                                ? reduceLeft(<NodeArray<Node>>value, f, result)
+                                : f(result, <Node>value);
+                        }
+                    }
+                }
+                break;
+        }
+
+        return result;
+    }
+
+    /**
+     * Visits a Node using the supplied visitor, possibly returning a new Node in its place.
+     *
+     * @param node The Node to visit.
+     * @param visitor The callback used to visit the Node.
+     * @param test A callback to execute to verify the Node is valid.
+     * @param optional An optional value indicating whether the Node is itself optional.
+     * @param lift An optional callback to execute to lift a NodeArrayNode into a valid Node.
+     */
+    export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray<Node>) => T): T;
+    export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional: boolean, lift: (node: NodeArray<Node>) => T, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): T;
+    export function visitNode(node: Node, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: Node[]) => Node, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): Node {
+        if (node === undefined) {
+            return undefined;
+        }
+
+        const visited = visitor(node);
+        if (visited === node) {
+            return node;
+        }
+
+        let visitedNode: Node;
+        if (visited === undefined) {
+            if (!optional) {
+                Debug.failNotOptional();
+            }
+
+            return undefined;
+        }
+        else if (isArray(visited)) {
+            visitedNode = (lift || extractSingleNode)(visited);
+        }
+        else {
+            visitedNode = visited;
+        }
+
+        if (parenthesize !== undefined) {
+            visitedNode = parenthesize(visitedNode, parentNode);
+        }
+
+        Debug.assertNode(visitedNode, test);
+        aggregateTransformFlags(visitedNode);
+        return visitedNode;
+    }
+
+    /**
+     * Visits a NodeArray using the supplied visitor, possibly returning a new NodeArray in its place.
+     *
+     * @param nodes The NodeArray to visit.
+     * @param visitor The callback used to visit a Node.
+     * @param test A node test to execute for each node.
+     * @param start An optional value indicating the starting offset at which to start visiting.
+     * @param count An optional value indicating the maximum number of nodes to visit.
+     */
+    export function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number): NodeArray<T>;
+    export function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start: number, count: number, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): NodeArray<T>;
+    export function visitNodes(nodes: NodeArray<Node>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): NodeArray<Node> {
+        if (nodes === undefined) {
+            return undefined;
+        }
+
+        let updated: NodeArray<Node>;
+
+        // Ensure start and count have valid values
+        const length = nodes.length;
+        if (start === undefined || start < 0) {
+            start = 0;
+        }
+
+        if (count === undefined || count > length - start) {
+            count = length - start;
+        }
+
+        if (start > 0 || count < length) {
+            // If we are not visiting all of the original nodes, we must always create a new array.
+            // Since this is a fragment of a node array, we do not copy over the previous location
+            // and will only copy over `hasTrailingComma` if we are including the last element.
+            updated = createNodeArray<Node>([], /*location*/ undefined,
+                /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length);
+        }
+
+        // Visit each original node.
+        for (let i = 0; i < count; i++) {
+            const node = nodes[i + start];
+            const visited = node !== undefined ? visitor(node) : undefined;
+            if (updated !== undefined || visited === undefined || visited !== node) {
+                if (updated === undefined) {
+                    // Ensure we have a copy of `nodes`, up to the current index.
+                    updated = createNodeArray(nodes.slice(0, i), /*location*/ nodes, nodes.hasTrailingComma);
+                }
+                if (visited) {
+                    if (isArray(visited)) {
+                        for (let visitedNode of visited) {
+                            visitedNode = parenthesize
+                                ? parenthesize(visitedNode, parentNode)
+                                : visitedNode;
+                            Debug.assertNode(visitedNode, test);
+                            aggregateTransformFlags(visitedNode);
+                            updated.push(visitedNode);
+                        }
+                    }
+                    else {
+                        const visitedNode = parenthesize
+                            ? parenthesize(visited, parentNode)
+                            : visited;
+                        Debug.assertNode(visitedNode, test);
+                        aggregateTransformFlags(visitedNode);
+                        updated.push(visitedNode);
+                    }
+                }
+            }
+        }
+
+        return updated || nodes;
+    }
+
+    /**
+     * Visits each child of a Node using the supplied visitor, possibly returning a new Node of the same kind in its place.
+     *
+     * @param node The Node whose children will be visited.
+     * @param visitor The callback used to visit each child.
+     * @param context A lexical environment context for the visitor.
+     */
+    export function visitEachChild<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): T;
+    export function visitEachChild(node: Node, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): Node {
+        if (node === undefined) {
+            return undefined;
+        }
+
+        const kind = node.kind;
+        // No need to visit nodes with no children.
+        if ((kind > SyntaxKind.FirstToken && kind <= SyntaxKind.LastToken)) {
+            return node;
+        }
+
+        // We do not yet support types.
+        if ((kind >= SyntaxKind.TypePredicate && kind <= SyntaxKind.LiteralType)) {
+            return node;
+        }
+
+        switch (node.kind) {
+            case SyntaxKind.SemicolonClassElement:
+            case SyntaxKind.EmptyStatement:
+            case SyntaxKind.OmittedExpression:
+            case SyntaxKind.DebuggerStatement:
+                // No need to visit nodes with no children.
+                return node;
+
+            // Names
+            case SyntaxKind.ComputedPropertyName:
+                return updateComputedPropertyName(<ComputedPropertyName>node,
+                    visitNode((<ComputedPropertyName>node).expression, visitor, isExpression));
+
+            // Signature elements
+            case SyntaxKind.Parameter:
+                return updateParameterDeclaration(<ParameterDeclaration>node,
+                    visitNodes((<ParameterDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ParameterDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<ParameterDeclaration>node).name, visitor, isBindingName),
+                    visitNode((<ParameterDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
+                    visitNode((<ParameterDeclaration>node).initializer, visitor, isExpression, /*optional*/ true));
+
+            // Type member
+            case SyntaxKind.PropertyDeclaration:
+                return updateProperty(<PropertyDeclaration>node,
+                    visitNodes((<PropertyDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<PropertyDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<PropertyDeclaration>node).name, visitor, isPropertyName),
+                    visitNode((<PropertyDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
+                    visitNode((<PropertyDeclaration>node).initializer, visitor, isExpression, /*optional*/ true));
+
+            case SyntaxKind.MethodDeclaration:
+                return updateMethod(<MethodDeclaration>node,
+                    visitNodes((<MethodDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<MethodDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<MethodDeclaration>node).name, visitor, isPropertyName),
+                    visitNodes((<MethodDeclaration>node).typeParameters, visitor, isTypeParameter),
+                    (context.startLexicalEnvironment(), visitNodes((<MethodDeclaration>node).parameters, visitor, isParameter)),
+                    visitNode((<MethodDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<MethodDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            case SyntaxKind.Constructor:
+                return updateConstructor(<ConstructorDeclaration>node,
+                    visitNodes((<ConstructorDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ConstructorDeclaration>node).modifiers, visitor, isModifier),
+                    (context.startLexicalEnvironment(), visitNodes((<ConstructorDeclaration>node).parameters, visitor, isParameter)),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<ConstructorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            case SyntaxKind.GetAccessor:
+                return updateGetAccessor(<GetAccessorDeclaration>node,
+                    visitNodes((<GetAccessorDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<GetAccessorDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<GetAccessorDeclaration>node).name, visitor, isPropertyName),
+                    (context.startLexicalEnvironment(), visitNodes((<GetAccessorDeclaration>node).parameters, visitor, isParameter)),
+                    visitNode((<GetAccessorDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<GetAccessorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            case SyntaxKind.SetAccessor:
+                return updateSetAccessor(<SetAccessorDeclaration>node,
+                    visitNodes((<SetAccessorDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<SetAccessorDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<SetAccessorDeclaration>node).name, visitor, isPropertyName),
+                    (context.startLexicalEnvironment(), visitNodes((<SetAccessorDeclaration>node).parameters, visitor, isParameter)),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<SetAccessorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            // Binding patterns
+            case SyntaxKind.ObjectBindingPattern:
+                return updateObjectBindingPattern(<ObjectBindingPattern>node,
+                    visitNodes((<ObjectBindingPattern>node).elements, visitor, isBindingElement));
+
+            case SyntaxKind.ArrayBindingPattern:
+                return updateArrayBindingPattern(<ArrayBindingPattern>node,
+                    visitNodes((<ArrayBindingPattern>node).elements, visitor, isBindingElement));
+
+            case SyntaxKind.BindingElement:
+                return updateBindingElement(<BindingElement>node,
+                    visitNode((<BindingElement>node).propertyName, visitor, isPropertyName, /*optional*/ true),
+                    visitNode((<BindingElement>node).name, visitor, isBindingName),
+                    visitNode((<BindingElement>node).initializer, visitor, isExpression, /*optional*/ true));
+
+            // Expression
+            case SyntaxKind.ArrayLiteralExpression:
+                return updateArrayLiteral(<ArrayLiteralExpression>node,
+                    visitNodes((<ArrayLiteralExpression>node).elements, visitor, isExpression));
+
+            case SyntaxKind.ObjectLiteralExpression:
+                return updateObjectLiteral(<ObjectLiteralExpression>node,
+                    visitNodes((<ObjectLiteralExpression>node).properties, visitor, isObjectLiteralElement));
+
+            case SyntaxKind.PropertyAccessExpression:
+                return updatePropertyAccess(<PropertyAccessExpression>node,
+                    visitNode((<PropertyAccessExpression>node).expression, visitor, isExpression),
+                    visitNode((<PropertyAccessExpression>node).name, visitor, isIdentifier));
+
+            case SyntaxKind.ElementAccessExpression:
+                return updateElementAccess(<ElementAccessExpression>node,
+                    visitNode((<ElementAccessExpression>node).expression, visitor, isExpression),
+                    visitNode((<ElementAccessExpression>node).argumentExpression, visitor, isExpression));
+
+            case SyntaxKind.CallExpression:
+                return updateCall(<CallExpression>node,
+                    visitNode((<CallExpression>node).expression, visitor, isExpression),
+                    visitNodes((<CallExpression>node).typeArguments, visitor, isTypeNode),
+                    visitNodes((<CallExpression>node).arguments, visitor, isExpression));
+
+            case SyntaxKind.NewExpression:
+                return updateNew(<NewExpression>node,
+                    visitNode((<NewExpression>node).expression, visitor, isExpression),
+                    visitNodes((<NewExpression>node).typeArguments, visitor, isTypeNode),
+                    visitNodes((<NewExpression>node).arguments, visitor, isExpression));
+
+            case SyntaxKind.TaggedTemplateExpression:
+                return updateTaggedTemplate(<TaggedTemplateExpression>node,
+                    visitNode((<TaggedTemplateExpression>node).tag, visitor, isExpression),
+                    visitNode((<TaggedTemplateExpression>node).template, visitor, isTemplate));
+
+            case SyntaxKind.ParenthesizedExpression:
+                return updateParen(<ParenthesizedExpression>node,
+                    visitNode((<ParenthesizedExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.FunctionExpression:
+                return updateFunctionExpression(<FunctionExpression>node,
+                    visitNode((<FunctionExpression>node).name, visitor, isPropertyName),
+                    visitNodes((<FunctionExpression>node).typeParameters, visitor, isTypeParameter),
+                    (context.startLexicalEnvironment(), visitNodes((<FunctionExpression>node).parameters, visitor, isParameter)),
+                    visitNode((<FunctionExpression>node).type, visitor, isTypeNode, /*optional*/ true),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<FunctionExpression>node).body, visitor, isFunctionBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            case SyntaxKind.ArrowFunction:
+                return updateArrowFunction(<ArrowFunction>node,
+                    visitNodes((<ArrowFunction>node).modifiers, visitor, isModifier),
+                    visitNodes((<ArrowFunction>node).typeParameters, visitor, isTypeParameter),
+                    (context.startLexicalEnvironment(), visitNodes((<ArrowFunction>node).parameters, visitor, isParameter)),
+                    visitNode((<ArrowFunction>node).type, visitor, isTypeNode, /*optional*/ true),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<ArrowFunction>node).body, visitor, isConciseBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            case SyntaxKind.DeleteExpression:
+                return updateDelete(<DeleteExpression>node,
+                    visitNode((<DeleteExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.TypeOfExpression:
+                return updateTypeOf(<TypeOfExpression>node,
+                    visitNode((<TypeOfExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.VoidExpression:
+                return updateVoid(<VoidExpression>node,
+                    visitNode((<VoidExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.AwaitExpression:
+                return updateAwait(<AwaitExpression>node,
+                    visitNode((<AwaitExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.BinaryExpression:
+                return updateBinary(<BinaryExpression>node,
+                    visitNode((<BinaryExpression>node).left, visitor, isExpression),
+                    visitNode((<BinaryExpression>node).right, visitor, isExpression));
+
+            case SyntaxKind.PrefixUnaryExpression:
+                return updatePrefix(<PrefixUnaryExpression>node,
+                    visitNode((<PrefixUnaryExpression>node).operand, visitor, isExpression));
+
+            case SyntaxKind.PostfixUnaryExpression:
+                return updatePostfix(<PostfixUnaryExpression>node,
+                    visitNode((<PostfixUnaryExpression>node).operand, visitor, isExpression));
+
+            case SyntaxKind.ConditionalExpression:
+                return updateConditional(<ConditionalExpression>node,
+                    visitNode((<ConditionalExpression>node).condition, visitor, isExpression),
+                    visitNode((<ConditionalExpression>node).whenTrue, visitor, isExpression),
+                    visitNode((<ConditionalExpression>node).whenFalse, visitor, isExpression));
+
+            case SyntaxKind.TemplateExpression:
+                return updateTemplateExpression(<TemplateExpression>node,
+                    visitNode((<TemplateExpression>node).head, visitor, isTemplateLiteralFragment),
+                    visitNodes((<TemplateExpression>node).templateSpans, visitor, isTemplateSpan));
+
+            case SyntaxKind.YieldExpression:
+                return updateYield(<YieldExpression>node,
+                    visitNode((<YieldExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.SpreadElementExpression:
+                return updateSpread(<SpreadElementExpression>node,
+                    visitNode((<SpreadElementExpression>node).expression, visitor, isExpression));
+
+            case SyntaxKind.ClassExpression:
+                return updateClassExpression(<ClassExpression>node,
+                    visitNodes((<ClassExpression>node).modifiers, visitor, isModifier),
+                    visitNode((<ClassExpression>node).name, visitor, isIdentifier, /*optional*/ true),
+                    visitNodes((<ClassExpression>node).typeParameters, visitor, isTypeParameter),
+                    visitNodes((<ClassExpression>node).heritageClauses, visitor, isHeritageClause),
+                    visitNodes((<ClassExpression>node).members, visitor, isClassElement));
+
+            case SyntaxKind.ExpressionWithTypeArguments:
+                return updateExpressionWithTypeArguments(<ExpressionWithTypeArguments>node,
+                    visitNodes((<ExpressionWithTypeArguments>node).typeArguments, visitor, isTypeNode),
+                    visitNode((<ExpressionWithTypeArguments>node).expression, visitor, isExpression));
+
+            // Misc
+            case SyntaxKind.TemplateSpan:
+                return updateTemplateSpan(<TemplateSpan>node,
+                    visitNode((<TemplateSpan>node).expression, visitor, isExpression),
+                    visitNode((<TemplateSpan>node).literal, visitor, isTemplateLiteralFragment));
+
+            // Element
+            case SyntaxKind.Block:
+                return updateBlock(<Block>node,
+                    visitNodes((<Block>node).statements, visitor, isStatement));
+
+            case SyntaxKind.VariableStatement:
+                return updateVariableStatement(<VariableStatement>node,
+                    visitNodes((<VariableStatement>node).modifiers, visitor, isModifier),
+                    visitNode((<VariableStatement>node).declarationList, visitor, isVariableDeclarationList));
+
+            case SyntaxKind.ExpressionStatement:
+                return updateStatement(<ExpressionStatement>node,
+                    visitNode((<ExpressionStatement>node).expression, visitor, isExpression));
+
+            case SyntaxKind.IfStatement:
+                return updateIf(<IfStatement>node,
+                    visitNode((<IfStatement>node).expression, visitor, isExpression),
+                    visitNode((<IfStatement>node).thenStatement, visitor, isStatement, /*optional*/ false, liftToBlock),
+                    visitNode((<IfStatement>node).elseStatement, visitor, isStatement, /*optional*/ true, liftToBlock));
+
+            case SyntaxKind.DoStatement:
+                return updateDo(<DoStatement>node,
+                    visitNode((<DoStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock),
+                    visitNode((<DoStatement>node).expression, visitor, isExpression));
+
+            case SyntaxKind.WhileStatement:
+                return updateWhile(<WhileStatement>node,
+                    visitNode((<WhileStatement>node).expression, visitor, isExpression),
+                    visitNode((<WhileStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock));
+
+            case SyntaxKind.ForStatement:
+                return updateFor(<ForStatement>node,
+                    visitNode((<ForStatement>node).initializer, visitor, isForInitializer),
+                    visitNode((<ForStatement>node).condition, visitor, isExpression),
+                    visitNode((<ForStatement>node).incrementor, visitor, isExpression),
+                    visitNode((<ForStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock));
+
+            case SyntaxKind.ForInStatement:
+                return updateForIn(<ForInStatement>node,
+                    visitNode((<ForInStatement>node).initializer, visitor, isForInitializer),
+                    visitNode((<ForInStatement>node).expression, visitor, isExpression),
+                    visitNode((<ForInStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock));
+
+            case SyntaxKind.ForOfStatement:
+                return updateForOf(<ForOfStatement>node,
+                    visitNode((<ForOfStatement>node).initializer, visitor, isForInitializer),
+                    visitNode((<ForOfStatement>node).expression, visitor, isExpression),
+                    visitNode((<ForOfStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock));
+
+            case SyntaxKind.ContinueStatement:
+                return updateContinue(<ContinueStatement>node,
+                    visitNode((<ContinueStatement>node).label, visitor, isIdentifier, /*optional*/ true));
+
+            case SyntaxKind.BreakStatement:
+                return updateBreak(<BreakStatement>node,
+                    visitNode((<BreakStatement>node).label, visitor, isIdentifier, /*optional*/ true));
+
+            case SyntaxKind.ReturnStatement:
+                return updateReturn(<ReturnStatement>node,
+                    visitNode((<ReturnStatement>node).expression, visitor, isExpression, /*optional*/ true));
+
+            case SyntaxKind.WithStatement:
+                return updateWith(<WithStatement>node,
+                    visitNode((<WithStatement>node).expression, visitor, isExpression),
+                    visitNode((<WithStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock));
+
+            case SyntaxKind.SwitchStatement:
+                return updateSwitch(<SwitchStatement>node,
+                    visitNode((<SwitchStatement>node).expression, visitor, isExpression),
+                    visitNode((<SwitchStatement>node).caseBlock, visitor, isCaseBlock));
+
+            case SyntaxKind.LabeledStatement:
+                return updateLabel(<LabeledStatement>node,
+                    visitNode((<LabeledStatement>node).label, visitor, isIdentifier),
+                    visitNode((<LabeledStatement>node).statement, visitor, isStatement, /*optional*/ false, liftToBlock));
+
+            case SyntaxKind.ThrowStatement:
+                return updateThrow(<ThrowStatement>node,
+                    visitNode((<ThrowStatement>node).expression, visitor, isExpression));
+
+            case SyntaxKind.TryStatement:
+                return updateTry(<TryStatement>node,
+                    visitNode((<TryStatement>node).tryBlock, visitor, isBlock),
+                    visitNode((<TryStatement>node).catchClause, visitor, isCatchClause, /*optional*/ true),
+                    visitNode((<TryStatement>node).finallyBlock, visitor, isBlock, /*optional*/ true));
+
+            case SyntaxKind.VariableDeclaration:
+                return updateVariableDeclaration(<VariableDeclaration>node,
+                    visitNode((<VariableDeclaration>node).name, visitor, isBindingName),
+                    visitNode((<VariableDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
+                    visitNode((<VariableDeclaration>node).initializer, visitor, isExpression, /*optional*/ true));
+
+            case SyntaxKind.VariableDeclarationList:
+                return updateVariableDeclarationList(<VariableDeclarationList>node,
+                    visitNodes((<VariableDeclarationList>node).declarations, visitor, isVariableDeclaration));
+
+            case SyntaxKind.FunctionDeclaration:
+                return updateFunctionDeclaration(<FunctionDeclaration>node,
+                    visitNodes((<FunctionDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<FunctionDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<FunctionDeclaration>node).name, visitor, isPropertyName),
+                    visitNodes((<FunctionDeclaration>node).typeParameters, visitor, isTypeParameter),
+                    (context.startLexicalEnvironment(), visitNodes((<FunctionDeclaration>node).parameters, visitor, isParameter)),
+                    visitNode((<FunctionDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
+                    mergeFunctionBodyLexicalEnvironment(
+                        visitNode((<FunctionDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
+                        context.endLexicalEnvironment()));
+
+            case SyntaxKind.ClassDeclaration:
+                return updateClassDeclaration(<ClassDeclaration>node,
+                    visitNodes((<ClassDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ClassDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<ClassDeclaration>node).name, visitor, isIdentifier, /*optional*/ true),
+                    visitNodes((<ClassDeclaration>node).typeParameters, visitor, isTypeParameter),
+                    visitNodes((<ClassDeclaration>node).heritageClauses, visitor, isHeritageClause),
+                    visitNodes((<ClassDeclaration>node).members, visitor, isClassElement));
+
+            case SyntaxKind.CaseBlock:
+                return updateCaseBlock(<CaseBlock>node,
+                    visitNodes((<CaseBlock>node).clauses, visitor, isCaseOrDefaultClause));
+
+            case SyntaxKind.ImportDeclaration:
+                return updateImportDeclaration(<ImportDeclaration>node,
+                    visitNodes((<ImportDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ImportDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<ImportDeclaration>node).importClause, visitor, isImportClause, /*optional*/ true),
+                    visitNode((<ImportDeclaration>node).moduleSpecifier, visitor, isExpression));
+
+            case SyntaxKind.ImportClause:
+                return updateImportClause(<ImportClause>node,
+                    visitNode((<ImportClause>node).name, visitor, isIdentifier, /*optional*/ true),
+                    visitNode((<ImportClause>node).namedBindings, visitor, isNamedImportBindings, /*optional*/ true));
+
+            case SyntaxKind.NamespaceImport:
+                return updateNamespaceImport(<NamespaceImport>node,
+                    visitNode((<NamespaceImport>node).name, visitor, isIdentifier));
+
+            case SyntaxKind.NamedImports:
+                return updateNamedImports(<NamedImports>node,
+                    visitNodes((<NamedImports>node).elements, visitor, isImportSpecifier));
+
+            case SyntaxKind.ImportSpecifier:
+                return updateImportSpecifier(<ImportSpecifier>node,
+                    visitNode((<ImportSpecifier>node).propertyName, visitor, isIdentifier, /*optional*/ true),
+                    visitNode((<ImportSpecifier>node).name, visitor, isIdentifier));
+
+            case SyntaxKind.ExportAssignment:
+                return updateExportAssignment(<ExportAssignment>node,
+                    visitNodes((<ExportAssignment>node).decorators, visitor, isDecorator),
+                    visitNodes((<ExportAssignment>node).modifiers, visitor, isModifier),
+                    visitNode((<ExportAssignment>node).expression, visitor, isExpression));
+
+            case SyntaxKind.ExportDeclaration:
+                return updateExportDeclaration(<ExportDeclaration>node,
+                    visitNodes((<ExportDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ExportDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<ExportDeclaration>node).exportClause, visitor, isNamedExports, /*optional*/ true),
+                    visitNode((<ExportDeclaration>node).moduleSpecifier, visitor, isExpression, /*optional*/ true));
+
+            case SyntaxKind.NamedExports:
+                return updateNamedExports(<NamedExports>node,
+                    visitNodes((<NamedExports>node).elements, visitor, isExportSpecifier));
+
+            case SyntaxKind.ExportSpecifier:
+                return updateExportSpecifier(<ExportSpecifier>node,
+                    visitNode((<ExportSpecifier>node).propertyName, visitor, isIdentifier, /*optional*/ true),
+                    visitNode((<ExportSpecifier>node).name, visitor, isIdentifier));
+
+            // JSX
+            case SyntaxKind.JsxElement:
+                return updateJsxElement(<JsxElement>node,
+                    visitNode((<JsxElement>node).openingElement, visitor, isJsxOpeningElement),
+                    visitNodes((<JsxElement>node).children, visitor, isJsxChild),
+                    visitNode((<JsxElement>node).closingElement, visitor, isJsxClosingElement));
+
+            case SyntaxKind.JsxSelfClosingElement:
+                return updateJsxSelfClosingElement(<JsxSelfClosingElement>node,
+                    visitNode((<JsxSelfClosingElement>node).tagName, visitor, isJsxTagNameExpression),
+                    visitNodes((<JsxSelfClosingElement>node).attributes, visitor, isJsxAttributeLike));
+
+            case SyntaxKind.JsxOpeningElement:
+                return updateJsxOpeningElement(<JsxOpeningElement>node,
+                    visitNode((<JsxOpeningElement>node).tagName, visitor, isJsxTagNameExpression),
+                    visitNodes((<JsxOpeningElement>node).attributes, visitor, isJsxAttributeLike));
+
+            case SyntaxKind.JsxClosingElement:
+                return updateJsxClosingElement(<JsxClosingElement>node,
+                    visitNode((<JsxClosingElement>node).tagName, visitor, isJsxTagNameExpression));
+
+            case SyntaxKind.JsxAttribute:
+                return updateJsxAttribute(<JsxAttribute>node,
+                    visitNode((<JsxAttribute>node).name, visitor, isIdentifier),
+                    visitNode((<JsxAttribute>node).initializer, visitor, isStringLiteralOrJsxExpression));
+
+            case SyntaxKind.JsxSpreadAttribute:
+                return updateJsxSpreadAttribute(<JsxSpreadAttribute>node,
+                    visitNode((<JsxSpreadAttribute>node).expression, visitor, isExpression));
+
+            case SyntaxKind.JsxExpression:
+                return updateJsxExpression(<JsxExpression>node,
+                    visitNode((<JsxExpression>node).expression, visitor, isExpression));
+
+            // Clauses
+            case SyntaxKind.CaseClause:
+                return updateCaseClause(<CaseClause>node,
+                    visitNode((<CaseClause>node).expression, visitor, isExpression),
+                    visitNodes((<CaseClause>node).statements, visitor, isStatement));
+
+            case SyntaxKind.DefaultClause:
+                return updateDefaultClause(<DefaultClause>node,
+                    visitNodes((<DefaultClause>node).statements, visitor, isStatement));
+
+            case SyntaxKind.HeritageClause:
+                return updateHeritageClause(<HeritageClause>node,
+                    visitNodes((<HeritageClause>node).types, visitor, isExpressionWithTypeArguments));
+
+            case SyntaxKind.CatchClause:
+                return updateCatchClause(<CatchClause>node,
+                    visitNode((<CatchClause>node).variableDeclaration, visitor, isVariableDeclaration),
+                    visitNode((<CatchClause>node).block, visitor, isBlock));
+
+            // Property assignments
+            case SyntaxKind.PropertyAssignment:
+                return updatePropertyAssignment(<PropertyAssignment>node,
+                    visitNode((<PropertyAssignment>node).name, visitor, isPropertyName),
+                    visitNode((<PropertyAssignment>node).initializer, visitor, isExpression));
+
+            case SyntaxKind.ShorthandPropertyAssignment:
+                return updateShorthandPropertyAssignment(<ShorthandPropertyAssignment>node,
+                    visitNode((<ShorthandPropertyAssignment>node).name, visitor, isIdentifier),
+                    visitNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, visitor, isExpression));
+
+            // Top-level nodes
+            case SyntaxKind.SourceFile:
+                context.startLexicalEnvironment();
+                return updateSourceFileNode(<SourceFile>node,
+                    createNodeArray(
+                        concatenate(
+                            visitNodes((<SourceFile>node).statements, visitor, isStatement),
+                            context.endLexicalEnvironment()),
+                        (<SourceFile>node).statements));
+
+            // Transformation nodes
+            case SyntaxKind.PartiallyEmittedExpression:
+                return updatePartiallyEmittedExpression(<PartiallyEmittedExpression>node,
+                    visitNode((<PartiallyEmittedExpression>node).expression, visitor, isExpression));
+
+            default:
+                let updated: Node & MapLike<any>;
+                const edgeTraversalPath = nodeEdgeTraversalMap[kind];
+                if (edgeTraversalPath) {
+                    for (const edge of edgeTraversalPath) {
+                        const value = <Node | NodeArray<Node>>(<Node & Map<any>>node)[edge.name];
+                        if (value !== undefined) {
+                            const visited = isArray(value)
+                                ? visitNodes(value, visitor, edge.test, 0, value.length, edge.parenthesize, node)
+                                : visitNode(value, visitor, edge.test, edge.optional, edge.lift, edge.parenthesize, node);
+                            if (updated !== undefined || visited !== value) {
+                                if (updated === undefined) {
+                                    updated = getMutableClone(node);
+                                }
+                                if (visited !== value) {
+                                    updated[edge.name] = visited;
+                                }
+                            }
+                        }
+                    }
+                }
+                return updated ? updateNode(updated, node) : node;
+        }
+
+        // return node;
+    }
+
+    /**
+     * Merges generated lexical declarations into the FunctionBody of a non-arrow function-like declaration.
+     *
+     * @param node The ConciseBody of an arrow function.
+     * @param declarations The lexical declarations to merge.
+     */
+    export function mergeFunctionBodyLexicalEnvironment(body: FunctionBody, declarations: Statement[]): FunctionBody;
+
+    /**
+     * Merges generated lexical declarations into the ConciseBody of an ArrowFunction.
+     *
+     * @param node The ConciseBody of an arrow function.
+     * @param declarations The lexical declarations to merge.
+     */
+    export function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody;
+
+    export function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody {
+        if (body && declarations !== undefined && declarations.length > 0) {
+            if (isBlock(body)) {
+                return updateBlock(body, createNodeArray(concatenate(body.statements, declarations), body.statements));
+            }
+            else {
+                return createBlock(
+                    createNodeArray([createReturn(body, /*location*/ body), ...declarations], body),
+                    /*location*/ body,
+                    /*multiLine*/ true);
+            }
+        }
+        return body;
+    }
+
+    /**
+     * Lifts a NodeArray containing only Statement nodes to a block.
+     *
+     * @param nodes The NodeArray.
+     */
+    export function liftToBlock(nodes: Node[]): Statement {
+        Debug.assert(every(nodes, isStatement), "Cannot lift nodes to a Block.");
+        return <Statement>singleOrUndefined(nodes) || createBlock(<NodeArray<Statement>>nodes);
+    }
+
+    /**
+     * Extracts the single node from a NodeArray.
+     *
+     * @param nodes The NodeArray.
+     */
+    function extractSingleNode(nodes: Node[]): Node {
+        Debug.assert(nodes.length <= 1, "Too many nodes written to output.");
+        return singleOrUndefined(nodes);
+    }
+
+    /**
+     * Aggregates the TransformFlags for a Node and its subtree.
+     */
+    export function aggregateTransformFlags<T extends Node>(node: T): T {
+        aggregateTransformFlagsForNode(node);
+        return node;
+    }
+
+    /**
+     * Aggregates the TransformFlags for a Node and its subtree. The flags for the subtree are
+     * computed first, then the transform flags for the current node are computed from the subtree
+     * flags and the state of the current node. Finally, the transform flags of the node are
+     * returned, excluding any flags that should not be included in its parent node's subtree
+     * flags.
+     */
+    function aggregateTransformFlagsForNode(node: Node): TransformFlags {
+        if (node === undefined) {
+            return TransformFlags.None;
+        }
+        else if (node.transformFlags & TransformFlags.HasComputedFlags) {
+            return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+        }
+        else {
+            const subtreeFlags = aggregateTransformFlagsForSubtree(node);
+            return computeTransformFlagsForNode(node, subtreeFlags);
+        }
+    }
+
+    /**
+     * Aggregates the transform flags for the subtree of a node.
+     */
+    function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
+        // We do not transform ambient declarations or types, so there is no need to
+        // recursively aggregate transform flags.
+        if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
+            return TransformFlags.None;
+        }
+
+        // Aggregate the transform flags of each child.
+        return reduceEachChild(node, aggregateTransformFlagsForChildNode, TransformFlags.None);
+    }
+
+    /**
+     * Aggregates the TransformFlags of a child node with the TransformFlags of its
+     * siblings.
+     */
+    function aggregateTransformFlagsForChildNode(transformFlags: TransformFlags, child: Node): TransformFlags {
+        return transformFlags | aggregateTransformFlagsForNode(child);
+    }
+
+    /**
+     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
+     *
+     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
+     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
+     *       than calling this function.
+     */
+    function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
+        if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
+            return TransformFlags.TypeExcludes;
+        }
+
+        switch (kind) {
+            case SyntaxKind.CallExpression:
+            case SyntaxKind.NewExpression:
+            case SyntaxKind.ArrayLiteralExpression:
+                return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
+            case SyntaxKind.ModuleDeclaration:
+                return TransformFlags.ModuleExcludes;
+            case SyntaxKind.Parameter:
+                return TransformFlags.ParameterExcludes;
+            case SyntaxKind.ArrowFunction:
+                return TransformFlags.ArrowFunctionExcludes;
+            case SyntaxKind.FunctionExpression:
+            case SyntaxKind.FunctionDeclaration:
+                return TransformFlags.FunctionExcludes;
+            case SyntaxKind.VariableDeclarationList:
+                return TransformFlags.VariableDeclarationListExcludes;
+            case SyntaxKind.ClassDeclaration:
+            case SyntaxKind.ClassExpression:
+                return TransformFlags.ClassExcludes;
+            case SyntaxKind.Constructor:
+                return TransformFlags.ConstructorExcludes;
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+                return TransformFlags.MethodOrAccessorExcludes;
+            case SyntaxKind.AnyKeyword:
+            case SyntaxKind.NumberKeyword:
+            case SyntaxKind.NeverKeyword:
+            case SyntaxKind.StringKeyword:
+            case SyntaxKind.BooleanKeyword:
+            case SyntaxKind.SymbolKeyword:
+            case SyntaxKind.VoidKeyword:
+            case SyntaxKind.TypeParameter:
+            case SyntaxKind.PropertySignature:
+            case SyntaxKind.MethodSignature:
+            case SyntaxKind.CallSignature:
+            case SyntaxKind.ConstructSignature:
+            case SyntaxKind.IndexSignature:
+            case SyntaxKind.InterfaceDeclaration:
+            case SyntaxKind.TypeAliasDeclaration:
+                return TransformFlags.TypeExcludes;
+            case SyntaxKind.ObjectLiteralExpression:
+                return TransformFlags.ObjectLiteralExcludes;
+            default:
+                return TransformFlags.NodeExcludes;
+        }
+    }
+
+    export namespace Debug {
+        export const failNotOptional = shouldAssert(AssertionLevel.Normal)
+            ? (message?: string) => assert(false, message || "Node not optional.")
+            : (message?: string) => {};
+
+        export const failBadSyntaxKind = shouldAssert(AssertionLevel.Normal)
+            ? (node: Node, message?: string) => assert(false, message || "Unexpected node.", () => `Node ${formatSyntaxKind(node.kind)} was unexpected.`)
+            : (node: Node, message?: string) => {};
+
+        export const assertNode = shouldAssert(AssertionLevel.Normal)
+            ? (node: Node, test: (node: Node) => boolean, message?: string) => assert(
+                    test === undefined || test(node),
+                    message || "Unexpected node.",
+                    () => `Node ${formatSyntaxKind(node.kind)} did not pass test '${getFunctionName(test)}'.`)
+            : (node: Node, test: (node: Node) => boolean, message?: string) => {};
+
+        function getFunctionName(func: Function) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return (<any>func).name;
+            }
+            else {
+                const text = Function.prototype.toString.call(func);
+                const match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index a64435b7ddc..63e01f0f814 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -154,7 +154,7 @@ class CompilerBaselineRunner extends RunnerBase {
                 if (options.sourceMap || options.inlineSourceMap) {
                     Harness.Baseline.runBaseline(justName.replace(/\.tsx?$/, ".sourcemap.txt"), () => {
                         const record = result.getSourceMapRecord();
-                        if (options.noEmitOnError && result.errors.length !== 0 && record === undefined) {
+                        if ((options.noEmitOnError && result.errors.length !== 0) || record === undefined) {
                             // Because of the noEmitOnError option no files are created. We need to return null because baselining isn't required.
                             /* tslint:disable:no-null-keyword */
                             return null;
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 694dcf6394e..b4e40fbc44f 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -263,22 +263,31 @@ namespace FourSlash {
         constructor(private basePath: string, private testType: FourSlashTestType, public testData: FourSlashData) {
             // Create a new Services Adapter
             this.cancellationToken = new TestCancellationToken();
-            const compilationOptions = convertGlobalOptionsToCompilerOptions(this.testData.globalOptions);
-            if (compilationOptions.typeRoots) {
-                compilationOptions.typeRoots = compilationOptions.typeRoots.map(p => ts.getNormalizedAbsolutePath(p, this.basePath));
-            }
+            let compilationOptions = convertGlobalOptionsToCompilerOptions(this.testData.globalOptions);
             compilationOptions.skipDefaultLibCheck = true;
 
-            const languageServiceAdapter = this.getLanguageServiceAdapter(testType, this.cancellationToken, compilationOptions);
-            this.languageServiceAdapterHost = languageServiceAdapter.getHost();
-            this.languageService = languageServiceAdapter.getLanguageService();
-
             // Initialize the language service with all the scripts
             let startResolveFileRef: FourSlashFile;
 
             ts.forEach(testData.files, file => {
                 // Create map between fileName and its content for easily looking up when resolveReference flag is specified
                 this.inputFiles[file.fileName] = file.content;
+
+                if (ts.getBaseFileName(file.fileName).toLowerCase() === "tsconfig.json") {
+                    const configJson = ts.parseConfigFileTextToJson(file.fileName, file.content);
+                    assert.isTrue(configJson.config !== undefined);
+
+                    // Extend our existing compiler options so that we can also support tsconfig only options
+                    if (configJson.config.compilerOptions) {
+                        const baseDirectory = ts.normalizePath(ts.getDirectoryPath(file.fileName));
+                        const tsConfig = ts.convertCompilerOptionsFromJson(configJson.config.compilerOptions, baseDirectory, file.fileName);
+
+                        if (!tsConfig.errors || !tsConfig.errors.length) {
+                            compilationOptions = ts.extend(compilationOptions, tsConfig.options);
+                        }
+                    }
+                }
+
                 if (!startResolveFileRef && file.fileOptions[metadataOptionNames.resolveReference] === "true") {
                     startResolveFileRef = file;
                 }
@@ -288,6 +297,15 @@ namespace FourSlash {
                 }
             });
 
+
+            if (compilationOptions.typeRoots) {
+                compilationOptions.typeRoots = compilationOptions.typeRoots.map(p => ts.getNormalizedAbsolutePath(p, this.basePath));
+            }
+
+            const languageServiceAdapter = this.getLanguageServiceAdapter(testType, this.cancellationToken, compilationOptions);
+            this.languageServiceAdapterHost = languageServiceAdapter.getHost();
+            this.languageService = languageServiceAdapter.getLanguageService();
+
             if (startResolveFileRef) {
                 // Add the entry-point file itself into the languageServiceShimHost
                 this.languageServiceAdapterHost.addScript(startResolveFileRef.fileName, startResolveFileRef.content, /*isRootFile*/ true);
@@ -342,6 +360,7 @@ namespace FourSlash {
                 InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
                 InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
                 InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+                InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
                 InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
                 InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
                 PlaceOpenBraceOnNewLineForFunctions: false,
@@ -525,6 +544,67 @@ namespace FourSlash {
             }
         }
 
+        public verifyGoToDefinitionIs(endMarker: string | string[]) {
+            this.verifyGoToDefinitionWorker(endMarker instanceof Array ? endMarker : [endMarker]);
+        }
+
+        public verifyGoToDefinition(arg0: any, endMarkerNames?: string | string[]) {
+            if (endMarkerNames) {
+                this.verifyGoToDefinitionPlain(arg0, endMarkerNames);
+            }
+            else if (arg0 instanceof Array) {
+                const pairs: [string | string[], string | string[]][] = arg0;
+                for (const [start, end] of pairs) {
+                    this.verifyGoToDefinitionPlain(start, end);
+                }
+            }
+            else {
+                const obj: { [startMarkerName: string]: string | string[] } = arg0;
+                for (const startMarkerName in obj) {
+                    if (ts.hasProperty(obj, startMarkerName)) {
+                        this.verifyGoToDefinitionPlain(startMarkerName, obj[startMarkerName]);
+                    }
+                }
+            }
+        }
+
+        private verifyGoToDefinitionPlain(startMarkerNames: string | string[], endMarkerNames: string | string[]) {
+            if (startMarkerNames instanceof Array) {
+                for (const start of startMarkerNames) {
+                    this.verifyGoToDefinitionSingle(start, endMarkerNames);
+                }
+            }
+            else {
+                this.verifyGoToDefinitionSingle(startMarkerNames, endMarkerNames);
+            }
+        }
+
+        public verifyGoToDefinitionForMarkers(markerNames: string[]) {
+            for (const markerName of markerNames) {
+                this.verifyGoToDefinitionSingle(`${markerName}Reference`, `${markerName}Definition`);
+            }
+        }
+
+        private verifyGoToDefinitionSingle(startMarkerName: string, endMarkerNames: string | string[]) {
+            this.goToMarker(startMarkerName);
+            this.verifyGoToDefinitionWorker(endMarkerNames instanceof Array ? endMarkerNames : [endMarkerNames]);
+        }
+
+        private verifyGoToDefinitionWorker(endMarkers: string[]) {
+            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition) || [];
+
+            if (endMarkers.length !== definitions.length) {
+                this.raiseError(`goToDefinitions failed - expected to find ${endMarkers.length} definitions but got ${definitions.length}`);
+            }
+
+            for (let i = 0; i < endMarkers.length; i++) {
+                const marker = this.getMarkerByName(endMarkers[i]), definition = definitions[i];
+                if (marker.fileName !== definition.fileName || marker.position !== definition.textSpan.start) {
+                    this.raiseError(`goToDefinition failed for definition ${i}: expected ${marker.fileName} at ${marker.position}, got ${definition.fileName} at ${definition.textSpan.start}`);
+                }
+            }
+        }
+
         public verifyGetEmitOutputForCurrentFile(expected: string): void {
             const emit = this.languageService.getEmitOutput(this.activeFile.fileName);
             if (emit.outputFiles.length !== 1) {
@@ -669,10 +749,10 @@ namespace FourSlash {
             }
         }
 
-        public verifyCompletionListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
+        public verifyCompletionListContains(symbol: string, text?: string, documentation?: string, kind?: string, spanIndex?: number) {
             const completions = this.getCompletionListAtCaret();
             if (completions) {
-                this.assertItemInCompletionList(completions.entries, symbol, text, documentation, kind);
+                this.assertItemInCompletionList(completions.entries, symbol, text, documentation, kind, spanIndex);
             }
             else {
                 this.raiseError(`No completions at position '${this.currentCaretPosition}' when looking for '${symbol}'.`);
@@ -688,25 +768,32 @@ namespace FourSlash {
          * @param expectedText the text associated with the symbol
          * @param expectedDocumentation the documentation text associated with the symbol
          * @param expectedKind the kind of symbol (see ScriptElementKind)
+         * @param spanIndex the index of the range that the completion item's replacement text span should match
          */
-        public verifyCompletionListDoesNotContain(symbol: string, expectedText?: string, expectedDocumentation?: string, expectedKind?: string) {
+        public verifyCompletionListDoesNotContain(symbol: string, expectedText?: string, expectedDocumentation?: string, expectedKind?: string, spanIndex?: number) {
             const that = this;
+            let replacementSpan: ts.TextSpan;
+            if (spanIndex !== undefined) {
+                replacementSpan = this.getTextSpanForRangeAtIndex(spanIndex);
+            }
+
             function filterByTextOrDocumentation(entry: ts.CompletionEntry) {
                 const details = that.getCompletionEntryDetails(entry.name);
                 const documentation = ts.displayPartsToString(details.documentation);
                 const text = ts.displayPartsToString(details.displayParts);
-                if (expectedText && expectedDocumentation) {
-                    return (documentation === expectedDocumentation && text === expectedText) ? true : false;
+
+                // If any of the expected values are undefined, assume that users don't
+                // care about them.
+                if (replacementSpan && !TestState.textSpansEqual(replacementSpan, entry.replacementSpan)) {
+                    return false;
                 }
-                else if (expectedText && !expectedDocumentation) {
-                    return text === expectedText ? true : false;
+                else if (expectedText && text !== expectedText) {
+                    return false;
                 }
-                else if (expectedDocumentation && !expectedText) {
-                    return documentation === expectedDocumentation ? true : false;
+                else if (expectedDocumentation && documentation !== expectedDocumentation) {
+                    return false;
                 }
-                // Because expectedText and expectedDocumentation are undefined, we assume that
-                // users don"t care to compare them so we will treat that entry as if the entry has matching text and documentation
-                // and keep it in the list of filtered entry.
+
                 return true;
             }
 
@@ -730,6 +817,10 @@ namespace FourSlash {
                     if (expectedKind) {
                         error += "Expected kind: " + expectedKind + " to equal: " + filterCompletions[0].kind + ".";
                     }
+                    if (replacementSpan) {
+                        const spanText = filterCompletions[0].replacementSpan ? stringify(filterCompletions[0].replacementSpan) : undefined;
+                        error += "Expected replacement span: " + stringify(replacementSpan) + " to equal: " + spanText + ".";
+                    }
                     this.raiseError(error);
                 }
             }
@@ -1561,25 +1652,10 @@ namespace FourSlash {
             this.goToPosition(len);
         }
 
-        public goToDefinition(definitionIndex: number) {
-            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-            if (!definitions || !definitions.length) {
-                this.raiseError("goToDefinition failed - expected to at least one definition location but got 0");
-            }
-
-            if (definitionIndex >= definitions.length) {
-                this.raiseError(`goToDefinition failed - definitionIndex value (${definitionIndex}) exceeds definition list size (${definitions.length})`);
-            }
-
-            const definition = definitions[definitionIndex];
-            this.openFile(definition.fileName);
-            this.currentCaretPosition = definition.textSpan.start;
-        }
-
         public goToTypeDefinition(definitionIndex: number) {
             const definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!definitions || !definitions.length) {
-                this.raiseError("goToTypeDefinition failed - expected to at least one definition location but got 0");
+                this.raiseError("goToTypeDefinition failed - expected to find at least one definition location but got 0");
             }
 
             if (definitionIndex >= definitions.length) {
@@ -1591,28 +1667,6 @@ namespace FourSlash {
             this.currentCaretPosition = definition.textSpan.start;
         }
 
-        public verifyDefinitionLocationExists(negative: boolean) {
-            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-
-            const foundDefinitions = definitions && definitions.length;
-
-            if (foundDefinitions && negative) {
-                this.raiseError(`goToDefinition - expected to 0 definition locations but got ${definitions.length}`);
-            }
-            else if (!foundDefinitions && !negative) {
-                this.raiseError("goToDefinition - expected to at least one definition location but got 0");
-            }
-        }
-
-        public verifyDefinitionsCount(negative: boolean, expectedCount: number) {
-            const assertFn = negative ? assert.notEqual : assert.equal;
-
-            const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-            const actualCount = definitions && definitions.length || 0;
-
-            assertFn(actualCount, expectedCount, this.messageAtLastKnownMarker("Definitions Count"));
-        }
-
         public verifyTypeDefinitionsCount(negative: boolean, expectedCount: number) {
             const assertFn = negative ? assert.notEqual : assert.equal;
 
@@ -1622,18 +1676,12 @@ namespace FourSlash {
             assertFn(actualCount, expectedCount, this.messageAtLastKnownMarker("Type definitions Count"));
         }
 
-        public verifyDefinitionsName(negative: boolean, expectedName: string, expectedContainerName: string) {
+        public verifyGoToDefinitionName(expectedName: string, expectedContainerName: string) {
             const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             const actualDefinitionName = definitions && definitions.length ? definitions[0].name : "";
             const actualDefinitionContainerName = definitions && definitions.length ? definitions[0].containerName : "";
-            if (negative) {
-                assert.notEqual(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
-                assert.notEqual(actualDefinitionContainerName, expectedContainerName, this.messageAtLastKnownMarker("Definition Info Container Name"));
-            }
-            else {
-                assert.equal(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
-                assert.equal(actualDefinitionContainerName, expectedContainerName, this.messageAtLastKnownMarker("Definition Info Container Name"));
-            }
+            assert.equal(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
+            assert.equal(actualDefinitionContainerName, expectedContainerName, this.messageAtLastKnownMarker("Definition Info Container Name"));
         }
 
         public getMarkers(): Marker[] {
@@ -1641,6 +1689,10 @@ namespace FourSlash {
             return this.testData.markers.slice(0);
         }
 
+        public getMarkerNames(): string[] {
+            return Object.keys(this.testData.markerPositions);
+        }
+
         public getRanges(): Range[] {
             return this.testData.ranges;
         }
@@ -1649,8 +1701,7 @@ namespace FourSlash {
             const result = ts.createMap<Range[]>();
             for (const range of this.getRanges()) {
                 const text = this.rangeText(range);
-                const ranges = result[text] || (result[text] = []);
-                ranges.push(range);
+                ts.multiMapAdd(result, text, range);
             }
             return result;
         }
@@ -2167,7 +2218,7 @@ namespace FourSlash {
             return text.substring(startPos, endPos);
         }
 
-        private assertItemInCompletionList(items: ts.CompletionEntry[], name: string, text?: string, documentation?: string, kind?: string) {
+        private assertItemInCompletionList(items: ts.CompletionEntry[], name: string, text?: string, documentation?: string, kind?: string, spanIndex?: number) {
             for (let i = 0; i < items.length; i++) {
                 const item = items[i];
                 if (item.name === name) {
@@ -2186,6 +2237,11 @@ namespace FourSlash {
                         assert.equal(item.kind, kind, this.assertionMessageAtLastKnownMarker("completion item kind for " + name));
                     }
 
+                    if (spanIndex !== undefined) {
+                        const span = this.getTextSpanForRangeAtIndex(spanIndex);
+                        assert.isTrue(TestState.textSpansEqual(span, item.replacementSpan), this.assertionMessageAtLastKnownMarker(stringify(span) + " does not equal " + stringify(item.replacementSpan) + " replacement span for " + name));
+                    }
+
                     return;
                 }
             }
@@ -2242,6 +2298,17 @@ namespace FourSlash {
             return `line ${(pos.line + 1)}, col ${pos.character}`;
         }
 
+        private getTextSpanForRangeAtIndex(index: number): ts.TextSpan {
+            const ranges = this.getRanges();
+            if (ranges && ranges.length > index) {
+                const range = ranges[index];
+                return { start: range.start, length: range.end - range.start };
+            }
+            else {
+                this.raiseError("Supplied span index: " + index + " does not exist in range list of size: " + (ranges ? 0 : ranges.length));
+            }
+        }
+
         public getMarkerByName(markerName: string) {
             const markerPos = this.testData.markerPositions[markerName];
             if (markerPos === undefined) {
@@ -2265,6 +2332,10 @@ namespace FourSlash {
         public resetCancelled(): void {
             this.cancellationToken.resetCancelled();
         }
+
+        private static textSpansEqual(a: ts.TextSpan, b: ts.TextSpan) {
+            return a && b && a.start === b.start && a.length === b.length;
+        }
     }
 
     export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {
@@ -2273,12 +2344,16 @@ namespace FourSlash {
     }
 
     export function runFourSlashTestContent(basePath: string, testType: FourSlashTestType, content: string, fileName: string): void {
+        // Give file paths an absolute path for the virtual file system
+        const absoluteBasePath = ts.combinePaths(Harness.virtualFileSystemRoot, basePath);
+        const absoluteFileName = ts.combinePaths(Harness.virtualFileSystemRoot, fileName);
+
         // Parse out the files and their metadata
-        const testData = parseTestData(basePath, content, fileName);
-        const state = new TestState(basePath, testType, testData);
+        const testData = parseTestData(absoluteBasePath, content, absoluteFileName);
+        const state = new TestState(absoluteBasePath, testType, testData);
         const output = ts.transpileModule(content, { reportDiagnostics: true });
         if (output.diagnostics.length > 0) {
-            throw new Error(`Syntax error in ${basePath}: ${output.diagnostics[0].messageText}`);
+            throw new Error(`Syntax error in ${absoluteBasePath}: ${output.diagnostics[0].messageText}`);
         }
         runCode(output.outputText, state);
     }
@@ -2743,6 +2818,10 @@ namespace FourSlashInterface {
             return this.state.getMarkers();
         }
 
+        public markerNames(): string[] {
+            return this.state.getMarkerNames();
+        }
+
         public marker(name?: string): FourSlash.Marker {
             return this.state.getMarkerByName(name);
         }
@@ -2778,10 +2857,6 @@ namespace FourSlashInterface {
             this.state.goToEOF();
         }
 
-        public definition(definitionIndex = 0) {
-            this.state.goToDefinition(definitionIndex);
-        }
-
         public type(definitionIndex = 0) {
             this.state.goToTypeDefinition(definitionIndex);
         }
@@ -2831,12 +2906,12 @@ namespace FourSlashInterface {
 
         // Verifies the completion list contains the specified symbol. The
         // completion list is brought up if necessary
-        public completionListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
+        public completionListContains(symbol: string, text?: string, documentation?: string, kind?: string, spanIndex?: number) {
             if (this.negative) {
-                this.state.verifyCompletionListDoesNotContain(symbol, text, documentation, kind);
+                this.state.verifyCompletionListDoesNotContain(symbol, text, documentation, kind, spanIndex);
             }
             else {
-                this.state.verifyCompletionListContains(symbol, text, documentation, kind);
+                this.state.verifyCompletionListContains(symbol, text, documentation, kind, spanIndex);
             }
         }
 
@@ -2886,22 +2961,10 @@ namespace FourSlashInterface {
             this.state.verifyQuickInfoExists(this.negative);
         }
 
-        public definitionCountIs(expectedCount: number) {
-            this.state.verifyDefinitionsCount(this.negative, expectedCount);
-        }
-
         public typeDefinitionCountIs(expectedCount: number) {
             this.state.verifyTypeDefinitionsCount(this.negative, expectedCount);
         }
 
-        public definitionLocationExists() {
-            this.state.verifyDefinitionLocationExists(this.negative);
-        }
-
-        public verifyDefinitionsName(name: string, containerName: string) {
-            this.state.verifyDefinitionsName(this.negative, name, containerName);
-        }
-
         public isValidBraceCompletionAtPosition(openingBrace: string) {
             this.state.verifyBraceCompletionAtPosition(this.negative, openingBrace);
         }
@@ -2945,6 +3008,25 @@ namespace FourSlashInterface {
             this.state.verifyCurrentFileContent(text);
         }
 
+        public goToDefinitionIs(endMarkers: string | string[]) {
+            this.state.verifyGoToDefinitionIs(endMarkers);
+        }
+
+        public goToDefinition(startMarkerName: string | string[], endMarkerName: string | string[]): void;
+        public goToDefinition(startsAndEnds: [string | string[], string | string[]][]): void;
+        public goToDefinition(startsAndEnds: { [startMarkerName: string]: string | string[] }): void;
+        public goToDefinition(arg0: any, endMarkerName?: string | string[]) {
+            this.state.verifyGoToDefinition(arg0, endMarkerName);
+        }
+
+        public goToDefinitionForMarkers(...markerNames: string[]) {
+            this.state.verifyGoToDefinitionForMarkers(markerNames);
+        }
+
+        public goToDefinitionName(name: string, containerName: string) {
+            this.state.verifyGoToDefinitionName(name, containerName);
+        }
+
         public verifyGetEmitOutputForCurrentFile(expected: string): void {
             this.state.verifyGetEmitOutputForCurrentFile(expected);
         }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index ac0de944213..c5816deb924 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -416,6 +416,60 @@ namespace Utils {
 
         throw new Error("Could not find child in parent");
     }
+
+    const maxHarnessFrames = 1;
+
+    export function filterStack(error: Error, stackTraceLimit: number = Infinity) {
+        const stack = <string>(<any>error).stack;
+        if (stack) {
+            const lines = stack.split(/\r\n?|\n/g);
+            const filtered: string[] = [];
+            let frameCount = 0;
+            let harnessFrameCount = 0;
+            for (let line of lines) {
+                if (isStackFrame(line)) {
+                    if (frameCount >= stackTraceLimit
+                        || isMocha(line)
+                        || isNode(line)) {
+                        continue;
+                    }
+
+                    if (isHarness(line)) {
+                        if (harnessFrameCount >= maxHarnessFrames) {
+                            continue;
+                        }
+
+                        harnessFrameCount++;
+                    }
+
+                    line = line.replace(/\bfile:\/\/\/(.*?)(?=(:\d+)*($|\)))/, (_, path) => ts.sys.resolvePath(path));
+                    frameCount++;
+                }
+
+                filtered.push(line);
+            }
+
+            (<any>error).stack = filtered.join(Harness.IO.newLine());
+        }
+
+        return error;
+    }
+
+    function isStackFrame(line: string) {
+        return /^\s+at\s/.test(line);
+    }
+
+    function isMocha(line: string) {
+        return /[\\/](node_modules|components)[\\/]mocha(js)?[\\/]|[\\/]mocha\.js/.test(line);
+    }
+
+    function isNode(line: string) {
+        return /\((timers|events|node|module)\.js:/.test(line);
+    }
+
+    function isHarness(line: string) {
+        return /[\\/]src[\\/]harness[\\/]|[\\/]run\.js/.test(line);
+    }
 }
 
 namespace Harness.Path {
@@ -452,12 +506,17 @@ namespace Harness {
         getExecutingFilePath(): string;
         exit(exitCode?: number): void;
         readDirectory(path: string, extension?: string[], exclude?: string[], include?: string[]): string[];
+        tryEnableSourceMapsForHost?(): void;
+        getEnvironmentVariable?(name: string): string;
     }
     export var IO: IO;
 
     // harness always uses one kind of new line
     const harnessNewLine = "\r\n";
 
+    // Root for file paths that are stored in a virtual file system
+    export const virtualFileSystemRoot = "/";
+
     namespace IOImpl {
         declare class Enumerator {
             public atEnd(): boolean;
@@ -490,6 +549,7 @@ namespace Harness {
             export const directoryExists: typeof IO.directoryExists = fso.FolderExists;
             export const fileExists: typeof IO.fileExists = fso.FileExists;
             export const log: typeof IO.log = global.WScript && global.WScript.StdOut.WriteLine;
+            export const getEnvironmentVariable: typeof IO.getEnvironmentVariable = name => ts.sys.getEnvironmentVariable(name);
             export const readDirectory: typeof IO.readDirectory = (path, extension, exclude, include) => ts.sys.readDirectory(path, extension, exclude, include);
 
             export function createDirectory(path: string) {
@@ -559,7 +619,13 @@ namespace Harness {
             export const writeFile: typeof IO.writeFile = (path, content) => ts.sys.writeFile(path, content);
             export const fileExists: typeof IO.fileExists = fs.existsSync;
             export const log: typeof IO.log = s => console.log(s);
+            export const getEnvironmentVariable: typeof IO.getEnvironmentVariable = name => ts.sys.getEnvironmentVariable(name);
 
+            export function tryEnableSourceMapsForHost() {
+                if (ts.sys.tryEnableSourceMapsForHost) {
+                    ts.sys.tryEnableSourceMapsForHost();
+                }
+            }
             export const readDirectory: typeof IO.readDirectory = (path, extension, exclude, include) => ts.sys.readDirectory(path, extension, exclude, include);
 
             export function createDirectory(path: string) {
@@ -710,7 +776,16 @@ namespace Harness {
                 return dirPath;
             }
             export let directoryName: typeof IO.directoryName = Utils.memoize(directoryNameImpl);
-            export const resolvePath = (path: string) => directoryName(path);
+
+            export function resolvePath(path: string) {
+                const response = Http.getFileFromServerSync(serverRoot + path + "?resolve=true");
+                if (response.status === 200) {
+                    return response.responseText;
+                }
+                else {
+                    return undefined;
+                }
+            }
 
             export function fileExists(path: string): boolean {
                 const response = Http.getFileFromServerSync(serverRoot + path);
@@ -784,7 +859,9 @@ namespace Harness {
 namespace Harness {
     export const libFolder = "built/local/";
     const tcServicesFileName = ts.combinePaths(libFolder, Utils.getExecutionEnvironment() === Utils.ExecutionEnvironment.Browser ? "typescriptServicesInBrowserTest.js" : "typescriptServices.js");
-    export const tcServicesFile = IO.readFile(tcServicesFileName);
+    export const tcServicesFile = IO.readFile(tcServicesFileName) + (Utils.getExecutionEnvironment() !== Utils.ExecutionEnvironment.Browser
+        ? IO.newLine() + `//# sourceURL=${IO.resolvePath(tcServicesFileName)}`
+        : "");
 
     export interface SourceMapEmitterCallback {
         (emittedFile: string, emittedLine: number, emittedColumn: number, sourceFile: string, sourceLine: number, sourceColumn: number, sourceName: string): void;
@@ -1481,7 +1558,7 @@ namespace Harness {
                 }
 
                 Harness.Baseline.runBaseline(baselinePath.replace(/\.tsx?/, ".js.map"), () => {
-                    if (options.noEmitOnError && result.errors.length !== 0 && result.sourceMaps.length === 0) {
+                    if ((options.noEmitOnError && result.errors.length !== 0) || result.sourceMaps.length === 0) {
                         // We need to return null here or the runBaseLine will actually create a empty file.
                         // Baselining isn't required here because there is no output.
                         /* tslint:disable:no-null-keyword */
@@ -1648,7 +1725,7 @@ namespace Harness {
             }
 
             public getSourceMapRecord() {
-                if (this.sourceMapData) {
+                if (this.sourceMapData && this.sourceMapData.length > 0) {
                     return Harness.SourceMapRecorder.getSourceMapRecord(this.sourceMapData, this.program, this.files);
                 }
             }
@@ -1785,7 +1862,7 @@ namespace Harness {
                     tsConfig.options.configFilePath = data.name;
 
                     // delete entry from the list
-                    testUnitData.splice(i, 1);
+                    ts.orderedRemoveItemAt(testUnitData, i);
 
                     break;
                 }
@@ -1905,9 +1982,7 @@ namespace Harness {
         }
 
         export function runBaseline(relativeFileName: string, generateContent: () => string, opts?: BaselineOptions): void {
-
             const actualFileName = localPath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder);
-
             const actual = generateActual(generateContent);
             const comparison = compareToBaseline(actual, relativeFileName, opts);
             writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName);
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index 94124432780..31f8a37aa3c 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -123,7 +123,7 @@ namespace Harness.LanguageService {
     }
 
     export class LanguageServiceAdapterHost {
-        protected fileNameToScript = ts.createMap<ScriptInfo>();
+        protected virtualFileSystem: Utils.VirtualFileSystem = new Utils.VirtualFileSystem(virtualFileSystemRoot, /*useCaseSensitiveFilenames*/false);
 
         constructor(protected cancellationToken = DefaultHostCancellationToken.Instance,
                     protected settings = ts.getDefaultCompilerOptions()) {
@@ -135,22 +135,24 @@ namespace Harness.LanguageService {
 
         public getFilenames(): string[] {
             const fileNames: string[] = [];
-            ts.forEachProperty(this.fileNameToScript, (scriptInfo) => {
+            for (const virtualEntry of this.virtualFileSystem.getAllFileEntries()){
+                const scriptInfo = virtualEntry.content;
                 if (scriptInfo.isRootFile) {
                     // only include root files here
                     // usually it means that we won't include lib.d.ts in the list of root files so it won't mess the computation of compilation root dir.
                     fileNames.push(scriptInfo.fileName);
                 }
-            });
+            }
             return fileNames;
         }
 
         public getScriptInfo(fileName: string): ScriptInfo {
-            return this.fileNameToScript[fileName];
+            const fileEntry = this.virtualFileSystem.traversePath(fileName);
+            return fileEntry && fileEntry.isFile() ? (<Utils.VirtualFile>fileEntry).content : undefined;
         }
 
         public addScript(fileName: string, content: string, isRootFile: boolean): void {
-            this.fileNameToScript[fileName] = new ScriptInfo(fileName, content, isRootFile);
+            this.virtualFileSystem.addFile(fileName, new ScriptInfo(fileName, content, isRootFile));
         }
 
         public editScript(fileName: string, start: number, end: number, newText: string) {
@@ -171,7 +173,7 @@ namespace Harness.LanguageService {
           * @param col 0 based index
           */
         public positionToLineAndCharacter(fileName: string, position: number): ts.LineAndCharacter {
-            const script: ScriptInfo = this.fileNameToScript[fileName];
+            const script: ScriptInfo = this.getScriptInfo(fileName);
             assert.isOk(script);
 
             return ts.computeLineAndCharacterOfPosition(script.getLineMap(), position);
@@ -182,8 +184,14 @@ namespace Harness.LanguageService {
     class NativeLanguageServiceHost extends LanguageServiceAdapterHost implements ts.LanguageServiceHost {
         getCompilationSettings() { return this.settings; }
         getCancellationToken() { return this.cancellationToken; }
-        getDirectories(path: string): string[] { return []; }
-        getCurrentDirectory(): string { return ""; }
+        getDirectories(path: string): string[] {
+            const dir = this.virtualFileSystem.traversePath(path);
+            if (dir && dir.isDirectory()) {
+                return ts.map((<Utils.VirtualDirectory>dir).getDirectories(), (d) => ts.combinePaths(path, d.name));
+            }
+            return [];
+        }
+        getCurrentDirectory(): string { return virtualFileSystemRoot; }
         getDefaultLibFileName(): string { return Harness.Compiler.defaultLibFileName; }
         getScriptFileNames(): string[] { return this.getFilenames(); }
         getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
@@ -196,6 +204,22 @@ namespace Harness.LanguageService {
             return script ? script.version.toString() : undefined;
         }
 
+        fileExists(fileName: string): boolean {
+            const script = this.getScriptSnapshot(fileName);
+            return script !== undefined;
+        }
+        readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[]): string[] {
+            return ts.matchFiles(path, extensions, exclude, include,
+            /*useCaseSensitiveFileNames*/false,
+            this.getCurrentDirectory(),
+            (p) => this.virtualFileSystem.getAccessibleFileSystemEntries(p));
+        }
+        readFile(path: string, encoding?: string): string {
+            const snapshot = this.getScriptSnapshot(path);
+            return snapshot.getText(0, snapshot.getLength());
+        }
+
+
         log(s: string): void { }
         trace(s: string): void { }
         error(s: string): void { }
@@ -617,6 +641,10 @@ namespace Harness.LanguageService {
             return [];
         }
 
+        getEnvironmentVariable(name: string): string {
+            return ts.sys.getEnvironmentVariable(name);
+        }
+
         readDirectory(path: string, extension?: string[], exclude?: string[], include?: string[]): string[] {
             throw new Error("Not implemented Yet.");
         }
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
index 080c6edfa87..6b35064883e 100644
--- a/src/harness/projectsRunner.ts
+++ b/src/harness/projectsRunner.ts
@@ -473,7 +473,6 @@ class ProjectRunner extends RunnerBase {
                         }
                     });
 
-
                     it("Baseline of emitted result (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
                         if (testCase.baselineCheck) {
                             const errs: Error[] = [];
@@ -500,18 +499,16 @@ class ProjectRunner extends RunnerBase {
                         }
                     });
 
-
-                    it("SourceMapRecord for (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
-                        if (compilerResult.sourceMapData) {
-                            Harness.Baseline.runBaseline(getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + ".sourcemap.txt", () => {
-                                return Harness.SourceMapRecorder.getSourceMapRecord(compilerResult.sourceMapData, compilerResult.program,
-                                    ts.filter(compilerResult.outputFiles, outputFile => Harness.Compiler.isJS(outputFile.emittedFileName)));
-                            });
-                        }
-                    });
+                    // it("SourceMapRecord for (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
+                    //     if (compilerResult.sourceMapData) {
+                    //         Harness.Baseline.runBaseline(getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + ".sourcemap.txt", () => {
+                    //             return Harness.SourceMapRecorder.getSourceMapRecord(compilerResult.sourceMapData, compilerResult.program,
+                    //                 ts.filter(compilerResult.outputFiles, outputFile => Harness.Compiler.isJS(outputFile.emittedFileName)));
+                    //         });
+                    //     }
+                    // });
 
                     // Verify that all the generated .d.ts files compile
-
                     it("Errors in generated Dts files for (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
                         if (!compilerResult.errors.length && testCase.declaration) {
                             const dTsCompileResult = compileCompileDTsFiles(compilerResult);
diff --git a/src/harness/runner.ts b/src/harness/runner.ts
index 4b1945f5baa..f8df1c51683 100644
--- a/src/harness/runner.ts
+++ b/src/harness/runner.ts
@@ -82,6 +82,7 @@ interface TestConfig {
     light?: boolean;
     taskConfigsFolder?: string;
     workerCount?: number;
+    stackTraceLimit?: number | "full";
     tasks?: TaskSet[];
     test?: string[];
     runUnitTests?: boolean;
@@ -116,6 +117,13 @@ if (testConfigContent !== "") {
         }
     }
 
+    if (testConfig.stackTraceLimit === "full") {
+        (<any>Error).stackTraceLimit = Infinity;
+    }
+    else if ((+testConfig.stackTraceLimit | 0) > 0) {
+        (<any>Error).stackTraceLimit = testConfig.stackTraceLimit;
+    }
+
     if (testConfig.test && testConfig.test.length > 0) {
         for (const option of testConfig.test) {
             if (!option) {
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index e332dab648e..145e81f30a8 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -29,7 +29,7 @@ class TypeWriterWalker {
     }
 
     private visitNode(node: ts.Node): void {
-        if (ts.isExpression(node) || node.kind === ts.SyntaxKind.Identifier) {
+        if (ts.isPartOfExpression(node) || node.kind === ts.SyntaxKind.Identifier) {
             this.logTypeAndSymbol(node);
         }
 
diff --git a/src/harness/unittests/cachingInServerLSHost.ts b/src/harness/unittests/cachingInServerLSHost.ts
index 2885b310605..0b8935b380e 100644
--- a/src/harness/unittests/cachingInServerLSHost.ts
+++ b/src/harness/unittests/cachingInServerLSHost.ts
@@ -47,6 +47,7 @@ namespace ts {
                 return "";
             },
             getDirectories: (path: string) => [],
+            getEnvironmentVariable: (name: string) => "",
             readDirectory: (path: string, extension?: string[], exclude?: string[], include?: string[]): string[] => {
                 throw new Error("NYI");
             },
diff --git a/src/harness/unittests/jsDocParsing.ts b/src/harness/unittests/jsDocParsing.ts
index a9987ef3176..2de8cff7634 100644
--- a/src/harness/unittests/jsDocParsing.ts
+++ b/src/harness/unittests/jsDocParsing.ts
@@ -4,2364 +4,288 @@
 namespace ts {
     describe("JSDocParsing", () => {
         describe("TypeExpressions", () => {
-            function parsesCorrectly(content: string, expected: string) {
-                const typeAndDiagnostics = ts.parseJSDocTypeExpressionForTests(content);
-                assert.isTrue(typeAndDiagnostics && typeAndDiagnostics.diagnostics.length === 0);
+            function parsesCorrectly(name: string, content: string) {
+                it(name, () => {
+                    const typeAndDiagnostics = ts.parseJSDocTypeExpressionForTests(content);
+                    assert.isTrue(typeAndDiagnostics && typeAndDiagnostics.diagnostics.length === 0);
 
-                const result = Utils.sourceFileToJSON(typeAndDiagnostics.jsDocTypeExpression.type);
-
-                assert.equal(result, expected);
+                    Harness.Baseline.runBaseline("JSDocParsing/TypeExpressions.parsesCorrectly." + name + ".json",
+                        () => Utils.sourceFileToJSON(typeAndDiagnostics.jsDocTypeExpression.type));
+                });
             }
 
-            function parsesIncorrectly(content: string) {
-                const type = ts.parseJSDocTypeExpressionForTests(content);
-                assert.isTrue(!type || type.diagnostics.length > 0);
+            function parsesIncorrectly(name: string, content: string) {
+                it(name, () => {
+                    const type = ts.parseJSDocTypeExpressionForTests(content);
+                    assert.isTrue(!type || type.diagnostics.length > 0);
+                });
             }
 
             describe("parseCorrectly", () => {
-                it("unknownType", () => {
-                    parsesCorrectly("{?}",
-                        `{
-    "kind": "JSDocUnknownType",
-    "pos": 1,
-    "end": 2
-}`);
-                });
-
-                it("allType", () => {
-                    parsesCorrectly("{*}",
-                        `{
-    "kind": "JSDocAllType",
-    "pos": 1,
-    "end": 2
-}`);
-                });
-
-                it("nullableType", () => {
-                    parsesCorrectly("{?number}",
-                        `{
-    "kind": "JSDocNullableType",
-    "pos": 1,
-    "end": 8,
-    "type": {
-        "kind": "NumberKeyword",
-        "pos": 2,
-        "end": 8
-    }
-}`);
-                });
-
-                it("nullableType2", () => {
-                    parsesCorrectly("{number?}",
-                        `{
-    "kind": "JSDocNullableType",
-    "pos": 1,
-    "end": 8,
-    "type": {
-        "kind": "NumberKeyword",
-        "pos": 1,
-        "end": 7
-    }
-}`);
-                });
-
-                it("nonNullableType", () => {
-                    parsesCorrectly("{!number}",
-                        `{
-    "kind": "JSDocNonNullableType",
-    "pos": 1,
-    "end": 8,
-    "type": {
-        "kind": "NumberKeyword",
-        "pos": 2,
-        "end": 8
-    }
-}`);
-                });
-
-                it("nonNullableType2", () => {
-                    parsesCorrectly("{number!}",
-                        `{
-    "kind": "JSDocNonNullableType",
-    "pos": 1,
-    "end": 8,
-    "type": {
-        "kind": "NumberKeyword",
-        "pos": 1,
-        "end": 7
-    }
-}`);
-                });
-
-                it("recordType1", () => {
-                    parsesCorrectly("{{}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 3,
-    "members": {
-        "length": 0,
-        "pos": 2,
-        "end": 2
-    }
-}`);
-                });
-
-                it("recordType2", () => {
-                    parsesCorrectly("{{foo}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 6,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 5,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 5,
-                "text": "foo"
-            }
-        },
-        "length": 1,
-        "pos": 2,
-        "end": 5
-    }
-}`);
-                });
-
-                it("recordType3", () => {
-                    parsesCorrectly("{{foo: number}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 14,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 13,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 5,
-                "text": "foo"
-            },
-            "type": {
-                "kind": "NumberKeyword",
-                "pos": 6,
-                "end": 13
-            }
-        },
-        "length": 1,
-        "pos": 2,
-        "end": 13
-    }
-}`);
-                });
-
-                it("recordType4", () => {
-                    parsesCorrectly("{{foo, bar}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 11,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 5,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 5,
-                "text": "foo"
-            }
-        },
-        "1": {
-            "kind": "JSDocRecordMember",
-            "pos": 6,
-            "end": 10,
-            "name": {
-                "kind": "Identifier",
-                "pos": 6,
-                "end": 10,
-                "text": "bar"
-            }
-        },
-        "length": 2,
-        "pos": 2,
-        "end": 10
-    }
-}`);
-                });
-
-                it("recordType5", () => {
-                    parsesCorrectly("{{foo: number, bar}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 19,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 13,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 5,
-                "text": "foo"
-            },
-            "type": {
-                "kind": "NumberKeyword",
-                "pos": 6,
-                "end": 13
-            }
-        },
-        "1": {
-            "kind": "JSDocRecordMember",
-            "pos": 14,
-            "end": 18,
-            "name": {
-                "kind": "Identifier",
-                "pos": 14,
-                "end": 18,
-                "text": "bar"
-            }
-        },
-        "length": 2,
-        "pos": 2,
-        "end": 18
-    }
-}`);
-                });
-
-                it("recordType6", () => {
-                    parsesCorrectly("{{foo, bar: number}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 19,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 5,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 5,
-                "text": "foo"
-            }
-        },
-        "1": {
-            "kind": "JSDocRecordMember",
-            "pos": 6,
-            "end": 18,
-            "name": {
-                "kind": "Identifier",
-                "pos": 6,
-                "end": 10,
-                "text": "bar"
-            },
-            "type": {
-                "kind": "NumberKeyword",
-                "pos": 11,
-                "end": 18
-            }
-        },
-        "length": 2,
-        "pos": 2,
-        "end": 18
-    }
-}`);
-                });
-
-                it("recordType7", () => {
-                    parsesCorrectly("{{foo: number, bar: number}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 27,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 13,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 5,
-                "text": "foo"
-            },
-            "type": {
-                "kind": "NumberKeyword",
-                "pos": 6,
-                "end": 13
-            }
-        },
-        "1": {
-            "kind": "JSDocRecordMember",
-            "pos": 14,
-            "end": 26,
-            "name": {
-                "kind": "Identifier",
-                "pos": 14,
-                "end": 18,
-                "text": "bar"
-            },
-            "type": {
-                "kind": "NumberKeyword",
-                "pos": 19,
-                "end": 26
-            }
-        },
-        "length": 2,
-        "pos": 2,
-        "end": 26
-    }
-}`);
-                });
-
-                it("recordType8", () => {
-                    parsesCorrectly("{{function}}",
-                        `{
-    "kind": "JSDocRecordType",
-    "pos": 1,
-    "end": 11,
-    "members": {
-        "0": {
-            "kind": "JSDocRecordMember",
-            "pos": 2,
-            "end": 10,
-            "name": {
-                "kind": "Identifier",
-                "pos": 2,
-                "end": 10,
-                "originalKeywordKind": "FunctionKeyword",
-                "text": "function"
-            }
-        },
-        "length": 1,
-        "pos": 2,
-        "end": 10
-    }
-}`);
-                });
-
-                it("unionType", () => {
-                    parsesCorrectly("{(number|string)}",
-                        `{
-    "kind": "JSDocUnionType",
-    "pos": 1,
-    "end": 16,
-    "types": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 2,
-            "end": 8
-        },
-        "1": {
-            "kind": "StringKeyword",
-            "pos": 9,
-            "end": 15
-        },
-        "length": 2,
-        "pos": 2,
-        "end": 15
-    }
-}`);
-                });
-
-                it("topLevelNoParenUnionType", () => {
-                    parsesCorrectly("{number|string}",
-                        `{
-    "kind": "JSDocUnionType",
-    "pos": 1,
-    "end": 14,
-    "types": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 1,
-            "end": 7
-        },
-        "1": {
-            "kind": "StringKeyword",
-            "pos": 8,
-            "end": 14
-        },
-        "length": 2,
-        "pos": 1,
-        "end": 14
-    }
-}`);
-                });
-
-                it("functionType1", () => {
-                    parsesCorrectly("{function()}",
-                        `{
-    "kind": "JSDocFunctionType",
-    "pos": 1,
-    "end": 11,
-    "parameters": {
-        "length": 0,
-        "pos": 10,
-        "end": 10
-    }
-}`);
-                });
-
-                it("functionType2", () => {
-                    parsesCorrectly("{function(string, boolean)}",
-                        `{
-    "kind": "JSDocFunctionType",
-    "pos": 1,
-    "end": 26,
-    "parameters": {
-        "0": {
-            "kind": "Parameter",
-            "pos": 10,
-            "end": 16,
-            "type": {
-                "kind": "StringKeyword",
-                "pos": 10,
-                "end": 16
-            }
-        },
-        "1": {
-            "kind": "Parameter",
-            "pos": 17,
-            "end": 25,
-            "type": {
-                "kind": "BooleanKeyword",
-                "pos": 17,
-                "end": 25
-            }
-        },
-        "length": 2,
-        "pos": 10,
-        "end": 25
-    }
-}`);
-                });
-
-                it("functionReturnType1", () => {
-                    parsesCorrectly("{function(string, boolean)}",
-                        `{
-    "kind": "JSDocFunctionType",
-    "pos": 1,
-    "end": 26,
-    "parameters": {
-        "0": {
-            "kind": "Parameter",
-            "pos": 10,
-            "end": 16,
-            "type": {
-                "kind": "StringKeyword",
-                "pos": 10,
-                "end": 16
-            }
-        },
-        "1": {
-            "kind": "Parameter",
-            "pos": 17,
-            "end": 25,
-            "type": {
-                "kind": "BooleanKeyword",
-                "pos": 17,
-                "end": 25
-            }
-        },
-        "length": 2,
-        "pos": 10,
-        "end": 25
-    }
-}`);
-                });
-
-                it("thisType1", () => {
-                    parsesCorrectly("{this:a.b}",
-                        `{
-    "kind": "JSDocThisType",
-    "pos": 1,
-    "end": 9,
-    "type": {
-        "kind": "JSDocTypeReference",
-        "pos": 6,
-        "end": 9,
-        "name": {
-            "kind": "FirstNode",
-            "pos": 6,
-            "end": 9,
-            "left": {
-                "kind": "Identifier",
-                "pos": 6,
-                "end": 7,
-                "text": "a"
-            },
-            "right": {
-                "kind": "Identifier",
-                "pos": 8,
-                "end": 9,
-                "text": "b"
-            }
-        }
-    }
-}`);
-                });
-
-                it("newType1", () => {
-                    parsesCorrectly("{new:a.b}",
-                        `{
-    "kind": "JSDocConstructorType",
-    "pos": 1,
-    "end": 8,
-    "type": {
-        "kind": "JSDocTypeReference",
-        "pos": 5,
-        "end": 8,
-        "name": {
-            "kind": "FirstNode",
-            "pos": 5,
-            "end": 8,
-            "left": {
-                "kind": "Identifier",
-                "pos": 5,
-                "end": 6,
-                "text": "a"
-            },
-            "right": {
-                "kind": "Identifier",
-                "pos": 7,
-                "end": 8,
-                "text": "b"
-            }
-        }
-    }
-}`);
-                });
-
-                it("variadicType", () => {
-                    parsesCorrectly("{...number}",
-                        `{
-    "kind": "JSDocVariadicType",
-    "pos": 1,
-    "end": 10,
-    "type": {
-        "kind": "NumberKeyword",
-        "pos": 4,
-        "end": 10
-    }
-}`);
-                });
-
-                it("optionalType", () => {
-                    parsesCorrectly("{number=}",
-                        `{
-    "kind": "JSDocOptionalType",
-    "pos": 1,
-    "end": 8,
-    "type": {
-        "kind": "NumberKeyword",
-        "pos": 1,
-        "end": 7
-    }
-}`);
-                });
-
-                it("optionalNullable", () => {
-                    parsesCorrectly("{?=}",
-                        `{
-    "kind": "JSDocOptionalType",
-    "pos": 1,
-    "end": 3,
-    "type": {
-        "kind": "JSDocUnknownType",
-        "pos": 1,
-        "end": 2
-    }
-}`);
-                });
-
-                it("typeReference1", () => {
-                    parsesCorrectly("{a.<number>}",
-                        `{
-    "kind": "JSDocTypeReference",
-    "pos": 1,
-    "end": 11,
-    "name": {
-        "kind": "Identifier",
-        "pos": 1,
-        "end": 2,
-        "text": "a"
-    },
-    "typeArguments": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 4,
-            "end": 10
-        },
-        "length": 1,
-        "pos": 4,
-        "end": 10
-    }
-}`);
-                });
-
-                it("typeReference2", () => {
-                    parsesCorrectly("{a.<number,string>}",
-                        `{
-    "kind": "JSDocTypeReference",
-    "pos": 1,
-    "end": 18,
-    "name": {
-        "kind": "Identifier",
-        "pos": 1,
-        "end": 2,
-        "text": "a"
-    },
-    "typeArguments": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 4,
-            "end": 10
-        },
-        "1": {
-            "kind": "StringKeyword",
-            "pos": 11,
-            "end": 17
-        },
-        "length": 2,
-        "pos": 4,
-        "end": 17
-    }
-}`);
-                });
-
-                it("typeReference3", () => {
-                    parsesCorrectly("{a.function}",
-                        `{
-    "kind": "JSDocTypeReference",
-    "pos": 1,
-    "end": 11,
-    "name": {
-        "kind": "FirstNode",
-        "pos": 1,
-        "end": 11,
-        "left": {
-            "kind": "Identifier",
-            "pos": 1,
-            "end": 2,
-            "text": "a"
-        },
-        "right": {
-            "kind": "Identifier",
-            "pos": 3,
-            "end": 11,
-            "originalKeywordKind": "FunctionKeyword",
-            "text": "function"
-        }
-    }
-}`);
-                });
-
-                it("arrayType1", () => {
-                    parsesCorrectly(
-                        "{a[]}",
-                        `{
-    "kind": "JSDocArrayType",
-    "pos": 1,
-    "end": 4,
-    "elementType": {
-        "kind": "JSDocTypeReference",
-        "pos": 1,
-        "end": 2,
-        "name": {
-            "kind": "Identifier",
-            "pos": 1,
-            "end": 2,
-            "text": "a"
-        }
-    }
-}`);
-                });
-
-                it("arrayType2", () => {
-                    parsesCorrectly(
-                        "{a[][]}",
-                        `{
-    "kind": "JSDocArrayType",
-    "pos": 1,
-    "end": 6,
-    "elementType": {
-        "kind": "JSDocArrayType",
-        "pos": 1,
-        "end": 4,
-        "elementType": {
-            "kind": "JSDocTypeReference",
-            "pos": 1,
-            "end": 2,
-            "name": {
-                "kind": "Identifier",
-                "pos": 1,
-                "end": 2,
-                "text": "a"
-            }
-        }
-    }
-}`);
-                });
-
-                it("arrayType3", () => {
-                    parsesCorrectly(
-                        "{a[][]=}",
-                        `{
-    "kind": "JSDocOptionalType",
-    "pos": 1,
-    "end": 7,
-    "type": {
-        "kind": "JSDocArrayType",
-        "pos": 1,
-        "end": 6,
-        "elementType": {
-            "kind": "JSDocArrayType",
-            "pos": 1,
-            "end": 4,
-            "elementType": {
-                "kind": "JSDocTypeReference",
-                "pos": 1,
-                "end": 2,
-                "name": {
-                    "kind": "Identifier",
-                    "pos": 1,
-                    "end": 2,
-                    "text": "a"
-                }
-            }
-        }
-    }
-}`);
-                });
-
-                it("keyword1", () => {
-                    parsesCorrectly(
-                        "{var}",
-                        `{
-    "kind": "JSDocTypeReference",
-    "pos": 1,
-    "end": 4,
-    "name": {
-        "kind": "Identifier",
-        "pos": 1,
-        "end": 4,
-        "originalKeywordKind": "VarKeyword",
-        "text": "var"
-    }
-}`);
-                });
-
-                it("keyword2", () => {
-                    parsesCorrectly(
-                        "{null}",
-                        `{
-    "kind": "NullKeyword",
-    "pos": 1,
-    "end": 5
-}`);
-                });
-
-                it("keyword3", () => {
-                    parsesCorrectly(
-                        "{undefined}",
-                        `{
-    "kind": "UndefinedKeyword",
-    "pos": 1,
-    "end": 10
-}`);
-                });
-
-                it("tupleType0", () => {
-                    parsesCorrectly(
-                        "{[]}",
-                        `{
-    "kind": "JSDocTupleType",
-    "pos": 1,
-    "end": 3,
-    "types": {
-        "length": 0,
-        "pos": 2,
-        "end": 2
-    }
-}`);
-                });
-
-                it("tupleType1", () => {
-                    parsesCorrectly(
-                        "{[number]}",
-                        `{
-    "kind": "JSDocTupleType",
-    "pos": 1,
-    "end": 9,
-    "types": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 2,
-            "end": 8
-        },
-        "length": 1,
-        "pos": 2,
-        "end": 8
-    }
-}`);
-                });
-
-                it("tupleType2", () => {
-                    parsesCorrectly(
-                        "{[number,string]}",
-                        `{
-    "kind": "JSDocTupleType",
-    "pos": 1,
-    "end": 16,
-    "types": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 2,
-            "end": 8
-        },
-        "1": {
-            "kind": "StringKeyword",
-            "pos": 9,
-            "end": 15
-        },
-        "length": 2,
-        "pos": 2,
-        "end": 15
-    }
-}`);
-                });
-
-                it("tupleType3", () => {
-                    parsesCorrectly(
-                        "{[number,string,boolean]}",
-                        `{
-    "kind": "JSDocTupleType",
-    "pos": 1,
-    "end": 24,
-    "types": {
-        "0": {
-            "kind": "NumberKeyword",
-            "pos": 2,
-            "end": 8
-        },
-        "1": {
-            "kind": "StringKeyword",
-            "pos": 9,
-            "end": 15
-        },
-        "2": {
-            "kind": "BooleanKeyword",
-            "pos": 16,
-            "end": 23
-        },
-        "length": 3,
-        "pos": 2,
-        "end": 23
-    }
-}`);
-                });
-            });
+                parsesCorrectly("unknownType", "{?}");
+                parsesCorrectly("allType", "{*}");
+                parsesCorrectly("nullableType", "{?number}");
+                parsesCorrectly("nullableType2", "{number?}");
+                parsesCorrectly("nonNullableType", "{!number}");
+                parsesCorrectly("nonNullableType2", "{number!}");
+                parsesCorrectly("recordType1", "{{}}");
+                parsesCorrectly("recordType2", "{{foo}}");
+                parsesCorrectly("recordType3", "{{foo: number}}");
+                parsesCorrectly("recordType4", "{{foo, bar}}");
+                parsesCorrectly("recordType5", "{{foo: number, bar}}");
+                parsesCorrectly("recordType6", "{{foo, bar: number}}");
+                parsesCorrectly("recordType7", "{{foo: number, bar: number}}");
+                parsesCorrectly("recordType8", "{{function}}");
+                parsesCorrectly("unionType", "{(number|string)}");
+                parsesCorrectly("topLevelNoParenUnionType", "{number|string}");
+                parsesCorrectly("functionType1", "{function()}");
+                parsesCorrectly("functionType2", "{function(string, boolean)}");
+                parsesCorrectly("functionReturnType1", "{function(string, boolean)}");
+                parsesCorrectly("thisType1", "{this:a.b}");
+                parsesCorrectly("newType1", "{new:a.b}");
+                parsesCorrectly("variadicType", "{...number}");
+                parsesCorrectly("optionalType", "{number=}");
+                parsesCorrectly("optionalNullable", "{?=}");
+                parsesCorrectly("typeReference1", "{a.<number>}");
+                parsesCorrectly("typeReference2", "{a.<number,string>}");
+                parsesCorrectly("typeReference3", "{a.function}");
+                parsesCorrectly("arrayType1", "{a[]}");
+                parsesCorrectly("arrayType2", "{a[][]}");
+                parsesCorrectly("arrayType3", "{a[][]=}");
+                parsesCorrectly("keyword1", "{var}");
+                parsesCorrectly("keyword2", "{null}");
+                parsesCorrectly("keyword3", "{undefined}");
+                parsesCorrectly("tupleType0", "{[]}");
+                parsesCorrectly("tupleType1", "{[number]}");
+                parsesCorrectly("tupleType2", "{[number,string]}");
+                parsesCorrectly("tupleType3", "{[number,string,boolean]}");
+           });
 
             describe("parsesIncorrectly", () => {
-                it("emptyType", () => {
-                    parsesIncorrectly("{}");
-                });
-
-                it("trailingCommaInRecordType", () => {
-                    parsesIncorrectly("{{a,}}");
-                });
-
-                it("unionTypeWithTrailingBar", () => {
-                    parsesIncorrectly("{(a|)}");
-                });
-
-                it("unionTypeWithoutTypes", () => {
-                    parsesIncorrectly("{()}");
-                });
-
-                it("nullableTypeWithoutType", () => {
-                    parsesIncorrectly("{!}");
-                });
-
-                it("functionTypeWithTrailingComma", () => {
-                    parsesIncorrectly("{function(a,)}");
-                });
-
-                it("thisWithoutType", () => {
-                    parsesIncorrectly("{this:}");
-                });
-
-                it("newWithoutType", () => {
-                    parsesIncorrectly("{new:}");
-                });
-
-                it("variadicWithoutType", () => {
-                    parsesIncorrectly("{...}");
-                });
-
-                it("optionalWithoutType", () => {
-                    parsesIncorrectly("{=}");
-                });
-
-                it("allWithType", () => {
-                    parsesIncorrectly("{*foo}");
-                });
-
-                it("typeArgumentsNotFollowingDot", () => {
-                    parsesIncorrectly("{a<>}");
-                });
-
-                it("emptyTypeArguments", () => {
-                    parsesIncorrectly("{a.<>}");
-                });
-
-                it("typeArgumentsWithTrailingComma", () => {
-                    parsesIncorrectly("{a.<a,>}");
-                });
-
-                it("tsFunctionType", () => {
-                    parsesIncorrectly("{() => string}");
-                });
-
-                it("tsConstructoType", () => {
-                    parsesIncorrectly("{new () => string}");
-                });
-
-                it("typeOfType", () => {
-                    parsesIncorrectly("{typeof M}");
-                });
-
-                it("namedParameter", () => {
-                    parsesIncorrectly("{function(a: number)}");
-                });
-
-                it("callSignatureInRecordType", () => {
-                    parsesIncorrectly("{{(): number}}");
-                });
-
-                it("methodInRecordType", () => {
-                    parsesIncorrectly("{{foo(): number}}");
-                });
-
-                it("tupleTypeWithComma", () => {
-                    parsesIncorrectly( "{[,]}");
-                });
-
-                it("tupleTypeWithTrailingComma", () => {
-                    parsesIncorrectly("{[number,]}");
-                });
-
-                it("tupleTypeWithLeadingComma", () => {
-                    parsesIncorrectly("{[,number]}");
-                });
+                parsesIncorrectly("emptyType", "{}");
+                parsesIncorrectly("trailingCommaInRecordType", "{{a,}}");
+                parsesIncorrectly("unionTypeWithTrailingBar", "{(a|)}");
+                parsesIncorrectly("unionTypeWithoutTypes", "{()}");
+                parsesIncorrectly("nullableTypeWithoutType", "{!}");
+                parsesIncorrectly("functionTypeWithTrailingComma", "{function(a,)}");
+                parsesIncorrectly("thisWithoutType", "{this:}");
+                parsesIncorrectly("newWithoutType", "{new:}");
+                parsesIncorrectly("variadicWithoutType", "{...}");
+                parsesIncorrectly("optionalWithoutType", "{=}");
+                parsesIncorrectly("allWithType", "{*foo}");
+                parsesIncorrectly("typeArgumentsNotFollowingDot", "{a<>}");
+                parsesIncorrectly("emptyTypeArguments", "{a.<>}");
+                parsesIncorrectly("typeArgumentsWithTrailingComma", "{a.<a,>}");
+                parsesIncorrectly("tsFunctionType", "{() => string}");
+                parsesIncorrectly("tsConstructoType", "{new () => string}");
+                parsesIncorrectly("typeOfType", "{typeof M}");
+                parsesIncorrectly("namedParameter", "{function(a: number)}");
+                parsesIncorrectly("callSignatureInRecordType", "{{(): number}}");
+                parsesIncorrectly("methodInRecordType", "{{foo(): number}}");
+                parsesIncorrectly("tupleTypeWithComma", "{[,]}");
+                parsesIncorrectly("tupleTypeWithTrailingComma", "{[number,]}");
+                parsesIncorrectly("tupleTypeWithLeadingComma", "{[,number]}");
             });
         });
 
         describe("DocComments", () => {
-            function parsesCorrectly(content: string, expected: string | {}) {
-                const comment = parseIsolatedJSDocComment(content);
-                if (!comment) {
-                    Debug.fail("Comment failed to parse entirely");
-                }
-                if (comment.diagnostics.length > 0) {
-                    Debug.fail("Comment has at least one diagnostic: " + comment.diagnostics[0].messageText);
-                }
-
-                const result = toJsonString(comment.jsDocComment);
-
-                const expectedString = typeof expected === "string"
-                    ? expected
-                    : toJsonString(expected);
-                if (result !== expectedString) {
-                    // Turn on a human-readable diff
-                    if (typeof require !== "undefined") {
-                        const chai = require("chai");
-                        chai.config.showDiff = true;
-                        // Use deep equal to compare key value data instead of the two objects
-                        chai.expect(JSON.parse(result)).deep.equal(JSON.parse(expectedString));
+            function parsesCorrectly(name: string, content: string) {
+                it(name, () => {
+                    const comment = parseIsolatedJSDocComment(content);
+                    if (!comment) {
+                        Debug.fail("Comment failed to parse entirely");
                     }
-                    else {
-                        assert.equal(result, expectedString);
+                    if (comment.diagnostics.length > 0) {
+                        Debug.fail("Comment has at least one diagnostic: " + comment.diagnostics[0].messageText);
                     }
-                }
+
+                    Harness.Baseline.runBaseline("JSDocParsing/DocComments.parsesCorrectly." + name + ".json",
+                        () => JSON.stringify(comment.jsDocComment,
+                            (k, v) => v && v.pos !== undefined ? JSON.parse(Utils.sourceFileToJSON(v)) : v, 4));
+                });
             }
 
-            function toJsonString(obj: {}) {
-                return JSON.stringify(obj, (k, v) => {
-                    return v && v.pos !== undefined
-                        ? JSON.parse(Utils.sourceFileToJSON(v))
-                        : v;
-                }, 4);
-            }
-
-            function parsesIncorrectly(content: string) {
-                const type = parseIsolatedJSDocComment(content);
-                assert.isTrue(!type || type.diagnostics.length > 0);
-            }
-
-            function reIndentJSDocComment(jsdocComment: string) {
-                const result = jsdocComment
-                    .replace(/[\t ]*\/\*\*/, "/**")
-                    .replace(/[\t ]*\*\s?@/g, "  * @")
-                    .replace(/[\t ]*\*\s?\//, "  */");
-                return result;
+            function parsesIncorrectly(name: string, content: string) {
+                it(name, () => {
+                    const type = parseIsolatedJSDocComment(content);
+                    assert.isTrue(!type || type.diagnostics.length > 0);
+                });
             }
 
             describe("parsesIncorrectly", () => {
-                it("emptyComment", () => {
-                    parsesIncorrectly("/***/");
-                });
-
-                it("threeAsterisks", () => {
-                    parsesIncorrectly("/*** */");
-                });
-
-                it("asteriskAfterPreamble", () => {
-                    parsesIncorrectly("/** * @type {number} */");
-                });
-
-                it("multipleTypes", () => {
-                    parsesIncorrectly(
-`/**
+                parsesIncorrectly("emptyComment", "/***/");
+                parsesIncorrectly("threeAsterisks", "/*** */");
+                parsesIncorrectly("asteriskAfterPreamble", "/** * @type {number} */");
+                parsesIncorrectly("multipleTypes",
+                        `/**
   * @type {number}
   * @type {string}
   */`);
-                });
-
-                it("multipleReturnTypes", () => {
-                    parsesIncorrectly(
-`/**
+                parsesIncorrectly("multipleReturnTypes",
+                        `/**
   * @return {number}
   * @return {string}
   */`);
-                });
-
-                it("noTypeParameters", () => {
-                    parsesIncorrectly(
-`/**
+                parsesIncorrectly("noTypeParameters",
+                        `/**
   * @template
   */`);
-                });
-
-                it("trailingTypeParameterComma", () => {
-                    parsesIncorrectly(
-`/**
+                parsesIncorrectly("trailingTypeParameterComma",
+                        `/**
   * @template T,
   */`);
-                });
-
-                it("paramWithoutName", () => {
-                    parsesIncorrectly(
-`/**
+                parsesIncorrectly("paramWithoutName",
+                        `/**
   * @param {number}
   */`);
-                });
-
-                it("paramWithoutTypeOrName", () => {
-                    parsesIncorrectly(
-`/**
+                parsesIncorrectly("paramWithoutTypeOrName",
+                        `/**
   * @param
   */`);
-                });
             });
 
             describe("parsesCorrectly", () => {
-                it("noLeadingAsterisk", () => {
-                    parsesCorrectly(
+                parsesCorrectly("noLeadingAsterisk",
 `/**
     @type {number}
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 27,
-    "tags": {
-        "0": {
-            "kind": "JSDocTypeTag",
-            "pos": 8,
-            "end": 22,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 13,
-                "text": "type"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 14,
-                "end": 22,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 15,
-                    "end": 21
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 22
-    }
-}`);
-                });
+  */`);
 
-                it("noType", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("noType",
+`/**
   * @type
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 18,
-    "tags": {
-        "0": {
-            "kind": "JSDocTypeTag",
-            "pos": 8,
-            "end": 13,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 13,
-                "text": "type"
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 13
-    }
-}`);
-                });
+  */`);
 
-                it("noReturnType", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("noReturnType",
+`/**
   * @return
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 20,
-    "tags": {
-        "0": {
-            "kind": "JSDocReturnTag",
-            "pos": 8,
-            "end": 15,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 15,
-                "text": "return"
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 15
-    }
-}`);
-                });
+  */`);
 
-                it("leadingAsterisk", () => {
-                    parsesCorrectly(
+                parsesCorrectly("leadingAsterisk",
 `/**
   * @type {number}
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 27,
-    "tags": {
-        "0": {
-            "kind": "JSDocTypeTag",
-            "pos": 8,
-            "end": 22,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 13,
-                "text": "type"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 14,
-                "end": 22,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 15,
-                    "end": 21
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 22
-    }
-}`);
-                });
+  */`);
 
-                it("typeTag", () => {
-                    parsesCorrectly(
+
+                parsesCorrectly("typeTag",
 `/**
   * @type {number}
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 27,
-    "tags": {
-        "0": {
-            "kind": "JSDocTypeTag",
-            "pos": 8,
-            "end": 22,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 13,
-                "text": "type"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 14,
-                "end": 22,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 15,
-                    "end": 21
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 22
-    }
-}`);
-                });
+  */`);
 
-                it("returnTag1", () => {
-                    parsesCorrectly(
+
+                parsesCorrectly("returnTag1",
 `/**
   * @return {number}
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 29,
-    "tags": {
-        "0": {
-            "kind": "JSDocReturnTag",
-            "pos": 8,
-            "end": 24,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 15,
-                "text": "return"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 16,
-                "end": 24,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 17,
-                    "end": 23
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 24
-    }
-}`);
-                });
+  */`);
 
-                it("returnTag2", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("returnTag2",
+`/**
   * @return {number} Description text follows
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 54,
-    "tags": {
-        "0": {
-            "kind": "JSDocReturnTag",
-            "pos": 8,
-            "end": 24,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 15,
-                "text": "return"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 16,
-                "end": 24,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 17,
-                    "end": 23
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 24
-    }
-}`);
-                });
+  */`);
 
-                it("returnsTag1", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("returnsTag1",
+`/**
   * @returns {number}
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 30,
-    "tags": {
-        "0": {
-            "kind": "JSDocReturnTag",
-            "pos": 8,
-            "end": 25,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 16,
-                "text": "returns"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 17,
-                "end": 25,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 18,
-                    "end": 24
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 25
-    }
-}`);
-                });
+  */`);
 
-                it("oneParamTag", () => {
-                    parsesCorrectly(
+
+                parsesCorrectly("oneParamTag",
 `/**
   * @param {number} name1
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 34,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 29,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 15,
-                "end": 23,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 16,
-                    "end": 22
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 24,
-                "end": 29,
-                "text": "name1"
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 29
-    }
-}`);
-                });
+  */`);
 
-                it("twoParamTag2", () => {
-                    parsesCorrectly(
+
+                parsesCorrectly("twoParamTag2",
 `/**
   * @param {number} name1
   * @param {number} name2
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 60,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 29,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 15,
-                "end": 23,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 16,
-                    "end": 22
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 24,
-                "end": 29,
-                "text": "name1"
-            }
-        },
-        "1": {
-            "kind": "JSDocParameterTag",
-            "pos": 34,
-            "end": 55,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 34,
-                "end": 35
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 35,
-                "end": 40,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 41,
-                "end": 49,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 42,
-                    "end": 48
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 50,
-                "end": 55,
-                "text": "name2"
-            }
-        },
-        "length": 2,
-        "pos": 8,
-        "end": 55
-    }
-}`);
-                });
+  */`);
 
-                it("paramTag1", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("paramTag1",
+`/**
   * @param {number} name1 Description text follows
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 59,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 29,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 15,
-                "end": 23,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 16,
-                    "end": 22
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 24,
-                "end": 29,
-                "text": "name1"
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 29
-    }
-}`);
-                });
+  */`);
 
-                it("paramTagBracketedName1", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("paramTagBracketedName1",
+`/**
   * @param {number} [name1] Description text follows
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 61,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 31,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 15,
-                "end": 23,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 16,
-                    "end": 22
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 25,
-                "end": 30,
-                "text": "name1"
-            },
-            "isBracketed": true
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 31
-    }
-}`);
-                });
+  */`);
 
-                it("paramTagBracketedName2", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("paramTagBracketedName2",
+`/**
   * @param {number} [ name1 = 1] Description text follows
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 66,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 36,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 15,
-                "end": 23,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 16,
-                    "end": 22
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 26,
-                "end": 31,
-                "text": "name1"
-            },
-            "isBracketed": true
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 36
-    }
-}`);
-                });
+  */`);
 
-                it("twoParamTagOnSameLine", () => {
-                    parsesCorrectly(
+
+                parsesCorrectly("twoParamTagOnSameLine",
 `/**
   * @param {number} name1 @param {number} name2
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 56,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 29,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 15,
-                "end": 23,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 16,
-                    "end": 22
-                }
-            },
-            "postParameterName": {
-                "kind": "Identifier",
-                "pos": 24,
-                "end": 29,
-                "text": "name1"
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 29
-    }
-}`);
-                });
+  */`);
 
-                it("paramTagNameThenType1", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("paramTagNameThenType1",
+`/**
   * @param name1 {number}
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 34,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 29,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "preParameterName": {
-                "kind": "Identifier",
-                "pos": 15,
-                "end": 20,
-                "text": "name1"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 21,
-                "end": 29,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 22,
-                    "end": 28
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 29
-    }
-}`);
-                });
+  */`);
 
-                it("paramTagNameThenType2", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("paramTagNameThenType2",
+`/**
   * @param name1 {number} Description
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 46,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 29,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "preParameterName": {
-                "kind": "Identifier",
-                "pos": 15,
-                "end": 20,
-                "text": "name1"
-            },
-            "typeExpression": {
-                "kind": "JSDocTypeExpression",
-                "pos": 21,
-                "end": 29,
-                "type": {
-                    "kind": "NumberKeyword",
-                    "pos": 22,
-                    "end": 28
-                }
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 29
-    }
-}`);
-                });
+  */`);
 
-                it("templateTag", () => {
-                    parsesCorrectly(
+
+                parsesCorrectly("templateTag",
 `/**
   * @template T
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 24,
-    "tags": {
-        "0": {
-            "kind": "JSDocTemplateTag",
-            "pos": 8,
-            "end": 19,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 17,
-                "text": "template"
-            },
-            "typeParameters": {
-                "0": {
-                    "kind": "TypeParameter",
-                    "pos": 18,
-                    "end": 19,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 18,
-                        "end": 19,
-                        "text": "T"
-                    }
-                },
-                "length": 1,
-                "pos": 17,
-                "end": 19
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 19
-    }
-}`);
-                });
+  */`);
 
-                it("templateTag2", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("templateTag2",
+`/**
   * @template K,V
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 26,
-    "tags": {
-        "0": {
-            "kind": "JSDocTemplateTag",
-            "pos": 8,
-            "end": 21,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 17,
-                "text": "template"
-            },
-            "typeParameters": {
-                "0": {
-                    "kind": "TypeParameter",
-                    "pos": 18,
-                    "end": 19,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 18,
-                        "end": 19,
-                        "text": "K"
-                    }
-                },
-                "1": {
-                    "kind": "TypeParameter",
-                    "pos": 20,
-                    "end": 21,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 20,
-                        "end": 21,
-                        "text": "V"
-                    }
-                },
-                "length": 2,
-                "pos": 17,
-                "end": 21
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 21
-    }
-}`);
-                });
+  */`);
 
-                it("templateTag3", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("templateTag3",
+`/**
   * @template K ,V
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 27,
-    "tags": {
-        "0": {
-            "kind": "JSDocTemplateTag",
-            "pos": 8,
-            "end": 22,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 17,
-                "text": "template"
-            },
-            "typeParameters": {
-                "0": {
-                    "kind": "TypeParameter",
-                    "pos": 18,
-                    "end": 19,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 18,
-                        "end": 19,
-                        "text": "K"
-                    }
-                },
-                "1": {
-                    "kind": "TypeParameter",
-                    "pos": 21,
-                    "end": 22,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 21,
-                        "end": 22,
-                        "text": "V"
-                    }
-                },
-                "length": 2,
-                "pos": 17,
-                "end": 22
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 22
-    }
-}`);
-                });
+  */`);
 
-                it("templateTag4", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("templateTag4",
+`/**
   * @template K, V
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 27,
-    "tags": {
-        "0": {
-            "kind": "JSDocTemplateTag",
-            "pos": 8,
-            "end": 22,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 17,
-                "text": "template"
-            },
-            "typeParameters": {
-                "0": {
-                    "kind": "TypeParameter",
-                    "pos": 18,
-                    "end": 19,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 18,
-                        "end": 19,
-                        "text": "K"
-                    }
-                },
-                "1": {
-                    "kind": "TypeParameter",
-                    "pos": 21,
-                    "end": 22,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 21,
-                        "end": 22,
-                        "text": "V"
-                    }
-                },
-                "length": 2,
-                "pos": 17,
-                "end": 22
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 22
-    }
-}`);
-                });
+  */`);
 
-                it("templateTag5", () => {
-                    parsesCorrectly(
-                        `/**
+
+                parsesCorrectly("templateTag5",
+`/**
   * @template K , V
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 28,
-    "tags": {
-        "0": {
-            "kind": "JSDocTemplateTag",
-            "pos": 8,
-            "end": 23,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 17,
-                "text": "template"
-            },
-            "typeParameters": {
-                "0": {
-                    "kind": "TypeParameter",
-                    "pos": 18,
-                    "end": 19,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 18,
-                        "end": 19,
-                        "text": "K"
-                    }
-                },
-                "1": {
-                    "kind": "TypeParameter",
-                    "pos": 22,
-                    "end": 23,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 22,
-                        "end": 23,
-                        "text": "V"
-                    }
-                },
-                "length": 2,
-                "pos": 17,
-                "end": 23
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 23
-    }
-}`);
-                });
+  */`);
 
-                it("templateTag6", () => {
-                    parsesCorrectly(
-                        `/**
+                parsesCorrectly("templateTag6",
+`/**
   * @template K , V Description of type parameters.
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 60,
-    "tags": {
-        "0": {
-            "kind": "JSDocTemplateTag",
-            "pos": 8,
-            "end": 23,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 17,
-                "text": "template"
-            },
-            "typeParameters": {
-                "0": {
-                    "kind": "TypeParameter",
-                    "pos": 18,
-                    "end": 19,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 18,
-                        "end": 19,
-                        "text": "K"
-                    }
-                },
-                "1": {
-                    "kind": "TypeParameter",
-                    "pos": 22,
-                    "end": 23,
-                    "name": {
-                        "kind": "Identifier",
-                        "pos": 22,
-                        "end": 23,
-                        "text": "V"
-                    }
-                },
-                "length": 2,
-                "pos": 17,
-                "end": 23
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 23
-    }
-}`);
-                });
+  */`);
 
-                it("paramWithoutType", () => {
-                    parsesCorrectly(
-                        `/**
+                parsesCorrectly("paramWithoutType",
+`/**
   * @param foo
-  */`,
-                        `{
-    "kind": "JSDocComment",
-    "pos": 0,
-    "end": 23,
-    "tags": {
-        "0": {
-            "kind": "JSDocParameterTag",
-            "pos": 8,
-            "end": 18,
-            "atToken": {
-                "kind": "AtToken",
-                "pos": 8,
-                "end": 9
-            },
-            "tagName": {
-                "kind": "Identifier",
-                "pos": 9,
-                "end": 14,
-                "text": "param"
-            },
-            "preParameterName": {
-                "kind": "Identifier",
-                "pos": 15,
-                "end": 18,
-                "text": "foo"
-            }
-        },
-        "length": 1,
-        "pos": 8,
-        "end": 18
-    }
-}`);
-                });
-
-                it("typedefTagWithChildrenTags", () => {
-                    const content =
-                    `/**
-                      * @typedef People
-                      * @type {Object}
-                      * @property {number} age
-                      * @property {string} name
-                      */`;
-                    const expected = {
-                        "end": 102,
-                        "kind": "JSDocComment",
-                        "pos": 0,
-                        "tags": {
-                            "0": {
-                                "atToken": {
-                                    "end": 9,
-                                    "kind": "AtToken",
-                                    "pos": 8
-                                },
-                                "end": 97,
-                                "jsDocTypeLiteral": {
-                                    "end": 97,
-                                    "jsDocPropertyTags": [
-                                        {
-                                            "atToken": {
-                                                "end": 48,
-                                                "kind": "AtToken",
-                                                "pos": 46
-                                            },
-                                            "end": 69,
-                                            "kind": "JSDocPropertyTag",
-                                            "name": {
-                                                "end": 69,
-                                                "kind": "Identifier",
-                                                "pos": 66,
-                                                "text": "age"
-                                            },
-                                            "pos": 46,
-                                            "tagName": {
-                                                "end": 56,
-                                                "kind": "Identifier",
-                                                "pos": 48,
-                                                "text": "property"
-                                            },
-                                            "typeExpression": {
-                                                "end": 65,
-                                                "kind": "JSDocTypeExpression",
-                                                "pos": 57,
-                                                "type": {
-                                                    "end": 64,
-                                                    "kind": "NumberKeyword",
-                                                    "pos": 58
-                                                }
-                                            }
-                                        },
-                                        {
-                                            "atToken": {
-                                                "end": 75,
-                                                "kind": "AtToken",
-                                                "pos": 73
-                                            },
-                                            "end": 97,
-                                            "kind": "JSDocPropertyTag",
-                                            "name": {
-                                                "end": 97,
-                                                "kind": "Identifier",
-                                                "pos": 93,
-                                                "text": "name"
-                                            },
-                                            "pos": 73,
-                                            "tagName": {
-                                                "end": 83,
-                                                "kind": "Identifier",
-                                                "pos": 75,
-                                                "text": "property"
-                                            },
-                                            "typeExpression": {
-                                                "end": 92,
-                                                "kind": "JSDocTypeExpression",
-                                                "pos": 84,
-                                                "type": {
-                                                    "end": 91,
-                                                    "kind": "StringKeyword",
-                                                    "pos": 85
-                                                }
-                                            }
-                                        }
-                                    ],
-                                    "jsDocTypeTag": {
-                                        "atToken": {
-                                            "end": 29,
-                                            "kind": "AtToken",
-                                            "pos": 27
-                                        },
-                                        "end": 42,
-                                        "kind": "JSDocTypeTag",
-                                        "pos": 27,
-                                        "tagName": {
-                                            "end": 33,
-                                            "kind": "Identifier",
-                                            "pos": 29,
-                                            "text": "type"
-                                        },
-                                        "typeExpression": {
-                                            "end": 42,
-                                            "kind": "JSDocTypeExpression",
-                                            "pos": 34,
-                                            "type": {
-                                                "end": 41,
-                                                "kind": "JSDocTypeReference",
-                                                "name": {
-                                                    "end": 41,
-                                                    "kind": "Identifier",
-                                                    "pos": 35,
-                                                    "text": "Object"
-                                                },
-                                                "pos": 35
-                                            }
-                                        }
-                                    },
-                                    "kind": "JSDocTypeLiteral",
-                                    "pos": 23
-                                },
-                                "kind": "JSDocTypedefTag",
-                                "name": {
-                                    "end": 23,
-                                    "kind": "Identifier",
-                                    "pos": 17,
-                                    "text": "People"
-                                },
-                                "pos": 8,
-                                "tagName": {
-                                    "end": 16,
-                                    "kind": "Identifier",
-                                    "pos": 9,
-                                    "text": "typedef"
-                                }
-                            },
-                            "end": 97,
-                            "length": 1,
-                            "pos": 8
-                        }
-                    };
-                    parsesCorrectly(reIndentJSDocComment(content), expected);
-                });
+  */`);
+                parsesCorrectly("typedefTagWithChildrenTags",
+`/**
+  * @typedef People
+  * @type {Object}
+  * @property {number} age
+  * @property {string} name
+  */`);
             });
         });
     });
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
index cf7486acb40..83baa20e3f7 100644
--- a/src/harness/unittests/session.ts
+++ b/src/harness/unittests/session.ts
@@ -18,6 +18,7 @@ namespace ts.server {
         createDirectory(): void {},
         getExecutingFilePath(): string { return void 0; },
         getCurrentDirectory(): string { return void 0; },
+        getEnvironmentVariable(name: string): string { return ""; },
         readDirectory(): string[] { return []; },
         exit(): void { },
         setTimeout(callback, ms, ...args) { return 0; },
diff --git a/src/harness/unittests/transpile.ts b/src/harness/unittests/transpile.ts
index 2dd9c89a1cb..808a5df37c1 100644
--- a/src/harness/unittests/transpile.ts
+++ b/src/harness/unittests/transpile.ts
@@ -101,7 +101,6 @@ namespace ts {
                     });
                 });
 
-
                 if (canUseOldTranspile) {
                     it("Correct output (old transpile) for " + justName, () => {
                         Harness.Baseline.runBaseline(justName.replace(/\.tsx?$/, ".oldTranspile.js"), () => {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index d4ed84191b4..ec050bef4b3 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -198,22 +198,12 @@ namespace ts {
 
         watchDirectory(directoryName: string, callback: DirectoryWatcherCallback, recursive: boolean): DirectoryWatcher {
             const path = this.toPath(directoryName);
-            const callbacks = this.watchedDirectories[path] || (this.watchedDirectories[path] = []);
-            callbacks.push({ cb: callback, recursive });
+            const cbWithRecursive = { cb: callback, recursive };
+            multiMapAdd(this.watchedDirectories, path, cbWithRecursive);
             return {
                 referenceCount: 0,
                 directoryName,
-                close: () => {
-                    for (let i = 0; i < callbacks.length; i++) {
-                        if (callbacks[i].cb === callback) {
-                            callbacks.splice(i, 1);
-                            break;
-                        }
-                    }
-                    if (!callbacks.length) {
-                        delete this.watchedDirectories[path];
-                    }
-                }
+                close: () => multiMapRemove(this.watchedDirectories, path, cbWithRecursive)
             };
         }
 
@@ -239,17 +229,8 @@ namespace ts {
 
         watchFile(fileName: string, callback: FileWatcherCallback) {
             const path = this.toPath(fileName);
-            const callbacks = this.watchedFiles[path] || (this.watchedFiles[path] = []);
-            callbacks.push(callback);
-            return {
-                close: () => {
-                    const i = callbacks.indexOf(callback);
-                    callbacks.splice(i, 1);
-                    if (!callbacks.length) {
-                        delete this.watchedFiles[path];
-                    }
-                }
-            };
+            multiMapAdd(this.watchedFiles, path, callback);
+            return { close: () => multiMapRemove(this.watchedFiles, path, callback) };
         }
 
         // TOOD: record and invoke callbacks to simulate timer events
@@ -259,7 +240,7 @@ namespace ts {
         };
         readonly clearTimeout = (timeoutId: any): void => {
             if (typeof timeoutId === "number") {
-                this.callbackQueue.splice(timeoutId, 1);
+                orderedRemoveItemAt(this.callbackQueue, timeoutId);
             }
         };
 
@@ -282,6 +263,8 @@ namespace ts {
         readonly write = (s: string) => notImplemented();
         readonly createDirectory = (s: string) => notImplemented();
         readonly exit = () => notImplemented();
+        readonly getEnvironmentVariable = (s: string) => notImplemented();
+        readonly tryEnableSourceMapsForHost = () => notImplemented();
     }
 
     describe("tsserver-project-system", () => {
diff --git a/src/harness/virtualFileSystem.ts b/src/harness/virtualFileSystem.ts
index 30192b8b8ec..b6d234acd59 100644
--- a/src/harness/virtualFileSystem.ts
+++ b/src/harness/virtualFileSystem.ts
@@ -16,7 +16,7 @@ namespace Utils {
     }
 
     export class VirtualFile extends VirtualFileSystemEntry {
-        content: string;
+        content?: Harness.LanguageService.ScriptInfo;
         isFile() { return true; }
     }
 
@@ -73,7 +73,7 @@ namespace Utils {
             }
         }
 
-        addFile(name: string, content?: string): VirtualFile {
+        addFile(name: string, content?: Harness.LanguageService.ScriptInfo): VirtualFile {
             const entry = this.getFileSystemEntry(name);
             if (entry === undefined) {
                 const file = new VirtualFile(this.fileSystem, name);
@@ -111,6 +111,7 @@ namespace Utils {
         getFileSystemEntries() { return this.root.getFileSystemEntries(); }
 
         addDirectory(path: string) {
+            path = ts.normalizePath(path);
             const components = ts.getNormalizedPathComponents(path, this.currentDirectory);
             let directory: VirtualDirectory = this.root;
             for (const component of components) {
@@ -123,8 +124,8 @@ namespace Utils {
             return directory;
         }
 
-        addFile(path: string, content?: string) {
-            const absolutePath = ts.getNormalizedAbsolutePath(path, this.currentDirectory);
+        addFile(path: string, content?: Harness.LanguageService.ScriptInfo) {
+            const absolutePath = ts.normalizePath(ts.getNormalizedAbsolutePath(path, this.currentDirectory));
             const fileName = ts.getBaseFileName(path);
             const directoryPath = ts.getDirectoryPath(absolutePath);
             const directory = this.addDirectory(directoryPath);
@@ -141,6 +142,7 @@ namespace Utils {
         }
 
         traversePath(path: string) {
+            path = ts.normalizePath(path);
             let directory: VirtualDirectory = this.root;
             for (const component of ts.getNormalizedPathComponents(path, this.currentDirectory)) {
                 const entry = directory.getFileSystemEntry(component);
@@ -157,6 +159,40 @@ namespace Utils {
 
             return directory;
         }
+
+        /**
+         * Reads the directory at the given path and retrieves a list of file names and a list
+         * of directory names within it. Suitable for use with ts.matchFiles()
+         * @param path  The path to the directory to be read
+         */
+        getAccessibleFileSystemEntries(path: string) {
+            const entry = this.traversePath(path);
+            if (entry && entry.isDirectory()) {
+                const directory = <VirtualDirectory>entry;
+                return {
+                    files: ts.map(directory.getFiles(), f => f.name),
+                    directories: ts.map(directory.getDirectories(), d => d.name)
+                };
+            }
+            return { files: [], directories: [] };
+        }
+
+        getAllFileEntries() {
+            const fileEntries: VirtualFile[] = [];
+            getFilesRecursive(this.root, fileEntries);
+            return fileEntries;
+
+            function getFilesRecursive(dir: VirtualDirectory, result: VirtualFile[]) {
+                const files = dir.getFiles();
+                const dirs = dir.getDirectories();
+                for (const file of files) {
+                    result.push(file);
+                }
+                for (const subDir of dirs) {
+                    getFilesRecursive(subDir, result);
+                }
+            }
+        }
     }
 
     export class MockParseConfigHost extends VirtualFileSystem implements ts.ParseConfigHost {
@@ -170,17 +206,5 @@ namespace Utils {
         readDirectory(path: string, extensions: string[], excludes: string[], includes: string[]) {
             return ts.matchFiles(path, extensions, excludes, includes, this.useCaseSensitiveFileNames, this.currentDirectory, (path: string) => this.getAccessibleFileSystemEntries(path));
         }
-
-        getAccessibleFileSystemEntries(path: string) {
-            const entry = this.traversePath(path);
-            if (entry && entry.isDirectory()) {
-                const directory = <VirtualDirectory>entry;
-                return {
-                    files: ts.map(directory.getFiles(), f => f.name),
-                    directories: ts.map(directory.getDirectories(), d => d.name)
-                };
-            }
-            return { files: [], directories: [] };
-        }
     }
 }
\ No newline at end of file
diff --git a/src/lib/es2015.collection.d.ts b/src/lib/es2015.collection.d.ts
index a3207175c48..bde1c6d5811 100644
--- a/src/lib/es2015.collection.d.ts
+++ b/src/lib/es2015.collection.d.ts
@@ -16,7 +16,6 @@ interface MapConstructor {
 declare var Map: MapConstructor;
 
 interface WeakMap<K, V> {
-    clear(): void;
     delete(key: K): boolean;
     get(key: K): V | undefined;
     has(key: K): boolean;
@@ -48,7 +47,6 @@ declare var Set: SetConstructor;
 
 interface WeakSet<T> {
     add(value: T): this;
-    clear(): void;
     delete(value: T): boolean;
     has(value: T): boolean;
 }
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index e4cbe323c68..a91ad4b126e 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -1060,6 +1060,12 @@ interface ReadonlyArray<T> {
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
     map<U>(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => U, thisArg?: any): U[];
+    /**
+     * Returns the elements of an array that meet the condition specified in a callback function.
+     * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
+     * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
+     */
+    filter<S extends T>(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => value is S, thisArg?: any): S[];
     /**
       * Returns the elements of an array that meet the condition specified in a callback function.
       * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
diff --git a/src/server/client.ts b/src/server/client.ts
index 88177e91fad..ca2d517701f 100644
--- a/src/server/client.ts
+++ b/src/server/client.ts
@@ -216,7 +216,18 @@ namespace ts.server {
             return {
                 isMemberCompletion: false,
                 isNewIdentifierLocation: false,
-                entries: response.body
+                entries: response.body.map(entry => {
+
+                    if (entry.replacementSpan !== undefined) {
+                        const { name, kind, kindModifiers, sortText, replacementSpan} = entry;
+
+                        const convertedSpan = createTextSpanFromBounds(this.lineOffsetToPosition(fileName, replacementSpan.start),
+                            this.lineOffsetToPosition(fileName, replacementSpan.end));
+                        return { name, kind, kindModifiers, sortText, replacementSpan: convertedSpan };
+                    }
+
+                    return entry as { name: string, kind: string, kindModifiers: string, sortText: string };
+                })
             };
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 255ad8547ea..e0f9e8d5cf6 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -275,7 +275,7 @@ namespace ts.server {
         removeRoot(info: ScriptInfo) {
             if (this.filenameToScript.contains(info.path)) {
                 this.filenameToScript.remove(info.path);
-                this.roots = copyListRemovingItem(info, this.roots);
+                unorderedRemoveItem(this.roots, info);
                 this.resolvedModuleNames.remove(info.path);
                 this.resolvedTypeReferenceDirectives.remove(info.path);
             }
@@ -306,11 +306,6 @@ namespace ts.server {
             throw new Error("No script with name '" + filename + "'");
         }
 
-        resolvePath(path: string): string {
-            const result = this.host.resolvePath(path);
-            return result;
-        }
-
         fileExists(path: string): boolean {
             const result = this.host.fileExists(path);
             return result;
@@ -324,6 +319,14 @@ namespace ts.server {
             return this.host.getDirectories(path);
         }
 
+        readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[]): string[] {
+            return this.host.readDirectory(path, extensions, exclude, include);
+        }
+
+        readFile(path: string, encoding?: string): string {
+            return this.host.readFile(path, encoding);
+        }
+
         /**
          *  @param line 1 based index
          */
@@ -585,16 +588,6 @@ namespace ts.server {
         project?: Project;
     }
 
-    function copyListRemovingItem<T>(item: T, list: T[]) {
-        const copiedList: T[] = [];
-        for (let i = 0, len = list.length; i < len; i++) {
-            if (list[i] != item) {
-                copiedList.push(list[i]);
-            }
-        }
-        return copiedList;
-    }
-
     /**
      * This helper funciton processes a list of projects and return the concatenated, sortd and deduplicated output of processing each project.
      */
@@ -880,7 +873,7 @@ namespace ts.server {
                 project.directoryWatcher.close();
                 forEachProperty(project.directoriesWatchedForWildcards, watcher => { watcher.close(); });
                 delete project.directoriesWatchedForWildcards;
-                this.configuredProjects = copyListRemovingItem(project, this.configuredProjects);
+                unorderedRemoveItem(this.configuredProjects, project);
             }
             else {
                 for (const directory of project.directoriesWatchedForTsconfig) {
@@ -892,7 +885,7 @@ namespace ts.server {
                         delete project.projectService.directoryWatchersForTsconfig[directory];
                     }
                 }
-                this.inferredProjects = copyListRemovingItem(project, this.inferredProjects);
+                unorderedRemoveItem(this.inferredProjects, project);
             }
 
             const fileNames = project.getFileNames();
@@ -1017,7 +1010,7 @@ namespace ts.server {
                 }
             }
             else {
-                this.openFilesReferenced = copyListRemovingItem(info, this.openFilesReferenced);
+                unorderedRemoveItem(this.openFilesReferenced, info);
             }
             info.close();
         }
@@ -1524,13 +1517,13 @@ namespace ts.server {
                             // openFileRoots or openFileReferenced.
                             if (info.isOpen) {
                                 if (this.openFileRoots.indexOf(info) >= 0) {
-                                    this.openFileRoots = copyListRemovingItem(info, this.openFileRoots);
+                                    unorderedRemoveItem(this.openFileRoots, info);
                                     if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {
                                         this.removeProject(info.defaultProject);
                                     }
                                 }
                                 if (this.openFilesReferenced.indexOf(info) >= 0) {
-                                    this.openFilesReferenced = copyListRemovingItem(info, this.openFilesReferenced);
+                                    unorderedRemoveItem(this.openFilesReferenced, info);
                                 }
                                 this.openFileRootsConfigured.push(info);
                                 info.defaultProject = project;
@@ -1601,6 +1594,7 @@ namespace ts.server {
                 InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
                 InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
                 InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+                InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
                 InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
                 InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
                 PlaceOpenBraceOnNewLineForFunctions: false,
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
index 6442848abbe..2f71c3d5b74 100644
--- a/src/server/protocol.d.ts
+++ b/src/server/protocol.d.ts
@@ -773,6 +773,11 @@ declare namespace ts.server.protocol {
          * is often the same as the name but may be different in certain circumstances.
          */
         sortText: string;
+        /**
+         * An optional span that indicates the text to be replaced by this completion item. If present,
+         * this span should be used instead of the default one.
+         */
+        replacementSpan?: TextSpan;
     }
 
     /**
diff --git a/src/server/server.ts b/src/server/server.ts
index 17ecfdaa1c9..2ce817fafa7 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -204,7 +204,7 @@ namespace ts.server {
     // average async stat takes about 30 microseconds
     // set chunk size to do 30 files in < 1 millisecond
     function createPollingWatchedFileSet(interval = 2500, chunkSize = 30) {
-        let watchedFiles: WatchedFile[] = [];
+        const watchedFiles: WatchedFile[] = [];
         let nextFileToCheck = 0;
         let watchTimer: any;
 
@@ -267,7 +267,7 @@ namespace ts.server {
         }
 
         function removeFile(file: WatchedFile) {
-            watchedFiles = copyListRemovingItem(file, watchedFiles);
+            unorderedRemoveItem(watchedFiles, file);
         }
 
         return {
diff --git a/src/server/session.ts b/src/server/session.ts
index 00468330ffb..9cb0fd03d8a 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -778,7 +778,17 @@ namespace ts.server {
 
             return completions.entries.reduce((result: protocol.CompletionEntry[], entry: ts.CompletionEntry) => {
                 if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) === 0)) {
-                    result.push(entry);
+                    const { name, kind, kindModifiers, sortText, replacementSpan } = entry;
+
+                    let convertedSpan: protocol.TextSpan = undefined;
+                    if (replacementSpan) {
+                        convertedSpan = {
+                            start: compilerService.host.positionToLineOffset(fileName, replacementSpan.start),
+                            end: compilerService.host.positionToLineOffset(fileName, replacementSpan.start + replacementSpan.length)
+                        };
+                    }
+
+                    result.push({ name, kind, kindModifiers, sortText, replacementSpan: convertedSpan });
                 }
                 return result;
             }, []).sort((a, b) => a.name.localeCompare(b.name));
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index e5a41991255..bf7fb981daa 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -56,7 +56,7 @@ namespace ts.BreakpointResolver {
             return spanInNode(otherwiseOnNode);
         }
 
-        function spanInNodeArray<T>(nodeArray: NodeArray<T>) {
+        function spanInNodeArray<T extends Node>(nodeArray: NodeArray<T>) {
             return createTextSpanFromBounds(skipTrivia(sourceFile.text, nodeArray.pos), nodeArray.end);
         }
 
@@ -296,7 +296,7 @@ namespace ts.BreakpointResolver {
                             }
                         }
 
-                        if (isExpression(node)) {
+                        if (isPartOfExpression(node)) {
                             switch (node.parent.kind) {
                                 case SyntaxKind.DoStatement:
                                     // Set span as if on while keyword
@@ -395,7 +395,7 @@ namespace ts.BreakpointResolver {
                 // Breakpoint is possible in variableDeclaration only if there is initialization
                 // or its declaration from 'for of'
                 if (variableDeclaration.initializer ||
-                    (variableDeclaration.flags & NodeFlags.Export) ||
+                    hasModifier(variableDeclaration, ModifierFlags.Export) ||
                     variableDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
                     return textSpanFromVariableDeclaration(variableDeclaration);
                 }
@@ -413,7 +413,7 @@ namespace ts.BreakpointResolver {
             function canHaveSpanInParameterDeclaration(parameter: ParameterDeclaration): boolean {
                 // Breakpoint is possible on parameter only if it has initializer, is a rest parameter, or has public or private modifier
                 return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                    !!(parameter.flags & NodeFlags.Public) || !!(parameter.flags & NodeFlags.Private);
+                    hasModifier(parameter, ModifierFlags.Public | ModifierFlags.Private);
             }
 
             function spanInParameterDeclaration(parameter: ParameterDeclaration): TextSpan {
@@ -439,7 +439,7 @@ namespace ts.BreakpointResolver {
             }
 
             function canFunctionHaveSpanInWholeDeclaration(functionDeclaration: FunctionLikeDeclaration) {
-                return !!(functionDeclaration.flags & NodeFlags.Export) ||
+                return hasModifier(functionDeclaration, ModifierFlags.Export) ||
                     (functionDeclaration.parent.kind === SyntaxKind.ClassDeclaration && functionDeclaration.kind !== SyntaxKind.Constructor);
             }
 
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index 1839726b9ad..17ee9d435bf 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -50,6 +50,8 @@ namespace ts.formatting {
         // Insert a space after { and before } in single-line contexts, but remove space from empty object literals {}.
         public SpaceAfterOpenBrace: Rule;
         public SpaceBeforeCloseBrace: Rule;
+        public NoSpaceAfterOpenBrace: Rule;
+        public NoSpaceBeforeCloseBrace: Rule;
         public NoSpaceBetweenEmptyBraceBrackets: Rule;
 
         // Insert new line after { and before } in multi-line contexts.
@@ -287,6 +289,8 @@ namespace ts.formatting {
             // Insert a space after { and before } in single-line contexts, but remove space from empty object literals {}.
             this.SpaceAfterOpenBrace = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBraceToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSingleLineBlockContext), RuleAction.Space));
             this.SpaceBeforeCloseBrace = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSingleLineBlockContext), RuleAction.Space));
+            this.NoSpaceAfterOpenBrace = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBraceToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSingleLineBlockContext), RuleAction.Delete));
+            this.NoSpaceBeforeCloseBrace = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSingleLineBlockContext), RuleAction.Delete));
             this.NoSpaceBetweenEmptyBraceBrackets = new Rule(RuleDescriptor.create1(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectContext), RuleAction.Delete));
 
             // Insert new line after { and before } in multi-line contexts.
@@ -414,7 +418,7 @@ namespace ts.formatting {
                 this.SpaceAfterPostdecrementWhenFollowedBySubtract,
                 this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement,
                 this.NoSpaceAfterCloseBrace,
-                this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext,
+                this.NewLineBeforeCloseBraceInBlockContext,
                 this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets,
                 this.NoSpaceBetweenFunctionKeywordAndStar, this.SpaceAfterStarInGeneratorDeclaration,
                 this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember,
@@ -789,7 +793,7 @@ namespace ts.formatting {
         }
 
         static NodeIsInDecoratorContext(node: Node): boolean {
-            while (isExpression(node)) {
+            while (isPartOfExpression(node)) {
                 node = node.parent;
             }
             return node.kind === SyntaxKind.Decorator;
diff --git a/src/services/formatting/rulesProvider.ts b/src/services/formatting/rulesProvider.ts
index 1be0f9e912d..b885accaf5e 100644
--- a/src/services/formatting/rulesProvider.ts
+++ b/src/services/formatting/rulesProvider.ts
@@ -81,6 +81,19 @@ namespace ts.formatting {
                 rules.push(this.globalRules.NoSpaceBetweenBrackets);
             }
 
+            // The default value of InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces is true
+            // so if the option is undefined, we should treat it as true as well
+            if (options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces !== false) {
+                rules.push(this.globalRules.SpaceAfterOpenBrace);
+                rules.push(this.globalRules.SpaceBeforeCloseBrace);
+                rules.push(this.globalRules.NoSpaceBetweenEmptyBraceBrackets);
+            }
+            else {
+                rules.push(this.globalRules.NoSpaceAfterOpenBrace);
+                rules.push(this.globalRules.NoSpaceBeforeCloseBrace);
+                rules.push(this.globalRules.NoSpaceBetweenEmptyBraceBrackets);
+            }
+
             if (options.InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces) {
                 rules.push(this.globalRules.SpaceAfterTemplateHeadAndMiddle);
                 rules.push(this.globalRules.SpaceBeforeTemplateMiddleAndTail);
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index bf6760d9ec5..bda46401ea7 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -208,7 +208,7 @@ namespace ts.formatting {
             // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
             // - parent and child are not on the same line
             const useActualIndentation =
-                (isDeclaration(current) || isStatement(current)) &&
+                (isDeclaration(current) || isStatementButNotDeclaration(current)) &&
                 (parent.kind === SyntaxKind.SourceFile || !parentAndChildShareLine);
 
             if (!useActualIndentation) {
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index dda9ef485d2..c2a5b745d3a 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -397,7 +397,7 @@ namespace ts.NavigationBar {
             case SyntaxKind.FunctionExpression:
             case SyntaxKind.ClassDeclaration:
             case SyntaxKind.ClassExpression:
-                if (node.flags & NodeFlags.Default) {
+                if (getModifierFlags(node) & ModifierFlags.Default) {
                     return "default";
                 }
                 return getFunctionOrClassName(<ArrowFunction | FunctionExpression | ClassExpression>node);
@@ -466,6 +466,7 @@ namespace ts.NavigationBar {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
+                case SyntaxKind.VariableDeclaration:
                     return hasSomeImportantChild(item);
 
                 case SyntaxKind.ArrowFunction:
@@ -595,7 +596,7 @@ namespace ts.NavigationBar {
             return nodeText((node.parent as PropertyAssignment).name);
         }
         // Default exports are named "default"
-        else if (node.flags & NodeFlags.Default) {
+        else if (getModifierFlags(node) & ModifierFlags.Default) {
             return "default";
         }
         else {
diff --git a/src/services/services.ts b/src/services/services.ts
index c19eb487d75..eaba4779a52 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -7,6 +7,7 @@
 /// <reference path='navigationBar.ts' />
 /// <reference path='patternMatcher.ts' />
 /// <reference path='signatureHelp.ts' />
+/// <reference path='types.ts' />
 /// <reference path='utilities.ts' />
 /// <reference path='jsTyping.ts' />
 /// <reference path='formatting\formatting.ts' />
@@ -16,123 +17,6 @@ namespace ts {
     /** The version of the language service API */
     export const servicesVersion = "0.5";
 
-    export interface Node {
-        getSourceFile(): SourceFile;
-        getChildCount(sourceFile?: SourceFile): number;
-        getChildAt(index: number, sourceFile?: SourceFile): Node;
-        getChildren(sourceFile?: SourceFile): Node[];
-        getStart(sourceFile?: SourceFile, includeJsDocComment?: boolean): number;
-        getFullStart(): number;
-        getEnd(): number;
-        getWidth(sourceFile?: SourceFile): number;
-        getFullWidth(): number;
-        getLeadingTriviaWidth(sourceFile?: SourceFile): number;
-        getFullText(sourceFile?: SourceFile): string;
-        getText(sourceFile?: SourceFile): string;
-        getFirstToken(sourceFile?: SourceFile): Node;
-        getLastToken(sourceFile?: SourceFile): Node;
-    }
-
-    export interface Symbol {
-        getFlags(): SymbolFlags;
-        getName(): string;
-        getDeclarations(): Declaration[];
-        getDocumentationComment(): SymbolDisplayPart[];
-    }
-
-    export interface Type {
-        getFlags(): TypeFlags;
-        getSymbol(): Symbol;
-        getProperties(): Symbol[];
-        getProperty(propertyName: string): Symbol;
-        getApparentProperties(): Symbol[];
-        getCallSignatures(): Signature[];
-        getConstructSignatures(): Signature[];
-        getStringIndexType(): Type;
-        getNumberIndexType(): Type;
-        getBaseTypes(): ObjectType[];
-        getNonNullableType(): Type;
-    }
-
-    export interface Signature {
-        getDeclaration(): SignatureDeclaration;
-        getTypeParameters(): Type[];
-        getParameters(): Symbol[];
-        getReturnType(): Type;
-        getDocumentationComment(): SymbolDisplayPart[];
-    }
-
-    export interface SourceFile {
-        /* @internal */ version: string;
-        /* @internal */ scriptSnapshot: IScriptSnapshot;
-        /* @internal */ nameTable: Map<number>;
-
-        /* @internal */ getNamedDeclarations(): Map<Declaration[]>;
-
-        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
-        getLineStarts(): number[];
-        getPositionOfLineAndCharacter(line: number, character: number): number;
-        update(newText: string, textChangeRange: TextChangeRange): SourceFile;
-    }
-
-    /**
-     * Represents an immutable snapshot of a script at a specified time.Once acquired, the
-     * snapshot is observably immutable. i.e. the same calls with the same parameters will return
-     * the same values.
-     */
-    export interface IScriptSnapshot {
-        /** Gets a portion of the script snapshot specified by [start, end). */
-        getText(start: number, end: number): string;
-
-        /** Gets the length of this script snapshot. */
-        getLength(): number;
-
-        /**
-         * Gets the TextChangeRange that describe how the text changed between this text and
-         * an older version.  This information is used by the incremental parser to determine
-         * what sections of the script need to be re-parsed.  'undefined' can be returned if the
-         * change range cannot be determined.  However, in that case, incremental parsing will
-         * not happen and the entire document will be re - parsed.
-         */
-        getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange | undefined;
-
-        /** Releases all resources held by this script snapshot */
-        dispose?(): void;
-    }
-
-    export namespace ScriptSnapshot {
-        class StringScriptSnapshot implements IScriptSnapshot {
-
-            constructor(private text: string) {
-            }
-
-            public getText(start: number, end: number): string {
-                return this.text.substring(start, end);
-            }
-
-            public getLength(): number {
-                return this.text.length;
-            }
-
-            public getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange {
-                // Text-based snapshots do not support incremental parsing. Return undefined
-                // to signal that to the caller.
-                return undefined;
-            }
-        }
-
-        export function fromString(text: string): IScriptSnapshot {
-            return new StringScriptSnapshot(text);
-        }
-    }
-    export interface PreProcessedFileInfo {
-        referencedFiles: FileReference[];
-        typeReferenceDirectives: FileReference[];
-        importedFiles: FileReference[];
-        ambientExternalModules: string[];
-        isLibFile: boolean;
-    }
-
     const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
 
     const emptyArray: any[] = [];
@@ -195,12 +79,17 @@ namespace ts {
         public flags: NodeFlags;
         public parent: Node;
         public jsDocComments: JSDocComment[];
+        public original: Node;
+        public transformFlags: TransformFlags;
+        public excludeTransformFlags: TransformFlags;
         private _children: Node[];
 
         constructor(kind: SyntaxKind, pos: number, end: number) {
             this.pos = pos;
             this.end = end;
             this.flags = NodeFlags.None;
+            this.transformFlags = undefined;
+            this.excludeTransformFlags = undefined;
             this.parent = undefined;
             this.kind = kind;
         }
@@ -302,6 +191,10 @@ namespace ts {
                         processNode(jsDocComment);
                     }
                 }
+                // For syntactic classifications, all trivia are classcified together, including jsdoc comments.
+                // For that to work, the jsdoc comments should still be the leading trivia of the first child. 
+                // Restoring the scanner position ensures that. 
+                pos = this.pos;
                 forEachChild(this, processNode, processNodes);
                 if (pos < this.end) {
                     this.addSyntheticNodes(children, pos, this.end);
@@ -987,8 +880,7 @@ namespace ts {
             function addDeclaration(declaration: Declaration) {
                 const name = getDeclarationName(declaration);
                 if (name) {
-                    const declarations = getDeclarations(name);
-                    declarations.push(declaration);
+                    multiMapAdd(result, name, declaration);
                 }
             }
 
@@ -1079,7 +971,7 @@ namespace ts {
 
                     case SyntaxKind.Parameter:
                         // Only consider parameter properties
-                        if (!(node.flags & NodeFlags.ParameterPropertyModifier)) {
+                        if (!hasModifier(node, ModifierFlags.ParameterPropertyModifier)) {
                             break;
                         }
                     // fall through
@@ -1137,694 +1029,6 @@ namespace ts {
         }
     }
 
-    export interface HostCancellationToken {
-        isCancellationRequested(): boolean;
-    }
-
-    //
-    // Public interface of the host of a language service instance.
-    //
-    export interface LanguageServiceHost {
-        getCompilationSettings(): CompilerOptions;
-        getNewLine?(): string;
-        getProjectVersion?(): string;
-        getScriptFileNames(): string[];
-        getScriptKind?(fileName: string): ScriptKind;
-        getScriptVersion(fileName: string): string;
-        getScriptSnapshot(fileName: string): IScriptSnapshot | undefined;
-        getLocalizedDiagnosticMessages?(): any;
-        getCancellationToken?(): HostCancellationToken;
-        getCurrentDirectory(): string;
-        getDefaultLibFileName(options: CompilerOptions): string;
-        log?(s: string): void;
-        trace?(s: string): void;
-        error?(s: string): void;
-        useCaseSensitiveFileNames?(): boolean;
-
-        /*
-         * LS host can optionally implement this method if it wants to be completely in charge of module name resolution.
-         * if implementation is omitted then language service will use built-in module resolution logic and get answers to
-         * host specific questions using 'getScriptSnapshot'.
-         */
-        resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
-        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
-        directoryExists?(directoryName: string): boolean;
-        getDirectories?(directoryName: string): string[];
-    }
-
-    //
-    // Public services of a language service instance associated
-    // with a language service host instance
-    //
-    export interface LanguageService {
-        cleanupSemanticCache(): void;
-
-        getSyntacticDiagnostics(fileName: string): Diagnostic[];
-        getSemanticDiagnostics(fileName: string): Diagnostic[];
-
-        // TODO: Rename this to getProgramDiagnostics to better indicate that these are any
-        // diagnostics present for the program level, and not just 'options' diagnostics.
-        getCompilerOptionsDiagnostics(): Diagnostic[];
-
-        /**
-         * @deprecated Use getEncodedSyntacticClassifications instead.
-         */
-        getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
-
-        /**
-         * @deprecated Use getEncodedSemanticClassifications instead.
-         */
-        getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
-
-        // Encoded as triples of [start, length, ClassificationType].
-        getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications;
-        getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications;
-
-        getCompletionsAtPosition(fileName: string, position: number): CompletionInfo;
-        getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails;
-
-        getQuickInfoAtPosition(fileName: string, position: number): QuickInfo;
-
-        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan;
-
-        getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan;
-
-        getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems;
-
-        getRenameInfo(fileName: string, position: number): RenameInfo;
-        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];
-
-        getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
-        getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
-
-        getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
-        findReferences(fileName: string, position: number): ReferencedSymbol[];
-        getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[];
-
-        /** @deprecated */
-        getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
-
-        getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
-        getNavigationBarItems(fileName: string): NavigationBarItem[];
-
-        getOutliningSpans(fileName: string): OutliningSpan[];
-        getTodoComments(fileName: string, descriptors: TodoCommentDescriptor[]): TodoComment[];
-        getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[];
-        getIndentationAtPosition(fileName: string, position: number, options: EditorOptions): number;
-
-        getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[];
-        getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[];
-        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[];
-
-        getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
-
-        isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
-
-        getEmitOutput(fileName: string): EmitOutput;
-
-        getProgram(): Program;
-
-        /* @internal */ getNonBoundSourceFile(fileName: string): SourceFile;
-
-        dispose(): void;
-    }
-
-    export interface Classifications {
-        spans: number[];
-        endOfLineState: EndOfLineState;
-    }
-
-    export interface ClassifiedSpan {
-        textSpan: TextSpan;
-        classificationType: string; // ClassificationTypeNames
-    }
-
-    export interface NavigationBarItem {
-        text: string;
-        kind: string;
-        kindModifiers: string;
-        spans: TextSpan[];
-        childItems: NavigationBarItem[];
-        indent: number;
-        bolded: boolean;
-        grayed: boolean;
-    }
-
-    export interface TodoCommentDescriptor {
-        text: string;
-        priority: number;
-    }
-
-    export interface TodoComment {
-        descriptor: TodoCommentDescriptor;
-        message: string;
-        position: number;
-    }
-
-    export class TextChange {
-        span: TextSpan;
-        newText: string;
-    }
-
-    export interface TextInsertion {
-        newText: string;
-        /** The position in newText the caret should point to after the insertion. */
-        caretOffset: number;
-    }
-
-    export interface RenameLocation {
-        textSpan: TextSpan;
-        fileName: string;
-    }
-
-    export interface ReferenceEntry {
-        textSpan: TextSpan;
-        fileName: string;
-        isWriteAccess: boolean;
-        isDefinition: boolean;
-    }
-
-    export interface DocumentHighlights {
-        fileName: string;
-        highlightSpans: HighlightSpan[];
-    }
-
-    export namespace HighlightSpanKind {
-        export const none = "none";
-        export const definition = "definition";
-        export const reference = "reference";
-        export const writtenReference = "writtenReference";
-    }
-
-    export interface HighlightSpan {
-        fileName?: string;
-        textSpan: TextSpan;
-        kind: string;
-    }
-
-    export interface NavigateToItem {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        matchKind: string;
-        isCaseSensitive: boolean;
-        fileName: string;
-        textSpan: TextSpan;
-        containerName: string;
-        containerKind: string;
-    }
-
-    export interface EditorOptions {
-        BaseIndentSize?: number;
-        IndentSize: number;
-        TabSize: number;
-        NewLineCharacter: string;
-        ConvertTabsToSpaces: boolean;
-        IndentStyle: IndentStyle;
-    }
-
-    export enum IndentStyle {
-        None = 0,
-        Block = 1,
-        Smart = 2,
-    }
-
-    export interface FormatCodeOptions extends EditorOptions {
-        InsertSpaceAfterCommaDelimiter: boolean;
-        InsertSpaceAfterSemicolonInForStatements: boolean;
-        InsertSpaceBeforeAndAfterBinaryOperators: boolean;
-        InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
-        InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
-        PlaceOpenBraceOnNewLineForFunctions: boolean;
-        PlaceOpenBraceOnNewLineForControlBlocks: boolean;
-        [s: string]: boolean | number | string | undefined;
-    }
-
-    export interface DefinitionInfo {
-        fileName: string;
-        textSpan: TextSpan;
-        kind: string;
-        name: string;
-        containerKind: string;
-        containerName: string;
-    }
-
-    export interface ReferencedSymbolDefinitionInfo extends DefinitionInfo {
-        displayParts: SymbolDisplayPart[];
-    }
-
-    export interface ReferencedSymbol {
-        definition: ReferencedSymbolDefinitionInfo;
-        references: ReferenceEntry[];
-    }
-
-    export enum SymbolDisplayPartKind {
-        aliasName,
-        className,
-        enumName,
-        fieldName,
-        interfaceName,
-        keyword,
-        lineBreak,
-        numericLiteral,
-        stringLiteral,
-        localName,
-        methodName,
-        moduleName,
-        operator,
-        parameterName,
-        propertyName,
-        punctuation,
-        space,
-        text,
-        typeParameterName,
-        enumMemberName,
-        functionName,
-        regularExpressionLiteral,
-    }
-
-    export interface SymbolDisplayPart {
-        text: string;
-        kind: string;
-    }
-
-    export interface QuickInfo {
-        kind: string;
-        kindModifiers: string;
-        textSpan: TextSpan;
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-
-    export interface RenameInfo {
-        canRename: boolean;
-        localizedErrorMessage: string;
-        displayName: string;
-        fullDisplayName: string;
-        kind: string;
-        kindModifiers: string;
-        triggerSpan: TextSpan;
-    }
-
-    export interface SignatureHelpParameter {
-        name: string;
-        documentation: SymbolDisplayPart[];
-        displayParts: SymbolDisplayPart[];
-        isOptional: boolean;
-    }
-
-    /**
-     * Represents a single signature to show in signature help.
-     * The id is used for subsequent calls into the language service to ask questions about the
-     * signature help item in the context of any documents that have been updated.  i.e. after
-     * an edit has happened, while signature help is still active, the host can ask important
-     * questions like 'what parameter is the user currently contained within?'.
-     */
-    export interface SignatureHelpItem {
-        isVariadic: boolean;
-        prefixDisplayParts: SymbolDisplayPart[];
-        suffixDisplayParts: SymbolDisplayPart[];
-        separatorDisplayParts: SymbolDisplayPart[];
-        parameters: SignatureHelpParameter[];
-        documentation: SymbolDisplayPart[];
-    }
-
-    /**
-     * Represents a set of signature help items, and the preferred item that should be selected.
-     */
-    export interface SignatureHelpItems {
-        items: SignatureHelpItem[];
-        applicableSpan: TextSpan;
-        selectedItemIndex: number;
-        argumentIndex: number;
-        argumentCount: number;
-    }
-
-    export interface CompletionInfo {
-        isMemberCompletion: boolean;
-        isNewIdentifierLocation: boolean;  // true when the current location also allows for a new identifier
-        entries: CompletionEntry[];
-    }
-
-    export interface CompletionEntry {
-        name: string;
-        kind: string;            // see ScriptElementKind
-        kindModifiers: string;   // see ScriptElementKindModifier, comma separated
-        sortText: string;
-    }
-
-    export interface CompletionEntryDetails {
-        name: string;
-        kind: string;            // see ScriptElementKind
-        kindModifiers: string;   // see ScriptElementKindModifier, comma separated
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-
-    export interface OutliningSpan {
-        /** The span of the document to actually collapse. */
-        textSpan: TextSpan;
-
-        /** The span of the document to display when the user hovers over the collapsed span. */
-        hintSpan: TextSpan;
-
-        /** The text to display in the editor for the collapsed region. */
-        bannerText: string;
-
-        /**
-          * Whether or not this region should be automatically collapsed when
-          * the 'Collapse to Definitions' command is invoked.
-          */
-        autoCollapse: boolean;
-    }
-
-    export interface EmitOutput {
-        outputFiles: OutputFile[];
-        emitSkipped: boolean;
-    }
-
-    export const enum OutputFileType {
-        JavaScript,
-        SourceMap,
-        Declaration
-    }
-
-    export interface OutputFile {
-        name: string;
-        writeByteOrderMark: boolean;
-        text: string;
-    }
-
-    export const enum EndOfLineState {
-        None,
-        InMultiLineCommentTrivia,
-        InSingleQuoteStringLiteral,
-        InDoubleQuoteStringLiteral,
-        InTemplateHeadOrNoSubstitutionTemplate,
-        InTemplateMiddleOrTail,
-        InTemplateSubstitutionPosition,
-    }
-
-    export enum TokenClass {
-        Punctuation,
-        Keyword,
-        Operator,
-        Comment,
-        Whitespace,
-        Identifier,
-        NumberLiteral,
-        StringLiteral,
-        RegExpLiteral,
-    }
-
-    export interface ClassificationResult {
-        finalLexState: EndOfLineState;
-        entries: ClassificationInfo[];
-    }
-
-    export interface ClassificationInfo {
-        length: number;
-        classification: TokenClass;
-    }
-
-    export interface Classifier {
-        /**
-         * Gives lexical classifications of tokens on a line without any syntactic context.
-         * For instance, a token consisting of the text 'string' can be either an identifier
-         * named 'string' or the keyword 'string', however, because this classifier is not aware,
-         * it relies on certain heuristics to give acceptable results. For classifications where
-         * speed trumps accuracy, this function is preferable; however, for true accuracy, the
-         * syntactic classifier is ideal. In fact, in certain editing scenarios, combining the
-         * lexical, syntactic, and semantic classifiers may issue the best user experience.
-         *
-         * @param text                      The text of a line to classify.
-         * @param lexState                  The state of the lexical classifier at the end of the previous line.
-         * @param syntacticClassifierAbsent Whether the client is *not* using a syntactic classifier.
-         *                                  If there is no syntactic classifier (syntacticClassifierAbsent=true),
-         *                                  certain heuristics may be used in its place; however, if there is a
-         *                                  syntactic classifier (syntacticClassifierAbsent=false), certain
-         *                                  classifications which may be incorrectly categorized will be given
-         *                                  back as Identifiers in order to allow the syntactic classifier to
-         *                                  subsume the classification.
-         * @deprecated Use getLexicalClassifications instead.
-         */
-        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult;
-        getEncodedLexicalClassifications(text: string, endOfLineState: EndOfLineState, syntacticClassifierAbsent: boolean): Classifications;
-    }
-
-    /**
-      * The document registry represents a store of SourceFile objects that can be shared between
-      * multiple LanguageService instances. A LanguageService instance holds on the SourceFile (AST)
-      * of files in the context.
-      * SourceFile objects account for most of the memory usage by the language service. Sharing
-      * the same DocumentRegistry instance between different instances of LanguageService allow
-      * for more efficient memory utilization since all projects will share at least the library
-      * file (lib.d.ts).
-      *
-      * A more advanced use of the document registry is to serialize sourceFile objects to disk
-      * and re-hydrate them when needed.
-      *
-      * To create a default DocumentRegistry, use createDocumentRegistry to create one, and pass it
-      * to all subsequent createLanguageService calls.
-      */
-    export interface DocumentRegistry {
-        /**
-          * Request a stored SourceFile with a given fileName and compilationSettings.
-          * The first call to acquire will call createLanguageServiceSourceFile to generate
-          * the SourceFile if was not found in the registry.
-          *
-          * @param fileName The name of the file requested
-          * @param compilationSettings Some compilation settings like target affects the
-          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
-          * multiple copies of the same file for different compilation settings.
-          * @parm scriptSnapshot Text of the file. Only used if the file was not found
-          * in the registry and a new one was created.
-          * @parm version Current version of the file. Only used if the file was not found
-          * in the registry and a new one was created.
-          */
-        acquireDocument(
-            fileName: string,
-            compilationSettings: CompilerOptions,
-            scriptSnapshot: IScriptSnapshot,
-            version: string,
-            scriptKind?: ScriptKind): SourceFile;
-
-        acquireDocumentWithKey(
-            fileName: string,
-            path: Path,
-            compilationSettings: CompilerOptions,
-            key: DocumentRegistryBucketKey,
-            scriptSnapshot: IScriptSnapshot,
-            version: string,
-            scriptKind?: ScriptKind): SourceFile;
-
-        /**
-          * Request an updated version of an already existing SourceFile with a given fileName
-          * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile
-          * to get an updated SourceFile.
-          *
-          * @param fileName The name of the file requested
-          * @param compilationSettings Some compilation settings like target affects the
-          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
-          * multiple copies of the same file for different compilation settings.
-          * @param scriptSnapshot Text of the file.
-          * @param version Current version of the file.
-          */
-        updateDocument(
-            fileName: string,
-            compilationSettings: CompilerOptions,
-            scriptSnapshot: IScriptSnapshot,
-            version: string,
-            scriptKind?: ScriptKind): SourceFile;
-
-        updateDocumentWithKey(
-            fileName: string,
-            path: Path,
-            compilationSettings: CompilerOptions,
-            key: DocumentRegistryBucketKey,
-            scriptSnapshot: IScriptSnapshot,
-            version: string,
-            scriptKind?: ScriptKind): SourceFile;
-
-        getKeyForCompilationSettings(settings: CompilerOptions): DocumentRegistryBucketKey;
-        /**
-          * Informs the DocumentRegistry that a file is not needed any longer.
-          *
-          * Note: It is not allowed to call release on a SourceFile that was not acquired from
-          * this registry originally.
-          *
-          * @param fileName The name of the file to be released
-          * @param compilationSettings The compilation settings used to acquire the file
-          */
-        releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;
-
-        releaseDocumentWithKey(path: Path, key: DocumentRegistryBucketKey): void;
-
-        reportStats(): string;
-    }
-
-    export type DocumentRegistryBucketKey = string & { __bucketKey: any };
-
-    // TODO: move these to enums
-    export namespace ScriptElementKind {
-        export const unknown = "";
-        export const warning = "warning";
-
-        /** predefined type (void) or keyword (class) */
-        export const keyword = "keyword";
-
-        /** top level script node */
-        export const scriptElement = "script";
-
-        /** module foo {} */
-        export const moduleElement = "module";
-
-        /** class X {} */
-        export const classElement = "class";
-
-        /** var x = class X {} */
-        export const localClassElement = "local class";
-
-        /** interface Y {} */
-        export const interfaceElement = "interface";
-
-        /** type T = ... */
-        export const typeElement = "type";
-
-        /** enum E */
-        export const enumElement = "enum";
-        // TODO: GH#9983
-        export const enumMemberElement = "const";
-
-        /**
-         * Inside module and script only
-         * const v = ..
-         */
-        export const variableElement = "var";
-
-        /** Inside function */
-        export const localVariableElement = "local var";
-
-        /**
-         * Inside module and script only
-         * function f() { }
-         */
-        export const functionElement = "function";
-
-        /** Inside function */
-        export const localFunctionElement = "local function";
-
-        /** class X { [public|private]* foo() {} } */
-        export const memberFunctionElement = "method";
-
-        /** class X { [public|private]* [get|set] foo:number; } */
-        export const memberGetAccessorElement = "getter";
-        export const memberSetAccessorElement = "setter";
-
-        /**
-         * class X { [public|private]* foo:number; }
-         * interface Y { foo:number; }
-         */
-        export const memberVariableElement = "property";
-
-        /** class X { constructor() { } } */
-        export const constructorImplementationElement = "constructor";
-
-        /** interface Y { ():number; } */
-        export const callSignatureElement = "call";
-
-        /** interface Y { []:number; } */
-        export const indexSignatureElement = "index";
-
-        /** interface Y { new():Y; } */
-        export const constructSignatureElement = "construct";
-
-        /** function foo(*Y*: string) */
-        export const parameterElement = "parameter";
-
-        export const typeParameterElement = "type parameter";
-
-        export const primitiveType = "primitive type";
-
-        export const label = "label";
-
-        export const alias = "alias";
-
-        export const constElement = "const";
-
-        export const letElement = "let";
-    }
-
-    export namespace ScriptElementKindModifier {
-        export const none = "";
-        export const publicMemberModifier = "public";
-        export const privateMemberModifier = "private";
-        export const protectedMemberModifier = "protected";
-        export const exportedModifier = "export";
-        export const ambientModifier = "declare";
-        export const staticModifier = "static";
-        export const abstractModifier = "abstract";
-    }
-
-    export class ClassificationTypeNames {
-        public static comment = "comment";
-        public static identifier = "identifier";
-        public static keyword = "keyword";
-        public static numericLiteral = "number";
-        public static operator = "operator";
-        public static stringLiteral = "string";
-        public static whiteSpace = "whitespace";
-        public static text = "text";
-
-        public static punctuation = "punctuation";
-
-        public static className = "class name";
-        public static enumName = "enum name";
-        public static interfaceName = "interface name";
-        public static moduleName = "module name";
-        public static typeParameterName = "type parameter name";
-        public static typeAliasName = "type alias name";
-        public static parameterName = "parameter name";
-        public static docCommentTagName = "doc comment tag name";
-        public static jsxOpenTagName = "jsx open tag name";
-        public static jsxCloseTagName = "jsx close tag name";
-        public static jsxSelfClosingTagName = "jsx self closing tag name";
-        public static jsxAttribute = "jsx attribute";
-        public static jsxText = "jsx text";
-        public static jsxAttributeStringLiteralValue = "jsx attribute string literal value";
-    }
-
-    export const enum ClassificationType {
-        comment = 1,
-        identifier = 2,
-        keyword = 3,
-        numericLiteral = 4,
-        operator = 5,
-        stringLiteral = 6,
-        regularExpressionLiteral = 7,
-        whiteSpace = 8,
-        text = 9,
-        punctuation = 10,
-        className = 11,
-        enumName = 12,
-        interfaceName = 13,
-        moduleName = 14,
-        typeParameterName = 15,
-        typeAliasName = 16,
-        parameterName = 17,
-        docCommentTagName = 18,
-        jsxOpenTagName = 19,
-        jsxCloseTagName = 20,
-        jsxSelfClosingTagName = 21,
-        jsxAttribute = 22,
-        jsxText = 23,
-        jsxAttributeStringLiteralValue = 24,
-    }
-
     /// Language Service
 
     // Information about a specific host file.
@@ -1845,6 +1049,11 @@ namespace ts {
         owners: string[];
     }
 
+    interface VisibleModuleInfo {
+        moduleName: string;
+        moduleDir: string;
+    }
+
     export interface DisplayPartsSymbolWriter extends SymbolWriter {
         displayParts(): SymbolDisplayPart[];
     }
@@ -2041,7 +1250,15 @@ namespace ts {
         sourceMapText?: string;
     }
 
+    /**
+     * Matches a triple slash reference directive with an incomplete string literal for its path. Used
+     * to determine if the caret is currently within the string literal and capture the literal fragment
+     * for completions.
+     * For example, this matches /// <reference path="fragment
+     */
+    const tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3]*)$/;
 
+    const nodeModulesDependencyKeys = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
 
     let commandLineOptionsStringToEnum: CommandLineOptionOfCustomType[];
 
@@ -2792,18 +2009,42 @@ namespace ts {
         return node && node.parent && node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).name === node;
     }
 
+    function climbPastPropertyAccess(node: Node) {
+        return isRightSideOfPropertyAccess(node) ? node.parent : node;
+    }
+
+    /** Get `C` given `N` if `N` is in the position `class C extends N` or `class C extends foo.N` where `N` is an identifier. */
+    function tryGetClassByExtendingIdentifier(node: Node): ClassLikeDeclaration | undefined {
+        return tryGetClassExtendingExpressionWithTypeArguments(climbPastPropertyAccess(node).parent);
+    }
+
     function isCallExpressionTarget(node: Node): boolean {
-        if (isRightSideOfPropertyAccess(node)) {
-            node = node.parent;
-        }
-        return node && node.parent && node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
+        return isCallOrNewExpressionTarget(node, SyntaxKind.CallExpression);
     }
 
     function isNewExpressionTarget(node: Node): boolean {
-        if (isRightSideOfPropertyAccess(node)) {
-            node = node.parent;
-        }
-        return node && node.parent && node.parent.kind === SyntaxKind.NewExpression && (<CallExpression>node.parent).expression === node;
+        return isCallOrNewExpressionTarget(node, SyntaxKind.NewExpression);
+    }
+
+    function isCallOrNewExpressionTarget(node: Node, kind: SyntaxKind) {
+        const target = climbPastPropertyAccess(node);
+        return target && target.parent && target.parent.kind === kind && (<CallExpression>target.parent).expression === target;
+    }
+
+    function climbPastManyPropertyAccesses(node: Node): Node {
+        return isRightSideOfPropertyAccess(node) ? climbPastManyPropertyAccesses(node.parent) : node;
+    }
+
+    /** Returns a CallLikeExpression where `node` is the target being invoked. */
+    function getAncestorCallLikeExpression(node: Node): CallLikeExpression | undefined {
+        const target = climbPastManyPropertyAccesses(node);
+        const callLike = target.parent;
+        return callLike && isCallLikeExpression(callLike) && getInvokedExpression(callLike) === target && callLike;
+    }
+
+    function tryGetSignatureDeclaration(typeChecker: TypeChecker, node: Node): SignatureDeclaration | undefined {
+        const callLike = getAncestorCallLikeExpression(node);
+        return callLike && typeChecker.getResolvedSignature(callLike).declaration;
     }
 
     function isNameOfModuleDeclaration(node: Node) {
@@ -2869,13 +2110,17 @@ namespace ts {
 
     function isNameOfExternalModuleImportOrDeclaration(node: Node): boolean {
         if (node.kind === SyntaxKind.StringLiteral) {
-            return isNameOfModuleDeclaration(node) ||
-                (isExternalModuleImportEqualsDeclaration(node.parent.parent) && getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
+            return isNameOfModuleDeclaration(node) || isExpressionOfExternalModuleImportEqualsDeclaration(node);
         }
 
         return false;
     }
 
+    function isExpressionOfExternalModuleImportEqualsDeclaration(node: Node) {
+        return isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
+            getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node;
+    }
+
     /** Returns true if the position is within a comment */
     function isInsideComment(sourceFile: SourceFile, token: Node, position: number): boolean {
         // The position has to be: 1. in the leading trivia (before token.getStart()), and 2. within a comment
@@ -2990,7 +2235,7 @@ namespace ts {
             case SyntaxKind.Constructor: return ScriptElementKind.constructorImplementationElement;
             case SyntaxKind.TypeParameter: return ScriptElementKind.typeParameterElement;
             case SyntaxKind.EnumMember: return ScriptElementKind.enumMemberElement;
-            case SyntaxKind.Parameter: return (node.flags & NodeFlags.ParameterPropertyModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case SyntaxKind.Parameter: return hasModifier(node, ModifierFlags.ParameterPropertyModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
             case SyntaxKind.ImportEqualsDeclaration:
             case SyntaxKind.ImportSpecifier:
             case SyntaxKind.ImportClause:
@@ -3359,7 +2604,7 @@ namespace ts {
             // e.g "b a" is valid quoted name but when we strip off the quotes, it is invalid.
             // We, thus, need to check if whatever was inside the quotes is actually a valid identifier name.
             if (performCharacterChecks) {
-                if (!isIdentifier(name, target)) {
+                if (!isIdentifierText(name, target)) {
                     return undefined;
                 }
             }
@@ -4208,6 +3453,10 @@ namespace ts {
 
             const sourceFile = getValidSourceFile(fileName);
 
+            if (isInReferenceComment(sourceFile, position)) {
+                return getTripleSlashReferenceCompletion(sourceFile, position);
+            }
+
             if (isInString(sourceFile, position)) {
                 return getStringLiteralCompletionEntries(sourceFile, position);
             }
@@ -4377,6 +3626,13 @@ namespace ts {
                     // a['/*completion position*/']
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
+                else if (node.parent.kind === SyntaxKind.ImportDeclaration || isExpressionOfExternalModuleImportEqualsDeclaration(node) || isRequireCall(node.parent, false)) {
+                    // Get all known external module names or complete a path to a module
+                    // i.e. import * as ns from "/*completion position*/";
+                    //      import x = require("/*completion position*/");
+                    //      var y = require("/*completion position*/");
+                    return getStringLiteralCompletionEntriesFromModuleNames(<StringLiteral>node);
+                }
                 else {
                     const argumentInfo = SignatureHelp.getContainingArgumentInfo(node, position, sourceFile);
                     if (argumentInfo) {
@@ -4469,6 +3725,446 @@ namespace ts {
                     }
                 }
             }
+
+            function getStringLiteralCompletionEntriesFromModuleNames(node: StringLiteral): CompletionInfo {
+                const literalValue = normalizeSlashes(node.text);
+
+                const scriptPath = node.getSourceFile().path;
+                const scriptDirectory = getDirectoryPath(scriptPath);
+
+                const span = getDirectoryFragmentTextSpan((<StringLiteral>node).text, node.getStart() + 1);
+                let entries: CompletionEntry[];
+                if (isPathRelativeToScript(literalValue) || isRootedDiskPath(literalValue)) {
+                    const compilerOptions = program.getCompilerOptions();
+                    if (compilerOptions.rootDirs) {
+                        entries = getCompletionEntriesForDirectoryFragmentWithRootDirs(
+                            compilerOptions.rootDirs, literalValue, scriptDirectory, getSupportedExtensions(program.getCompilerOptions()), /*includeExtensions*/false, span, scriptPath);
+                    }
+                    else {
+                        entries = getCompletionEntriesForDirectoryFragment(
+                            literalValue, scriptDirectory, getSupportedExtensions(program.getCompilerOptions()), /*includeExtensions*/false, span, scriptPath);
+                    }
+                }
+                else {
+                    // Check for node modules
+                    entries = getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, span);
+                }
+                return {
+                    isMemberCompletion: false,
+                    isNewIdentifierLocation: true,
+                    entries
+                };
+            }
+
+            /**
+             * Takes a script path and returns paths for all potential folders that could be merged with its
+             * containing folder via the "rootDirs" compiler option
+             */
+            function getBaseDirectoriesFromRootDirs(rootDirs: string[], basePath: string, scriptPath: string, ignoreCase: boolean): string[] {
+                // Make all paths absolute/normalized if they are not already
+                rootDirs = map(rootDirs, rootDirectory => normalizePath(isRootedDiskPath(rootDirectory) ? rootDirectory : combinePaths(basePath, rootDirectory)));
+
+                // Determine the path to the directory containing the script relative to the root directory it is contained within
+                let relativeDirectory: string;
+                for (const rootDirectory of rootDirs) {
+                    if (containsPath(rootDirectory, scriptPath, basePath, ignoreCase)) {
+                        relativeDirectory = scriptPath.substr(rootDirectory.length);
+                        break;
+                    }
+                }
+
+                // Now find a path for each potential directory that is to be merged with the one containing the script
+                return deduplicate(map(rootDirs, rootDirectory => combinePaths(rootDirectory, relativeDirectory)));
+            }
+
+            function getCompletionEntriesForDirectoryFragmentWithRootDirs(rootDirs: string[], fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string): CompletionEntry[] {
+                const basePath = program.getCompilerOptions().project || host.getCurrentDirectory();
+                const ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                const baseDirectories = getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptPath, ignoreCase);
+
+                const result: CompletionEntry[] = [];
+
+                for (const baseDirectory of baseDirectories) {
+                    getCompletionEntriesForDirectoryFragment(fragment, baseDirectory, extensions, includeExtensions, span, exclude, result);
+                }
+
+                return result;
+            }
+
+            function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
+                fragment = getDirectoryPath(fragment);
+                if (!fragment) {
+                    fragment = "./";
+                }
+                else {
+                    fragment = ensureTrailingDirectorySeparator(fragment);
+                }
+
+                const absolutePath = normalizeAndPreserveTrailingSlash(isRootedDiskPath(fragment) ? fragment : combinePaths(scriptPath, fragment));
+                const baseDirectory = getDirectoryPath(absolutePath);
+                const ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+
+                if (directoryProbablyExists(baseDirectory, host)) {
+                    if (host.readDirectory) {
+                        // Enumerate the available files if possible
+                        const files = host.readDirectory(baseDirectory, extensions, /*exclude*/undefined, /*include*/["./*"]);
+                        const foundFiles = createMap<boolean>();
+                        for (let filePath of files) {
+                            filePath = normalizePath(filePath);
+                            if (exclude && comparePaths(filePath, exclude, scriptPath, ignoreCase) === Comparison.EqualTo) {
+                                continue;
+                            }
+
+                            const foundFileName = includeExtensions ? getBaseFileName(filePath) : removeFileExtension(getBaseFileName(filePath));
+
+                            if (!foundFiles[foundFileName]) {
+                                foundFiles[foundFileName] = true;
+                            }
+                        }
+
+                        for (const foundFile in foundFiles) {
+                            result.push(createCompletionEntryForModule(foundFile, ScriptElementKind.scriptElement, span));
+                        }
+                    }
+
+                    // If possible, get folder completion as well
+                    if (host.getDirectories) {
+                        const directories = host.getDirectories(baseDirectory);
+                        for (const directory of directories) {
+                            const directoryName = getBaseFileName(normalizePath(directory));
+
+                            result.push(createCompletionEntryForModule(directoryName, ScriptElementKind.directory, span));
+                        }
+                    }
+                }
+
+                return result;
+            }
+
+            /**
+             * Check all of the declared modules and those in node modules. Possible sources of modules:
+             *      Modules that are found by the type checker
+             *      Modules found relative to "baseUrl" compliler options (including patterns from "paths" compiler option)
+             *      Modules from node_modules (i.e. those listed in package.json)
+             *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
+             */
+            function getCompletionEntriesForNonRelativeModules(fragment: string, scriptPath: string, span: TextSpan): CompletionEntry[] {
+                const options = program.getCompilerOptions();
+                const { baseUrl, paths } = options;
+
+                let result: CompletionEntry[];
+
+                if (baseUrl) {
+                    const fileExtensions = getSupportedExtensions(options);
+                    const projectDir = options.project || host.getCurrentDirectory();
+                    const absolute = isRootedDiskPath(baseUrl) ? baseUrl : combinePaths(projectDir, baseUrl);
+                    result = getCompletionEntriesForDirectoryFragment(fragment, normalizePath(absolute), fileExtensions, /*includeExtensions*/false, span);
+
+                    if (paths) {
+                        for (const path in paths) {
+                            if (paths.hasOwnProperty(path)) {
+                                if (path === "*") {
+                                    if (paths[path]) {
+                                        for (const pattern of paths[path]) {
+                                            for (const match of getModulesForPathsPattern(fragment, baseUrl, pattern, fileExtensions)) {
+                                                result.push(createCompletionEntryForModule(match, ScriptElementKind.externalModuleName, span));
+                                            }
+                                        }
+                                    }
+                                }
+                                else if (startsWith(path, fragment)) {
+                                    const entry = paths[path] && paths[path].length === 1 && paths[path][0];
+                                    if (entry) {
+                                        result.push(createCompletionEntryForModule(path, ScriptElementKind.externalModuleName, span));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    result = [];
+                }
+
+                getCompletionEntriesFromTypings(host, options, scriptPath, span, result);
+
+                for (const moduleName of enumeratePotentialNonRelativeModules(fragment, scriptPath, options)) {
+                    result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
+                }
+
+                return result;
+            }
+
+            function getModulesForPathsPattern(fragment: string, baseUrl: string, pattern: string, fileExtensions: string[]): string[] {
+                if (host.readDirectory) {
+                    const parsed = hasZeroOrOneAsteriskCharacter(pattern) ? tryParsePattern(pattern) : undefined;
+                    if (parsed) {
+                        // The prefix has two effective parts: the directory path and the base component after the filepath that is not a
+                        // full directory component. For example: directory/path/of/prefix/base*
+                        const normalizedPrefix = normalizeAndPreserveTrailingSlash(parsed.prefix);
+                        const normalizedPrefixDirectory = getDirectoryPath(normalizedPrefix);
+                        const normalizedPrefixBase = getBaseFileName(normalizedPrefix);
+
+                        const fragmentHasPath = fragment.indexOf(directorySeparator) !== -1;
+
+                        // Try and expand the prefix to include any path from the fragment so that we can limit the readDirectory call
+                        const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + getDirectoryPath(fragment)) : normalizedPrefixDirectory;
+
+                        const normalizedSuffix = normalizePath(parsed.suffix);
+                        const baseDirectory = combinePaths(baseUrl, expandedPrefixDirectory);
+                        const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
+
+                        // If we have a suffix, then we need to read the directory all the way down. We could create a glob
+                        // that encodes the suffix, but we would have to escape the character "?" which readDirectory
+                        // doesn't support. For now, this is safer but slower
+                        const includeGlob = normalizedSuffix ? "**/*" : "./*";
+
+                        const matches = host.readDirectory(baseDirectory, fileExtensions, undefined, [includeGlob]);
+                        const result: string[] = [];
+
+                        // Trim away prefix and suffix
+                        for (const match of matches) {
+                            const normalizedMatch = normalizePath(match);
+                            if (!endsWith(normalizedMatch, normalizedSuffix) || !startsWith(normalizedMatch, completePrefix)) {
+                                continue;
+                            }
+
+                            const start = completePrefix.length;
+                            const length = normalizedMatch.length - start - normalizedSuffix.length;
+
+                            result.push(removeFileExtension(normalizedMatch.substr(start, length)));
+                        }
+                        return result;
+                    }
+                }
+
+                return undefined;
+            }
+
+            function enumeratePotentialNonRelativeModules(fragment: string, scriptPath: string, options: CompilerOptions): string[] {
+                // Check If this is a nested module
+                const isNestedModule = fragment.indexOf(directorySeparator) !== -1;
+                const moduleNameFragment = isNestedModule ? fragment.substr(0, fragment.lastIndexOf(directorySeparator)) : undefined;
+
+                // Get modules that the type checker picked up
+                const ambientModules = map(program.getTypeChecker().getAmbientModules(), sym => stripQuotes(sym.name));
+                let nonRelativeModules = filter(ambientModules, moduleName => startsWith(moduleName, fragment));
+
+                // Nested modules of the form "module-name/sub" need to be adjusted to only return the string
+                // after the last '/' that appears in the fragment because that's where the replacement span
+                // starts
+                if (isNestedModule) {
+                    const moduleNameWithSeperator = ensureTrailingDirectorySeparator(moduleNameFragment);
+                    nonRelativeModules = map(nonRelativeModules, moduleName => {
+                        if (startsWith(fragment, moduleNameWithSeperator)) {
+                            return moduleName.substr(moduleNameWithSeperator.length);
+                        }
+                        return moduleName;
+                    });
+                }
+
+
+                if (!options.moduleResolution || options.moduleResolution === ModuleResolutionKind.NodeJs) {
+                    for (const visibleModule of enumerateNodeModulesVisibleToScript(host, scriptPath)) {
+                        if (!isNestedModule) {
+                            nonRelativeModules.push(visibleModule.moduleName);
+                        }
+                        else if (host.readDirectory && startsWith(visibleModule.moduleName, moduleNameFragment)) {
+                            const nestedFiles = host.readDirectory(visibleModule.moduleDir, supportedTypeScriptExtensions, /*exclude*/undefined, /*include*/["./*"]);
+
+                            for (let f of nestedFiles) {
+                                f = normalizePath(f);
+                                const nestedModule = removeFileExtension(getBaseFileName(f));
+                                nonRelativeModules.push(nestedModule);
+                            }
+                        }
+                    }
+                }
+
+                return deduplicate(nonRelativeModules);
+            }
+
+            function getTripleSlashReferenceCompletion(sourceFile: SourceFile, position: number): CompletionInfo {
+                const token = getTokenAtPosition(sourceFile, position);
+                if (!token) {
+                    return undefined;
+                }
+                const commentRanges: CommentRange[] = getLeadingCommentRanges(sourceFile.text, token.pos);
+
+                if (!commentRanges || !commentRanges.length) {
+                    return undefined;
+                }
+
+                const range = forEach(commentRanges, commentRange => position >= commentRange.pos && position <= commentRange.end && commentRange);
+
+                if (!range) {
+                    return undefined;
+                }
+
+                const text = sourceFile.text.substr(range.pos, position - range.pos);
+
+                const match = tripleSlashDirectiveFragmentRegex.exec(text);
+                if (match) {
+                    const prefix = match[1];
+                    const kind = match[2];
+                    const toComplete = match[3];
+
+                    const scriptPath = getDirectoryPath(sourceFile.path);
+                    let entries: CompletionEntry[];
+                    if (kind === "path") {
+                        // Give completions for a relative path
+                        const span: TextSpan = getDirectoryFragmentTextSpan(toComplete, range.pos + prefix.length);
+                        entries = getCompletionEntriesForDirectoryFragment(toComplete, scriptPath, getSupportedExtensions(program.getCompilerOptions()), /*includeExtensions*/true, span, sourceFile.path);
+                    }
+                    else {
+                        // Give completions based on the typings available
+                        const span: TextSpan = { start: range.pos + prefix.length, length: match[0].length - prefix.length };
+                        entries = getCompletionEntriesFromTypings(host, program.getCompilerOptions(), scriptPath, span);
+                    }
+
+                    return {
+                        isMemberCompletion: false,
+                        isNewIdentifierLocation: true,
+                        entries
+                    };
+                }
+
+                return undefined;
+            }
+
+            function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, span: TextSpan, result: CompletionEntry[] = []): CompletionEntry[] {
+                // Check for typings specified in compiler options
+                if (options.types) {
+                    for (const moduleName of options.types) {
+                        result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
+                    }
+                }
+                else if (host.getDirectories) {
+                    const typeRoots = getEffectiveTypeRoots(options, host);
+                    for (const root of typeRoots) {
+                        getCompletionEntriesFromDirectories(host, options, root, span, result);
+                    }
+                }
+
+                if (host.getDirectories) {
+                    // Also get all @types typings installed in visible node_modules directories
+                    for (const package of findPackageJsons(scriptPath)) {
+                        const typesDir = combinePaths(getDirectoryPath(package), "node_modules/@types");
+                        getCompletionEntriesFromDirectories(host, options, typesDir, span, result);
+                    }
+                }
+
+                return result;
+            }
+
+            function getCompletionEntriesFromDirectories(host: LanguageServiceHost, options: CompilerOptions, directory: string, span: TextSpan, result: CompletionEntry[]) {
+                if (host.getDirectories && directoryProbablyExists(directory, host)) {
+                    for (let typeDirectory of host.getDirectories(directory)) {
+                        typeDirectory = normalizePath(typeDirectory);
+                        result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));
+                    }
+                }
+            }
+
+            function findPackageJsons(currentDir: string): string[] {
+                const paths: string[] = [];
+                let currentConfigPath: string;
+                while (true) {
+                    currentConfigPath = findConfigFile(currentDir, (f) => host.fileExists(f), "package.json");
+                    if (currentConfigPath) {
+                        paths.push(currentConfigPath);
+
+                        currentDir = getDirectoryPath(currentConfigPath);
+                        const parent = getDirectoryPath(currentDir);
+                        if (currentDir === parent) {
+                            break;
+                        }
+                        currentDir = parent;
+                    }
+                    else {
+                        break;
+                    }
+                }
+
+                return paths;
+            }
+
+
+            function enumerateNodeModulesVisibleToScript(host: LanguageServiceHost, scriptPath: string) {
+                const result: VisibleModuleInfo[] = [];
+
+                if (host.readFile && host.fileExists) {
+                    for (const packageJson of findPackageJsons(scriptPath)) {
+                        const package = tryReadingPackageJson(packageJson);
+                        if (!package) {
+                            return;
+                        }
+
+                        const nodeModulesDir = combinePaths(getDirectoryPath(packageJson), "node_modules");
+                        const foundModuleNames: string[] = [];
+
+                        // Provide completions for all non @types dependencies
+                        for (const key of nodeModulesDependencyKeys) {
+                            addPotentialPackageNames(package[key], foundModuleNames);
+                        }
+
+                        for (const moduleName of foundModuleNames) {
+                            const moduleDir = combinePaths(nodeModulesDir, moduleName);
+                            result.push({
+                                moduleName,
+                                moduleDir
+                            });
+                        }
+                    }
+                }
+
+                return result;
+
+                function tryReadingPackageJson(filePath: string) {
+                    try {
+                        const fileText = host.readFile(filePath);
+                        return JSON.parse(fileText);
+                    }
+                    catch (e) {
+                        return undefined;
+                    }
+                }
+
+                function addPotentialPackageNames(dependencies: any, result: string[]) {
+                    if (dependencies) {
+                        for (const dep in dependencies) {
+                            if (dependencies.hasOwnProperty(dep) && !startsWith(dep, "@types/")) {
+                                result.push(dep);
+                            }
+                        }
+                    }
+                }
+            }
+
+            function createCompletionEntryForModule(name: string, kind: string, replacementSpan: TextSpan): CompletionEntry {
+                return { name, kind, kindModifiers: ScriptElementKindModifier.none, sortText: name, replacementSpan };
+            }
+
+            // Replace everything after the last directory seperator that appears
+            function getDirectoryFragmentTextSpan(text: string, textStart: number): TextSpan {
+                const index = text.lastIndexOf(directorySeparator);
+                const offset = index !== -1 ? index + 1 : 0;
+                return { start: textStart + offset, length: text.length - offset };
+            }
+
+            // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
+            function isPathRelativeToScript(path: string) {
+                if (path && path.length >= 2 && path.charCodeAt(0) === CharacterCodes.dot) {
+                    const slashIndex = path.length >= 3 && path.charCodeAt(1) === CharacterCodes.dot ? 2 : 1;
+                    const slashCharCode = path.charCodeAt(slashIndex);
+                    return slashCharCode === CharacterCodes.slash || slashCharCode === CharacterCodes.backslash;
+                }
+                return false;
+            }
+
+            function normalizeAndPreserveTrailingSlash(path: string) {
+                return hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(normalizePath(path)) : normalizePath(path);
+            }
         }
 
         function getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails {
@@ -4609,7 +4305,7 @@ namespace ts {
             const symbolFlags = symbol.flags;
             let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location);
             let hasAddedSymbolInfo: boolean;
-            const isThisExpression: boolean = location.kind === SyntaxKind.ThisKeyword && isExpression(location);
+            const isThisExpression = location.kind === SyntaxKind.ThisKeyword && isExpression(location);
             let type: Type;
 
             // Class at constructor site need to be shown as constructor apart from property,method, vars
@@ -5072,14 +4768,25 @@ namespace ts {
             };
         }
 
+        function getSymbolInfo(typeChecker: TypeChecker, symbol: Symbol, node: Node) {
+            return {
+                symbolName: typeChecker.symbolToString(symbol), // Do not get scoped name, just the name of the symbol
+                symbolKind: getSymbolKind(symbol, node),
+                containerName: symbol.parent ? typeChecker.symbolToString(symbol.parent, node) : ""
+            };
+        }
+
+        function createDefinitionFromSignatureDeclaration(decl: SignatureDeclaration): DefinitionInfo {
+            const typeChecker = program.getTypeChecker();
+            const { symbolName, symbolKind, containerName } = getSymbolInfo(typeChecker, decl.symbol, decl);
+            return createDefinitionInfo(decl, symbolKind, symbolName, containerName);
+        }
+
         function getDefinitionFromSymbol(symbol: Symbol, node: Node): DefinitionInfo[] {
             const typeChecker = program.getTypeChecker();
             const result: DefinitionInfo[] = [];
             const declarations = symbol.getDeclarations();
-            const symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
-            const symbolKind = getSymbolKind(symbol, node);
-            const containerSymbol = symbol.parent;
-            const containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : "";
+            const { symbolName, symbolKind, containerName } = getSymbolInfo(typeChecker, symbol, node);
 
             if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
                 !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
@@ -5205,6 +4912,12 @@ namespace ts {
             }
 
             const typeChecker = program.getTypeChecker();
+
+            const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
+            if (calledDeclaration) {
+                return [createDefinitionFromSignatureDeclaration(calledDeclaration)];
+            }
+
             let symbol = typeChecker.getSymbolAtLocation(node);
 
             // Could not find a symbol e.g. node is string or number keyword,
@@ -5628,14 +5341,14 @@ namespace ts {
                     }
 
                     const keywords: Node[] = [];
-                    const modifierFlag: NodeFlags = getFlagFromModifier(modifier);
+                    const modifierFlag: ModifierFlags = getFlagFromModifier(modifier);
 
                     let nodes: Node[];
                     switch (container.kind) {
                         case SyntaxKind.ModuleBlock:
                         case SyntaxKind.SourceFile:
                             // Container is either a class declaration or the declaration is a classDeclaration
-                            if (modifierFlag & NodeFlags.Abstract) {
+                            if (modifierFlag & ModifierFlags.Abstract) {
                                 nodes = (<Node[]>(<ClassDeclaration>declaration).members).concat(declaration);
                             }
                             else {
@@ -5652,7 +5365,7 @@ namespace ts {
 
                             // If we're an accessibility modifier, we're in an instance member and should search
                             // the constructor's parameter list for instance members as well.
-                            if (modifierFlag & NodeFlags.AccessibilityModifier) {
+                            if (modifierFlag & ModifierFlags.AccessibilityModifier) {
                                 const constructor = forEach((<ClassLikeDeclaration>container).members, member => {
                                     return member.kind === SyntaxKind.Constructor && <ConstructorDeclaration>member;
                                 });
@@ -5661,7 +5374,7 @@ namespace ts {
                                     nodes = nodes.concat(constructor.parameters);
                                 }
                             }
-                            else if (modifierFlag & NodeFlags.Abstract) {
+                            else if (modifierFlag & ModifierFlags.Abstract) {
                                 nodes = nodes.concat(container);
                             }
                             break;
@@ -5670,7 +5383,7 @@ namespace ts {
                     }
 
                     forEach(nodes, node => {
-                        if (node.modifiers && node.flags & modifierFlag) {
+                        if (getModifierFlags(node) & modifierFlag) {
                             forEach(node.modifiers, child => pushKeywordIf(keywords, child, modifier));
                         }
                     });
@@ -5680,19 +5393,19 @@ namespace ts {
                     function getFlagFromModifier(modifier: SyntaxKind) {
                         switch (modifier) {
                             case SyntaxKind.PublicKeyword:
-                                return NodeFlags.Public;
+                                return ModifierFlags.Public;
                             case SyntaxKind.PrivateKeyword:
-                                return NodeFlags.Private;
+                                return ModifierFlags.Private;
                             case SyntaxKind.ProtectedKeyword:
-                                return NodeFlags.Protected;
+                                return ModifierFlags.Protected;
                             case SyntaxKind.StaticKeyword:
-                                return NodeFlags.Static;
+                                return ModifierFlags.Static;
                             case SyntaxKind.ExportKeyword:
-                                return NodeFlags.Export;
+                                return ModifierFlags.Export;
                             case SyntaxKind.DeclareKeyword:
-                                return NodeFlags.Ambient;
+                                return ModifierFlags.Ambient;
                             case SyntaxKind.AbstractKeyword:
-                                return NodeFlags.Abstract;
+                                return ModifierFlags.Abstract;
                             default:
                                 Debug.fail();
                         }
@@ -6012,6 +5725,7 @@ namespace ts {
                 case SyntaxKind.Identifier:
                 case SyntaxKind.ThisKeyword:
                 // case SyntaxKind.SuperKeyword: TODO:GH#9268
+                case SyntaxKind.ConstructorKeyword:
                 case SyntaxKind.StringLiteral:
                     return getReferencedSymbolsForNode(node, program.getSourceFiles(), findInStrings, findInComments);
             }
@@ -6056,6 +5770,8 @@ namespace ts {
                 return getReferencesForSuperKeyword(node);
             }
 
+            // `getSymbolAtLocation` normally returns the symbol of the class when given the constructor keyword,
+            // so we have to specify that we want the constructor symbol.
             const symbol = typeChecker.getSymbolAtLocation(node);
 
             if (!symbol && node.kind === SyntaxKind.StringLiteral) {
@@ -6130,7 +5846,7 @@ namespace ts {
                 };
             }
 
-            function getAliasSymbolForPropertyNameSymbol(symbol: Symbol, location: Node): Symbol {
+            function getAliasSymbolForPropertyNameSymbol(symbol: Symbol, location: Node): Symbol | undefined {
                 if (symbol.flags & SymbolFlags.Alias) {
                     // Default import get alias
                     const defaultImport = getDeclarationOfKind(symbol, SyntaxKind.ImportClause);
@@ -6156,6 +5872,10 @@ namespace ts {
                 return undefined;
             }
 
+            function followAliasIfNecessary(symbol: Symbol, location: Node): Symbol {
+                return getAliasSymbolForPropertyNameSymbol(symbol, location) || symbol;
+            }
+
             function getPropertySymbolOfDestructuringAssignment(location: Node) {
                 return isArrayLiteralOrObjectLiteralDestructuringPattern(location.parent.parent) &&
                     typeChecker.getPropertySymbolOfDestructuringAssignment(<Identifier>location);
@@ -6210,7 +5930,7 @@ namespace ts {
 
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) {
-                    const privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined);
+                    const privateDeclaration = forEach(symbol.getDeclarations(), d => (getModifierFlags(d) & ModifierFlags.Private) ? d : undefined);
                     if (privateDeclaration) {
                         return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration);
                     }
@@ -6375,7 +6095,6 @@ namespace ts {
                 symbolToIndex: number[]): void {
 
                 const sourceFile = container.getSourceFile();
-                const tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</;
 
                 const start = findInComments ? container.getFullStart() : container.getStart();
                 const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, start, container.getEnd());
@@ -6420,7 +6139,8 @@ namespace ts {
                         if (referenceSymbol) {
                             const referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
                             const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                            const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation);
+                            const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation,
+                                /*searchLocationIsConstructor*/ searchLocation.kind === SyntaxKind.ConstructorKeyword);
 
                             if (relatedSymbol) {
                                 const referencedSymbol = getReferencedSymbol(relatedSymbol);
@@ -6436,12 +6156,94 @@ namespace ts {
                                 const referencedSymbol = getReferencedSymbol(shorthandValueSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name));
                             }
+                            else if (searchLocation.kind === SyntaxKind.ConstructorKeyword) {
+                                findAdditionalConstructorReferences(referenceSymbol, referenceLocation);
+                            }
                         }
                     });
                 }
 
                 return;
 
+                /** Adds references when a constructor is used with `new this()` in its own class and `super()` calls in subclasses.  */
+                function findAdditionalConstructorReferences(referenceSymbol: Symbol, referenceLocation: Node): void {
+                    Debug.assert(isClassLike(searchSymbol.valueDeclaration));
+
+                    const referenceClass = referenceLocation.parent;
+                    if (referenceSymbol === searchSymbol && isClassLike(referenceClass)) {
+                        Debug.assert(referenceClass.name === referenceLocation);
+                        // This is the class declaration containing the constructor.
+                        addReferences(findOwnConstructorCalls(searchSymbol));
+                    }
+                    else {
+                        // If this class appears in `extends C`, then the extending class' "super" calls are references.
+                        const classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
+                        if (classExtending && isClassLike(classExtending) && followAliasIfNecessary(referenceSymbol, referenceLocation) === searchSymbol) {
+                            addReferences(superConstructorAccesses(classExtending));
+                        }
+                    }
+                }
+
+                function addReferences(references: Node[]): void {
+                    if (references.length) {
+                        const referencedSymbol = getReferencedSymbol(searchSymbol);
+                        addRange(referencedSymbol.references, map(references, getReferenceEntryFromNode));
+                    }
+                }
+
+                /** `classSymbol` is the class where the constructor was defined.
+                 * Reference the constructor and all calls to `new this()`.
+                 */
+                function findOwnConstructorCalls(classSymbol: Symbol): Node[] {
+                    const result: Node[] = [];
+
+                    for (const decl of classSymbol.members["__constructor"].declarations) {
+                        Debug.assert(decl.kind === SyntaxKind.Constructor);
+                        const ctrKeyword = decl.getChildAt(0);
+                        Debug.assert(ctrKeyword.kind === SyntaxKind.ConstructorKeyword);
+                        result.push(ctrKeyword);
+                    }
+
+                    forEachProperty(classSymbol.exports, member => {
+                        const decl = member.valueDeclaration;
+                        if (decl && decl.kind === SyntaxKind.MethodDeclaration) {
+                            const body = (<MethodDeclaration>decl).body;
+                            if (body) {
+                                forEachDescendantOfKind(body, SyntaxKind.ThisKeyword, thisKeyword => {
+                                    if (isNewExpressionTarget(thisKeyword)) {
+                                        result.push(thisKeyword);
+                                    }
+                                });
+                            }
+                        }
+                    });
+
+                    return result;
+                }
+
+                /** Find references to `super` in the constructor of an extending class.  */
+                function superConstructorAccesses(cls: ClassLikeDeclaration): Node[] {
+                    const symbol = cls.symbol;
+                    const ctr = symbol.members["__constructor"];
+                    if (!ctr) {
+                        return [];
+                    }
+
+                    const result: Node[] = [];
+                    for (const decl of ctr.declarations) {
+                        Debug.assert(decl.kind === SyntaxKind.Constructor);
+                        const body = (<ConstructorDeclaration>decl).body;
+                        if (body) {
+                            forEachDescendantOfKind(body, SyntaxKind.SuperKeyword, node => {
+                                if (isCallExpressionTarget(node)) {
+                                    result.push(node);
+                                }
+                            });
+                        }
+                    };
+                    return result;
+                }
+
                 function getReferencedSymbol(symbol: Symbol): ReferencedSymbol {
                     const symbolId = getSymbolId(symbol);
                     let index = symbolToIndex[symbolId];
@@ -6457,15 +6259,6 @@ namespace ts {
 
                     return result[index];
                 }
-
-                function isInNonReferenceComment(sourceFile: SourceFile, position: number): boolean {
-                    return isInCommentHelper(sourceFile, position, isNonReferenceComment);
-
-                    function isNonReferenceComment(c: CommentRange): boolean {
-                        const commentText = sourceFile.text.substring(c.pos, c.end);
-                        return !tripleSlashDirectivePrefixRegex.test(commentText);
-                    }
-                }
             }
 
             function getReferencesForSuperKeyword(superKeyword: Node): ReferencedSymbol[] {
@@ -6474,7 +6267,7 @@ namespace ts {
                     return undefined;
                 }
                 // Whether 'super' occurs in a static context within a class.
-                let staticFlag = NodeFlags.Static;
+                let staticFlag = ModifierFlags.Static;
 
                 switch (searchSpaceNode.kind) {
                     case SyntaxKind.PropertyDeclaration:
@@ -6484,7 +6277,7 @@ namespace ts {
                     case SyntaxKind.Constructor:
                     case SyntaxKind.GetAccessor:
                     case SyntaxKind.SetAccessor:
-                        staticFlag &= searchSpaceNode.flags;
+                        staticFlag &= getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
                     default:
@@ -6509,7 +6302,7 @@ namespace ts {
                     // If we have a 'super' container, we must have an enclosing class.
                     // Now make sure the owning class is the same as the search-space
                     // and has the same static qualifier as the original 'super's owner.
-                    if (container && (NodeFlags.Static & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (ModifierFlags.Static & getModifierFlags(container)) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -6522,7 +6315,7 @@ namespace ts {
                 let searchSpaceNode = getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
 
                 // Whether 'this' occurs in a static context within a class.
-                let staticFlag = NodeFlags.Static;
+                let staticFlag = ModifierFlags.Static;
 
                 switch (searchSpaceNode.kind) {
                     case SyntaxKind.MethodDeclaration:
@@ -6536,7 +6329,7 @@ namespace ts {
                     case SyntaxKind.Constructor:
                     case SyntaxKind.GetAccessor:
                     case SyntaxKind.SetAccessor:
-                        staticFlag &= searchSpaceNode.flags;
+                        staticFlag &= getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
                     case SyntaxKind.SourceFile:
@@ -6614,7 +6407,7 @@ namespace ts {
                             case SyntaxKind.ClassDeclaration:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
-                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & NodeFlags.Static) === staticFlag) {
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (getModifierFlags(container) & ModifierFlags.Static) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -6822,16 +6615,17 @@ namespace ts {
                 }
             }
 
-            function getRelatedSymbol(searchSymbols: Symbol[], referenceSymbol: Symbol, referenceLocation: Node): Symbol {
-                if (searchSymbols.indexOf(referenceSymbol) >= 0) {
-                    return referenceSymbol;
+            function getRelatedSymbol(searchSymbols: Symbol[], referenceSymbol: Symbol, referenceLocation: Node, searchLocationIsConstructor: boolean): Symbol | undefined {
+                if (contains(searchSymbols, referenceSymbol)) {
+                    // If we are searching for constructor uses, they must be 'new' expressions.
+                    return (!searchLocationIsConstructor || isNewExpressionTarget(referenceLocation)) && referenceSymbol;
                 }
 
                 // If the reference symbol is an alias, check if what it is aliasing is one of the search
                 // symbols but by looking up for related symbol of this alias so it can handle multiple level of indirectness.
                 const aliasSymbol = getAliasSymbolForPropertyNameSymbol(referenceSymbol, referenceLocation);
                 if (aliasSymbol) {
-                    return getRelatedSymbol(searchSymbols, aliasSymbol, referenceLocation);
+                    return getRelatedSymbol(searchSymbols, aliasSymbol, referenceLocation, searchLocationIsConstructor);
                 }
 
                 // If the reference location is in an object literal, try to get the contextual type for the
@@ -7085,7 +6879,7 @@ namespace ts {
 
             return node.parent.kind === SyntaxKind.TypeReference ||
                 (node.parent.kind === SyntaxKind.ExpressionWithTypeArguments && !isExpressionWithTypeArgumentsInClassExtendsClause(<ExpressionWithTypeArguments>node.parent)) ||
-                (node.kind === SyntaxKind.ThisKeyword && !isExpression(node)) ||
+                (node.kind === SyntaxKind.ThisKeyword && !isPartOfExpression(node)) ||
                 node.kind === SyntaxKind.ThisType;
         }
 
@@ -8355,6 +8149,15 @@ namespace ts {
         };
     }
 
+    function forEachDescendantOfKind(node: Node, kind: SyntaxKind, action: (node: Node) => void) {
+        forEachChild(node, child => {
+            if (child.kind === kind) {
+                action(child);
+            }
+            forEachDescendantOfKind(child, kind, action);
+        });
+    }
+
     /* @internal */
     export function getNameTable(sourceFile: SourceFile): Map<number> {
         if (!sourceFile.nameTable) {
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 9a581ed6be1..41b366e0857 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -67,6 +67,10 @@ namespace ts {
         getProjectVersion?(): string;
         useCaseSensitiveFileNames?(): boolean;
 
+        readDirectory(rootDir: string, extension: string, basePaths?: string, excludeEx?: string, includeFileEx?: string, includeDirEx?: string, depth?: number): string;
+        readFile(path: string, encoding?: string): string;
+        fileExists(path: string): boolean;
+
         getModuleResolutionsForFile?(fileName: string): string;
         getTypeReferenceDirectiveResolutionsForFile?(fileName: string): string;
         directoryExists(directoryName: string): boolean;
@@ -421,6 +425,28 @@ namespace ts {
         public getDefaultLibFileName(options: CompilerOptions): string {
             return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
         }
+
+        public readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[], depth?: number): string[] {
+            const pattern = getFileMatcherPatterns(path, extensions, exclude, include,
+                this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
+            return JSON.parse(this.shimHost.readDirectory(
+                path,
+                JSON.stringify(extensions),
+                JSON.stringify(pattern.basePaths),
+                pattern.excludePattern,
+                pattern.includeFilePattern,
+                pattern.includeDirectoryPattern,
+                depth
+            ));
+        }
+
+        public readFile(path: string, encoding?: string): string {
+            return this.shimHost.readFile(path, encoding);
+        }
+
+        public fileExists(path: string): boolean {
+            return this.shimHost.fileExists(path);
+        }
     }
 
     /** A cancellation that throttles calls to the host */
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index cfeb7c2fcd5..e3856dc3251 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -21,6 +21,19 @@
         "../compiler/utilities.ts",
         "../compiler/binder.ts",
         "../compiler/checker.ts",
+        "../compiler/factory.ts",
+        "../compiler/visitor.ts",
+        "../compiler/transformers/ts.ts",
+        "../compiler/transformers/jsx.ts",
+        "../compiler/transformers/es7.ts",
+        "../compiler/transformers/es6.ts",
+        "../compiler/transformers/generators.ts",
+        "../compiler/transformers/destructuring.ts",
+        "../compiler/transformers/module/module.ts",
+        "../compiler/transformers/module/system.ts",
+        "../compiler/transformers/module/es6.ts",
+        "../compiler/transformer.ts",
+        "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
         "../compiler/declarationEmitter.ts",
         "../compiler/emitter.ts",
@@ -35,6 +48,7 @@
         "services.ts",
         "shims.ts",
         "signatureHelp.ts",
+        "types.ts",
         "utilities.ts",
         "jsTyping.ts",
         "formatting/formatting.ts",
diff --git a/src/services/types.ts b/src/services/types.ts
new file mode 100644
index 00000000000..b8c9122fb90
--- /dev/null
+++ b/src/services/types.ts
@@ -0,0 +1,830 @@
+namespace ts {
+    export interface Node {
+        getSourceFile(): SourceFile;
+        getChildCount(sourceFile?: SourceFile): number;
+        getChildAt(index: number, sourceFile?: SourceFile): Node;
+        getChildren(sourceFile?: SourceFile): Node[];
+        getStart(sourceFile?: SourceFile, includeJsDocComment?: boolean): number;
+        getFullStart(): number;
+        getEnd(): number;
+        getWidth(sourceFile?: SourceFile): number;
+        getFullWidth(): number;
+        getLeadingTriviaWidth(sourceFile?: SourceFile): number;
+        getFullText(sourceFile?: SourceFile): string;
+        getText(sourceFile?: SourceFile): string;
+        getFirstToken(sourceFile?: SourceFile): Node;
+        getLastToken(sourceFile?: SourceFile): Node;
+    }
+
+    export interface Symbol {
+        getFlags(): SymbolFlags;
+        getName(): string;
+        getDeclarations(): Declaration[];
+        getDocumentationComment(): SymbolDisplayPart[];
+    }
+
+    export interface Type {
+        getFlags(): TypeFlags;
+        getSymbol(): Symbol;
+        getProperties(): Symbol[];
+        getProperty(propertyName: string): Symbol;
+        getApparentProperties(): Symbol[];
+        getCallSignatures(): Signature[];
+        getConstructSignatures(): Signature[];
+        getStringIndexType(): Type;
+        getNumberIndexType(): Type;
+        getBaseTypes(): ObjectType[];
+        getNonNullableType(): Type;
+    }
+
+    export interface Signature {
+        getDeclaration(): SignatureDeclaration;
+        getTypeParameters(): Type[];
+        getParameters(): Symbol[];
+        getReturnType(): Type;
+        getDocumentationComment(): SymbolDisplayPart[];
+    }
+
+    export interface SourceFile {
+        /* @internal */ version: string;
+        /* @internal */ scriptSnapshot: IScriptSnapshot;
+        /* @internal */ nameTable: Map<number>;
+
+        /* @internal */ getNamedDeclarations(): Map<Declaration[]>;
+
+        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
+        getLineStarts(): number[];
+        getPositionOfLineAndCharacter(line: number, character: number): number;
+        update(newText: string, textChangeRange: TextChangeRange): SourceFile;
+    }
+
+    /**
+     * Represents an immutable snapshot of a script at a specified time.Once acquired, the
+     * snapshot is observably immutable. i.e. the same calls with the same parameters will return
+     * the same values.
+     */
+    export interface IScriptSnapshot {
+        /** Gets a portion of the script snapshot specified by [start, end). */
+        getText(start: number, end: number): string;
+
+        /** Gets the length of this script snapshot. */
+        getLength(): number;
+
+        /**
+         * Gets the TextChangeRange that describe how the text changed between this text and
+         * an older version.  This information is used by the incremental parser to determine
+         * what sections of the script need to be re-parsed.  'undefined' can be returned if the
+         * change range cannot be determined.  However, in that case, incremental parsing will
+         * not happen and the entire document will be re - parsed.
+         */
+        getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange | undefined;
+
+        /** Releases all resources held by this script snapshot */
+        dispose?(): void;
+    }
+
+    export namespace ScriptSnapshot {
+        class StringScriptSnapshot implements IScriptSnapshot {
+
+            constructor(private text: string) {
+            }
+
+            public getText(start: number, end: number): string {
+                return this.text.substring(start, end);
+            }
+
+            public getLength(): number {
+                return this.text.length;
+            }
+
+            public getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange {
+                // Text-based snapshots do not support incremental parsing. Return undefined
+                // to signal that to the caller.
+                return undefined;
+            }
+        }
+
+        export function fromString(text: string): IScriptSnapshot {
+            return new StringScriptSnapshot(text);
+        }
+    }
+    export interface PreProcessedFileInfo {
+        referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
+        importedFiles: FileReference[];
+        ambientExternalModules: string[];
+        isLibFile: boolean;
+    }
+
+    export interface HostCancellationToken {
+        isCancellationRequested(): boolean;
+    }
+
+    //
+    // Public interface of the host of a language service instance.
+    //
+    export interface LanguageServiceHost {
+        getCompilationSettings(): CompilerOptions;
+        getNewLine?(): string;
+        getProjectVersion?(): string;
+        getScriptFileNames(): string[];
+        getScriptKind?(fileName: string): ScriptKind;
+        getScriptVersion(fileName: string): string;
+        getScriptSnapshot(fileName: string): IScriptSnapshot | undefined;
+        getLocalizedDiagnosticMessages?(): any;
+        getCancellationToken?(): HostCancellationToken;
+        getCurrentDirectory(): string;
+        getDefaultLibFileName(options: CompilerOptions): string;
+        log?(s: string): void;
+        trace?(s: string): void;
+        error?(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
+
+        /*
+         * LS host can optionally implement these methods to support completions for module specifiers.
+         * Without these methods, only completions for ambient modules will be provided.
+         */
+        readDirectory?(path: string, extensions?: string[], exclude?: string[], include?: string[]): string[];
+        readFile?(path: string, encoding?: string): string;
+        fileExists?(path: string): boolean;
+
+        /*
+         * LS host can optionally implement this method if it wants to be completely in charge of module name resolution.
+         * if implementation is omitted then language service will use built-in module resolution logic and get answers to
+         * host specific questions using 'getScriptSnapshot'.
+         */
+        resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
+        directoryExists?(directoryName: string): boolean;
+
+        /*
+         * getDirectories is also required for full import and type reference completions. Without it defined, certain
+         * completions will not be provided
+         */
+        getDirectories?(directoryName: string): string[];
+    }
+
+    //
+    // Public services of a language service instance associated
+    // with a language service host instance
+    //
+    export interface LanguageService {
+        cleanupSemanticCache(): void;
+
+        getSyntacticDiagnostics(fileName: string): Diagnostic[];
+        getSemanticDiagnostics(fileName: string): Diagnostic[];
+
+        // TODO: Rename this to getProgramDiagnostics to better indicate that these are any
+        // diagnostics present for the program level, and not just 'options' diagnostics.
+        getCompilerOptionsDiagnostics(): Diagnostic[];
+
+        /**
+         * @deprecated Use getEncodedSyntacticClassifications instead.
+         */
+        getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
+
+        /**
+         * @deprecated Use getEncodedSemanticClassifications instead.
+         */
+        getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
+
+        // Encoded as triples of [start, length, ClassificationType].
+        getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications;
+        getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications;
+
+        getCompletionsAtPosition(fileName: string, position: number): CompletionInfo;
+        getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails;
+
+        getQuickInfoAtPosition(fileName: string, position: number): QuickInfo;
+
+        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan;
+
+        getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan;
+
+        getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems;
+
+        getRenameInfo(fileName: string, position: number): RenameInfo;
+        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];
+
+        getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
+        getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
+
+        getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
+        getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[];
+
+        /** @deprecated */
+        getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
+
+        getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
+        getNavigationBarItems(fileName: string): NavigationBarItem[];
+
+        getOutliningSpans(fileName: string): OutliningSpan[];
+        getTodoComments(fileName: string, descriptors: TodoCommentDescriptor[]): TodoComment[];
+        getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[];
+        getIndentationAtPosition(fileName: string, position: number, options: EditorOptions): number;
+
+        getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[];
+        getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[];
+        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[];
+
+        getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
+
+        isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
+
+        getEmitOutput(fileName: string): EmitOutput;
+
+        getProgram(): Program;
+
+        /* @internal */ getNonBoundSourceFile(fileName: string): SourceFile;
+
+        dispose(): void;
+    }
+
+    export interface Classifications {
+        spans: number[];
+        endOfLineState: EndOfLineState;
+    }
+
+    export interface ClassifiedSpan {
+        textSpan: TextSpan;
+        classificationType: string; // ClassificationTypeNames
+    }
+
+    export interface NavigationBarItem {
+        text: string;
+        kind: string;
+        kindModifiers: string;
+        spans: TextSpan[];
+        childItems: NavigationBarItem[];
+        indent: number;
+        bolded: boolean;
+        grayed: boolean;
+    }
+
+    export interface TodoCommentDescriptor {
+        text: string;
+        priority: number;
+    }
+
+    export interface TodoComment {
+        descriptor: TodoCommentDescriptor;
+        message: string;
+        position: number;
+    }
+
+    export class TextChange {
+        span: TextSpan;
+        newText: string;
+    }
+
+    export interface TextInsertion {
+        newText: string;
+        /** The position in newText the caret should point to after the insertion. */
+        caretOffset: number;
+    }
+
+    export interface RenameLocation {
+        textSpan: TextSpan;
+        fileName: string;
+    }
+
+    export interface ReferenceEntry {
+        textSpan: TextSpan;
+        fileName: string;
+        isWriteAccess: boolean;
+        isDefinition: boolean;
+    }
+
+    export interface DocumentHighlights {
+        fileName: string;
+        highlightSpans: HighlightSpan[];
+    }
+
+    export namespace HighlightSpanKind {
+        export const none = "none";
+        export const definition = "definition";
+        export const reference = "reference";
+        export const writtenReference = "writtenReference";
+    }
+
+    export interface HighlightSpan {
+        fileName?: string;
+        textSpan: TextSpan;
+        kind: string;
+    }
+
+    export interface NavigateToItem {
+        name: string;
+        kind: string;
+        kindModifiers: string;
+        matchKind: string;
+        isCaseSensitive: boolean;
+        fileName: string;
+        textSpan: TextSpan;
+        containerName: string;
+        containerKind: string;
+    }
+
+    export interface EditorOptions {
+        BaseIndentSize?: number;
+        IndentSize: number;
+        TabSize: number;
+        NewLineCharacter: string;
+        ConvertTabsToSpaces: boolean;
+        IndentStyle: IndentStyle;
+    }
+
+    export enum IndentStyle {
+        None = 0,
+        Block = 1,
+        Smart = 2,
+    }
+
+    export interface FormatCodeOptions extends EditorOptions {
+        InsertSpaceAfterCommaDelimiter: boolean;
+        InsertSpaceAfterSemicolonInForStatements: boolean;
+        InsertSpaceBeforeAndAfterBinaryOperators: boolean;
+        InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
+        InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces?: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
+        PlaceOpenBraceOnNewLineForFunctions: boolean;
+        PlaceOpenBraceOnNewLineForControlBlocks: boolean;
+        [s: string]: boolean | number | string | undefined;
+    }
+
+    export interface DefinitionInfo {
+        fileName: string;
+        textSpan: TextSpan;
+        kind: string;
+        name: string;
+        containerKind: string;
+        containerName: string;
+    }
+
+    export interface ReferencedSymbolDefinitionInfo extends DefinitionInfo {
+        displayParts: SymbolDisplayPart[];
+    }
+
+    export interface ReferencedSymbol {
+        definition: ReferencedSymbolDefinitionInfo;
+        references: ReferenceEntry[];
+    }
+
+    export enum SymbolDisplayPartKind {
+        aliasName,
+        className,
+        enumName,
+        fieldName,
+        interfaceName,
+        keyword,
+        lineBreak,
+        numericLiteral,
+        stringLiteral,
+        localName,
+        methodName,
+        moduleName,
+        operator,
+        parameterName,
+        propertyName,
+        punctuation,
+        space,
+        text,
+        typeParameterName,
+        enumMemberName,
+        functionName,
+        regularExpressionLiteral,
+    }
+
+    export interface SymbolDisplayPart {
+        text: string;
+        kind: string;
+    }
+
+    export interface QuickInfo {
+        kind: string;
+        kindModifiers: string;
+        textSpan: TextSpan;
+        displayParts: SymbolDisplayPart[];
+        documentation: SymbolDisplayPart[];
+    }
+
+    export interface RenameInfo {
+        canRename: boolean;
+        localizedErrorMessage: string;
+        displayName: string;
+        fullDisplayName: string;
+        kind: string;
+        kindModifiers: string;
+        triggerSpan: TextSpan;
+    }
+
+    export interface SignatureHelpParameter {
+        name: string;
+        documentation: SymbolDisplayPart[];
+        displayParts: SymbolDisplayPart[];
+        isOptional: boolean;
+    }
+
+    /**
+     * Represents a single signature to show in signature help.
+     * The id is used for subsequent calls into the language service to ask questions about the
+     * signature help item in the context of any documents that have been updated.  i.e. after
+     * an edit has happened, while signature help is still active, the host can ask important
+     * questions like 'what parameter is the user currently contained within?'.
+     */
+    export interface SignatureHelpItem {
+        isVariadic: boolean;
+        prefixDisplayParts: SymbolDisplayPart[];
+        suffixDisplayParts: SymbolDisplayPart[];
+        separatorDisplayParts: SymbolDisplayPart[];
+        parameters: SignatureHelpParameter[];
+        documentation: SymbolDisplayPart[];
+    }
+
+    /**
+     * Represents a set of signature help items, and the preferred item that should be selected.
+     */
+    export interface SignatureHelpItems {
+        items: SignatureHelpItem[];
+        applicableSpan: TextSpan;
+        selectedItemIndex: number;
+        argumentIndex: number;
+        argumentCount: number;
+    }
+
+    export interface CompletionInfo {
+        isMemberCompletion: boolean;
+        isNewIdentifierLocation: boolean;  // true when the current location also allows for a new identifier
+        entries: CompletionEntry[];
+    }
+
+    export interface CompletionEntry {
+        name: string;
+        kind: string;            // see ScriptElementKind
+        kindModifiers: string;   // see ScriptElementKindModifier, comma separated
+        sortText: string;
+        /**
+          * An optional span that indicates the text to be replaced by this completion item. It will be
+          * set if the required span differs from the one generated by the default replacement behavior and should
+          * be used in that case
+          */
+        replacementSpan?: TextSpan;
+    }
+
+    export interface CompletionEntryDetails {
+        name: string;
+        kind: string;            // see ScriptElementKind
+        kindModifiers: string;   // see ScriptElementKindModifier, comma separated
+        displayParts: SymbolDisplayPart[];
+        documentation: SymbolDisplayPart[];
+    }
+
+    export interface OutliningSpan {
+        /** The span of the document to actually collapse. */
+        textSpan: TextSpan;
+
+        /** The span of the document to display when the user hovers over the collapsed span. */
+        hintSpan: TextSpan;
+
+        /** The text to display in the editor for the collapsed region. */
+        bannerText: string;
+
+        /**
+          * Whether or not this region should be automatically collapsed when
+          * the 'Collapse to Definitions' command is invoked.
+          */
+        autoCollapse: boolean;
+    }
+
+    export interface EmitOutput {
+        outputFiles: OutputFile[];
+        emitSkipped: boolean;
+    }
+
+    export const enum OutputFileType {
+        JavaScript,
+        SourceMap,
+        Declaration
+    }
+
+    export interface OutputFile {
+        name: string;
+        writeByteOrderMark: boolean;
+        text: string;
+    }
+
+    export const enum EndOfLineState {
+        None,
+        InMultiLineCommentTrivia,
+        InSingleQuoteStringLiteral,
+        InDoubleQuoteStringLiteral,
+        InTemplateHeadOrNoSubstitutionTemplate,
+        InTemplateMiddleOrTail,
+        InTemplateSubstitutionPosition,
+    }
+
+    export enum TokenClass {
+        Punctuation,
+        Keyword,
+        Operator,
+        Comment,
+        Whitespace,
+        Identifier,
+        NumberLiteral,
+        StringLiteral,
+        RegExpLiteral,
+    }
+
+    export interface ClassificationResult {
+        finalLexState: EndOfLineState;
+        entries: ClassificationInfo[];
+    }
+
+    export interface ClassificationInfo {
+        length: number;
+        classification: TokenClass;
+    }
+
+    export interface Classifier {
+        /**
+         * Gives lexical classifications of tokens on a line without any syntactic context.
+         * For instance, a token consisting of the text 'string' can be either an identifier
+         * named 'string' or the keyword 'string', however, because this classifier is not aware,
+         * it relies on certain heuristics to give acceptable results. For classifications where
+         * speed trumps accuracy, this function is preferable; however, for true accuracy, the
+         * syntactic classifier is ideal. In fact, in certain editing scenarios, combining the
+         * lexical, syntactic, and semantic classifiers may issue the best user experience.
+         *
+         * @param text                      The text of a line to classify.
+         * @param lexState                  The state of the lexical classifier at the end of the previous line.
+         * @param syntacticClassifierAbsent Whether the client is *not* using a syntactic classifier.
+         *                                  If there is no syntactic classifier (syntacticClassifierAbsent=true),
+         *                                  certain heuristics may be used in its place; however, if there is a
+         *                                  syntactic classifier (syntacticClassifierAbsent=false), certain
+         *                                  classifications which may be incorrectly categorized will be given
+         *                                  back as Identifiers in order to allow the syntactic classifier to
+         *                                  subsume the classification.
+         * @deprecated Use getLexicalClassifications instead.
+         */
+        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult;
+        getEncodedLexicalClassifications(text: string, endOfLineState: EndOfLineState, syntacticClassifierAbsent: boolean): Classifications;
+    }
+
+    /**
+      * The document registry represents a store of SourceFile objects that can be shared between
+      * multiple LanguageService instances. A LanguageService instance holds on the SourceFile (AST)
+      * of files in the context.
+      * SourceFile objects account for most of the memory usage by the language service. Sharing
+      * the same DocumentRegistry instance between different instances of LanguageService allow
+      * for more efficient memory utilization since all projects will share at least the library
+      * file (lib.d.ts).
+      *
+      * A more advanced use of the document registry is to serialize sourceFile objects to disk
+      * and re-hydrate them when needed.
+      *
+      * To create a default DocumentRegistry, use createDocumentRegistry to create one, and pass it
+      * to all subsequent createLanguageService calls.
+      */
+    export interface DocumentRegistry {
+        /**
+          * Request a stored SourceFile with a given fileName and compilationSettings.
+          * The first call to acquire will call createLanguageServiceSourceFile to generate
+          * the SourceFile if was not found in the registry.
+          *
+          * @param fileName The name of the file requested
+          * @param compilationSettings Some compilation settings like target affects the
+          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
+          * multiple copies of the same file for different compilation settings.
+          * @parm scriptSnapshot Text of the file. Only used if the file was not found
+          * in the registry and a new one was created.
+          * @parm version Current version of the file. Only used if the file was not found
+          * in the registry and a new one was created.
+          */
+        acquireDocument(
+            fileName: string,
+            compilationSettings: CompilerOptions,
+            scriptSnapshot: IScriptSnapshot,
+            version: string,
+            scriptKind?: ScriptKind): SourceFile;
+
+        acquireDocumentWithKey(
+            fileName: string,
+            path: Path,
+            compilationSettings: CompilerOptions,
+            key: DocumentRegistryBucketKey,
+            scriptSnapshot: IScriptSnapshot,
+            version: string,
+            scriptKind?: ScriptKind): SourceFile;
+
+        /**
+          * Request an updated version of an already existing SourceFile with a given fileName
+          * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile
+          * to get an updated SourceFile.
+          *
+          * @param fileName The name of the file requested
+          * @param compilationSettings Some compilation settings like target affects the
+          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
+          * multiple copies of the same file for different compilation settings.
+          * @param scriptSnapshot Text of the file.
+          * @param version Current version of the file.
+          */
+        updateDocument(
+            fileName: string,
+            compilationSettings: CompilerOptions,
+            scriptSnapshot: IScriptSnapshot,
+            version: string,
+            scriptKind?: ScriptKind): SourceFile;
+
+        updateDocumentWithKey(
+            fileName: string,
+            path: Path,
+            compilationSettings: CompilerOptions,
+            key: DocumentRegistryBucketKey,
+            scriptSnapshot: IScriptSnapshot,
+            version: string,
+            scriptKind?: ScriptKind): SourceFile;
+
+        getKeyForCompilationSettings(settings: CompilerOptions): DocumentRegistryBucketKey;
+        /**
+          * Informs the DocumentRegistry that a file is not needed any longer.
+          *
+          * Note: It is not allowed to call release on a SourceFile that was not acquired from
+          * this registry originally.
+          *
+          * @param fileName The name of the file to be released
+          * @param compilationSettings The compilation settings used to acquire the file
+          */
+        releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;
+
+        releaseDocumentWithKey(path: Path, key: DocumentRegistryBucketKey): void;
+
+        reportStats(): string;
+    }
+
+    export type DocumentRegistryBucketKey = string & { __bucketKey: any };
+
+    // TODO: move these to enums
+    export namespace ScriptElementKind {
+        export const unknown = "";
+        export const warning = "warning";
+
+        /** predefined type (void) or keyword (class) */
+        export const keyword = "keyword";
+
+        /** top level script node */
+        export const scriptElement = "script";
+
+        /** module foo {} */
+        export const moduleElement = "module";
+
+        /** class X {} */
+        export const classElement = "class";
+
+        /** var x = class X {} */
+        export const localClassElement = "local class";
+
+        /** interface Y {} */
+        export const interfaceElement = "interface";
+
+        /** type T = ... */
+        export const typeElement = "type";
+
+        /** enum E */
+        export const enumElement = "enum";
+        // TODO: GH#9983
+        export const enumMemberElement = "const";
+
+        /**
+         * Inside module and script only
+         * const v = ..
+         */
+        export const variableElement = "var";
+
+        /** Inside function */
+        export const localVariableElement = "local var";
+
+        /**
+         * Inside module and script only
+         * function f() { }
+         */
+        export const functionElement = "function";
+
+        /** Inside function */
+        export const localFunctionElement = "local function";
+
+        /** class X { [public|private]* foo() {} } */
+        export const memberFunctionElement = "method";
+
+        /** class X { [public|private]* [get|set] foo:number; } */
+        export const memberGetAccessorElement = "getter";
+        export const memberSetAccessorElement = "setter";
+
+        /**
+         * class X { [public|private]* foo:number; }
+         * interface Y { foo:number; }
+         */
+        export const memberVariableElement = "property";
+
+        /** class X { constructor() { } } */
+        export const constructorImplementationElement = "constructor";
+
+        /** interface Y { ():number; } */
+        export const callSignatureElement = "call";
+
+        /** interface Y { []:number; } */
+        export const indexSignatureElement = "index";
+
+        /** interface Y { new():Y; } */
+        export const constructSignatureElement = "construct";
+
+        /** function foo(*Y*: string) */
+        export const parameterElement = "parameter";
+
+        export const typeParameterElement = "type parameter";
+
+        export const primitiveType = "primitive type";
+
+        export const label = "label";
+
+        export const alias = "alias";
+
+        export const constElement = "const";
+
+        export const letElement = "let";
+
+        export const directory = "directory";
+
+        export const externalModuleName = "external module name";
+    }
+
+    export namespace ScriptElementKindModifier {
+        export const none = "";
+        export const publicMemberModifier = "public";
+        export const privateMemberModifier = "private";
+        export const protectedMemberModifier = "protected";
+        export const exportedModifier = "export";
+        export const ambientModifier = "declare";
+        export const staticModifier = "static";
+        export const abstractModifier = "abstract";
+    }
+
+    export class ClassificationTypeNames {
+        public static comment = "comment";
+        public static identifier = "identifier";
+        public static keyword = "keyword";
+        public static numericLiteral = "number";
+        public static operator = "operator";
+        public static stringLiteral = "string";
+        public static whiteSpace = "whitespace";
+        public static text = "text";
+
+        public static punctuation = "punctuation";
+
+        public static className = "class name";
+        public static enumName = "enum name";
+        public static interfaceName = "interface name";
+        public static moduleName = "module name";
+        public static typeParameterName = "type parameter name";
+        public static typeAliasName = "type alias name";
+        public static parameterName = "parameter name";
+        public static docCommentTagName = "doc comment tag name";
+        public static jsxOpenTagName = "jsx open tag name";
+        public static jsxCloseTagName = "jsx close tag name";
+        public static jsxSelfClosingTagName = "jsx self closing tag name";
+        public static jsxAttribute = "jsx attribute";
+        public static jsxText = "jsx text";
+        public static jsxAttributeStringLiteralValue = "jsx attribute string literal value";
+    }
+
+    export const enum ClassificationType {
+        comment = 1,
+        identifier = 2,
+        keyword = 3,
+        numericLiteral = 4,
+        operator = 5,
+        stringLiteral = 6,
+        regularExpressionLiteral = 7,
+        whiteSpace = 8,
+        text = 9,
+        punctuation = 10,
+        className = 11,
+        enumName = 12,
+        interfaceName = 13,
+        moduleName = 14,
+        typeParameterName = 15,
+        typeAliasName = 16,
+        parameterName = 17,
+        docCommentTagName = 18,
+        jsxOpenTagName = 19,
+        jsxCloseTagName = 20,
+        jsxSelfClosingTagName = 21,
+        jsxAttribute = 22,
+        jsxText = 23,
+        jsxAttributeStringLiteralValue = 24,
+    }
+}
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 9b3469643ba..593664c4128 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -1,6 +1,9 @@
 // These utilities are common to multiple language service features.
 /* @internal */
 namespace ts {
+    // Matches the beginning of a triple slash directive
+    const tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</;
+
     export interface ListItemInfo {
         listItemIndex: number;
         list: Node;
@@ -588,15 +591,15 @@ namespace ts {
     }
 
     export function getNodeModifiers(node: Node): string {
-        const flags = getCombinedNodeFlags(node);
+        const flags = getCombinedModifierFlags(node);
         const result: string[] = [];
 
-        if (flags & NodeFlags.Private) result.push(ScriptElementKindModifier.privateMemberModifier);
-        if (flags & NodeFlags.Protected) result.push(ScriptElementKindModifier.protectedMemberModifier);
-        if (flags & NodeFlags.Public) result.push(ScriptElementKindModifier.publicMemberModifier);
-        if (flags & NodeFlags.Static) result.push(ScriptElementKindModifier.staticModifier);
-        if (flags & NodeFlags.Abstract) result.push(ScriptElementKindModifier.abstractModifier);
-        if (flags & NodeFlags.Export) result.push(ScriptElementKindModifier.exportedModifier);
+        if (flags & ModifierFlags.Private) result.push(ScriptElementKindModifier.privateMemberModifier);
+        if (flags & ModifierFlags.Protected) result.push(ScriptElementKindModifier.protectedMemberModifier);
+        if (flags & ModifierFlags.Public) result.push(ScriptElementKindModifier.publicMemberModifier);
+        if (flags & ModifierFlags.Static) result.push(ScriptElementKindModifier.staticModifier);
+        if (flags & ModifierFlags.Abstract) result.push(ScriptElementKindModifier.abstractModifier);
+        if (flags & ModifierFlags.Export) result.push(ScriptElementKindModifier.exportedModifier);
         if (isInAmbientContext(node)) result.push(ScriptElementKindModifier.ambientModifier);
 
         return result.length > 0 ? result.join(",") : ScriptElementKindModifier.none;
@@ -704,6 +707,29 @@ namespace ts {
 
         return false;
     }
+
+    export function hasTrailingDirectorySeparator(path: string) {
+        const lastCharacter = path.charAt(path.length - 1);
+        return lastCharacter === "/" || lastCharacter === "\\";
+    }
+
+    export function isInReferenceComment(sourceFile: SourceFile, position: number): boolean {
+        return isInCommentHelper(sourceFile, position, isReferenceComment);
+
+        function isReferenceComment(c: CommentRange): boolean {
+            const commentText = sourceFile.text.substring(c.pos, c.end);
+            return tripleSlashDirectivePrefixRegex.test(commentText);
+        }
+    }
+
+    export function isInNonReferenceComment(sourceFile: SourceFile, position: number): boolean {
+        return isInCommentHelper(sourceFile, position, isNonReferenceComment);
+
+        function isNonReferenceComment(c: CommentRange): boolean {
+            const commentText = sourceFile.text.substring(c.pos, c.end);
+            return !tripleSlashDirectivePrefixRegex.test(commentText);
+        }
+    }
 }
 
 // Display-part writer helpers
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js
index d971dd160db..b8e332f1932 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js
@@ -33,8 +33,8 @@ var Point = (function () {
 }());
 var Point;
 (function (Point) {
-    function Origin() { return null; }
-    Point.Origin = Origin; //expected duplicate identifier error
+    function Origin() { return null; } //expected duplicate identifier error
+    Point.Origin = Origin;
 })(Point || (Point = {}));
 var A;
 (function (A) {
@@ -49,7 +49,7 @@ var A;
     A.Point = Point;
     var Point;
     (function (Point) {
-        function Origin() { return ""; }
-        Point.Origin = Origin; //expected duplicate identifier error
+        function Origin() { return ""; } //expected duplicate identifier error
+        Point.Origin = Origin;
     })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js
index a0cb50e7382..63d3739846b 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js
@@ -28,9 +28,9 @@ var Point = (function () {
         this.x = x;
         this.y = y;
     }
-    Point.Origin = { x: 0, y: 0 };
     return Point;
 }());
+Point.Origin = { x: 0, y: 0 };
 var Point;
 (function (Point) {
     Point.Origin = ""; //expected duplicate identifier error
@@ -42,9 +42,9 @@ var A;
             this.x = x;
             this.y = y;
         }
-        Point.Origin = { x: 0, y: 0 };
         return Point;
     }());
+    Point.Origin = { x: 0, y: 0 };
     A.Point = Point;
     var Point;
     (function (Point) {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js
index 3bbf3b98d6e..3921546a21c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js
@@ -28,9 +28,9 @@ var Point = (function () {
         this.x = x;
         this.y = y;
     }
-    Point.Origin = { x: 0, y: 0 };
     return Point;
 }());
+Point.Origin = { x: 0, y: 0 };
 var Point;
 (function (Point) {
     var Origin = ""; // not an error, since not exported
@@ -42,9 +42,9 @@ var A;
             this.x = x;
             this.y = y;
         }
-        Point.Origin = { x: 0, y: 0 };
         return Point;
     }());
+    Point.Origin = { x: 0, y: 0 };
     A.Point = Point;
     var Point;
     (function (Point) {
diff --git a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js
index d5c3b3d63f4..7633955b227 100644
--- a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js
+++ b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js
@@ -7,6 +7,6 @@ class AtomicNumbers {
 var AtomicNumbers = (function () {
     function AtomicNumbers() {
     }
-    AtomicNumbers.H = 1;
     return AtomicNumbers;
 }());
+AtomicNumbers.H = 1;
diff --git a/tests/baselines/reference/ES5For-of1.js.map b/tests/baselines/reference/ES5For-of1.js.map
index bd729517462..6415b662186 100644
--- a/tests/baselines/reference/ES5For-of1.js.map
+++ b/tests/baselines/reference/ES5For-of1.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of1.js.map]
-{"version":3,"file":"ES5For-of1.js","sourceRoot":"","sources":["ES5For-of1.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClB"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of1.js","sourceRoot":"","sources":["ES5For-of1.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe;IAAxB,IAAI,CAAC,SAAA;IACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of1.sourcemap.txt b/tests/baselines/reference/ES5For-of1.sourcemap.txt
index 5ae1084df25..f6a89d058fe 100644
--- a/tests/baselines/reference/ES5For-of1.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of1.sourcemap.txt
@@ -26,7 +26,6 @@ sourceFile:ES5For-of1.ts
 15>                                       ^^^^^^^^^^^^^^
 16>                                                     ^^
 17>                                                       ^^^^
-18>                                                           ^
 1 >
 2 >for
 3 >    
@@ -44,7 +43,6 @@ sourceFile:ES5For-of1.ts
 15>                                       ['a', 'b', 'c']
 16>                                                     
 17>                                                       ['a', 'b', 'c']
-18>                                                           )
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
 3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
@@ -62,7 +60,6 @@ sourceFile:ES5For-of1.ts
 15>Emitted(1, 54) Source(1, 30) + SourceIndex(0)
 16>Emitted(1, 56) Source(1, 15) + SourceIndex(0)
 17>Emitted(1, 60) Source(1, 30) + SourceIndex(0)
-18>Emitted(1, 61) Source(1, 31) + SourceIndex(0)
 ---
 >>>    var v = _a[_i];
 1 >^^^^
diff --git a/tests/baselines/reference/ES5For-of13.js.map b/tests/baselines/reference/ES5For-of13.js.map
index 3fa2bd27348..1cb5d6039d3 100644
--- a/tests/baselines/reference/ES5For-of13.js.map
+++ b/tests/baselines/reference/ES5For-of13.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of13.js.map]
-{"version":3,"file":"ES5For-of13.js","sourceRoot":"","sources":["ES5For-of13.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CACb"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of13.js","sourceRoot":"","sources":["ES5For-of13.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe;IAAxB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CACb"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of13.sourcemap.txt b/tests/baselines/reference/ES5For-of13.sourcemap.txt
index 410560ac78e..a7386dddc50 100644
--- a/tests/baselines/reference/ES5For-of13.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of13.sourcemap.txt
@@ -26,7 +26,6 @@ sourceFile:ES5For-of13.ts
 15>                                       ^^^^^^^^^^^^^^
 16>                                                     ^^
 17>                                                       ^^^^
-18>                                                           ^
 1 >
 2 >for
 3 >    
@@ -44,7 +43,6 @@ sourceFile:ES5For-of13.ts
 15>                                       ['a', 'b', 'c']
 16>                                                     
 17>                                                       ['a', 'b', 'c']
-18>                                                           )
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
 3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
@@ -62,7 +60,6 @@ sourceFile:ES5For-of13.ts
 15>Emitted(1, 54) Source(1, 30) + SourceIndex(0)
 16>Emitted(1, 56) Source(1, 15) + SourceIndex(0)
 17>Emitted(1, 60) Source(1, 30) + SourceIndex(0)
-18>Emitted(1, 61) Source(1, 31) + SourceIndex(0)
 ---
 >>>    var v = _a[_i];
 1 >^^^^
diff --git a/tests/baselines/reference/ES5For-of25.js.map b/tests/baselines/reference/ES5For-of25.js.map
index 5ccc838a488..f1c97506f2d 100644
--- a/tests/baselines/reference/ES5For-of25.js.map
+++ b/tests/baselines/reference/ES5For-of25.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of25.js.map]
-{"version":3,"file":"ES5For-of25.js","sourceRoot":"","sources":["ES5For-of25.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAClB,GAAG,CAAC,CAAU,UAAC,EAAD,OAAC,EAAD,eAAC,EAAD,IAAC,CAAC;IAAX,IAAI,CAAC,UAAA;IACN,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of25.js","sourceRoot":"","sources":["ES5For-of25.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAClB,GAAG,CAAC,CAAU,UAAC,EAAD,OAAC,EAAD,eAAC,EAAD,IAAC;IAAV,IAAI,CAAC,UAAA;IACN,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of25.sourcemap.txt b/tests/baselines/reference/ES5For-of25.sourcemap.txt
index 765aa707701..31b10538fa6 100644
--- a/tests/baselines/reference/ES5For-of25.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of25.sourcemap.txt
@@ -59,7 +59,6 @@ sourceFile:ES5For-of25.ts
 9 >                          ^^^^^^^^^^^^^^^
 10>                                         ^^
 11>                                           ^^^^
-12>                                               ^
 1->
   >
 2 >for
@@ -72,7 +71,6 @@ sourceFile:ES5For-of25.ts
 9 >                          a
 10>                                         
 11>                                           a
-12>                                               )
 1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
 2 >Emitted(2, 4) Source(2, 4) + SourceIndex(0)
 3 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
@@ -84,7 +82,6 @@ sourceFile:ES5For-of25.ts
 9 >Emitted(2, 42) Source(2, 16) + SourceIndex(0)
 10>Emitted(2, 44) Source(2, 15) + SourceIndex(0)
 11>Emitted(2, 48) Source(2, 16) + SourceIndex(0)
-12>Emitted(2, 49) Source(2, 17) + SourceIndex(0)
 ---
 >>>    var v = a_1[_i];
 1 >^^^^
diff --git a/tests/baselines/reference/ES5For-of26.js.map b/tests/baselines/reference/ES5For-of26.js.map
index 9dcebf97134..0afbe7ec42e 100644
--- a/tests/baselines/reference/ES5For-of26.js.map
+++ b/tests/baselines/reference/ES5For-of26.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of26.js.map]
-{"version":3,"file":"ES5For-of26.js","sourceRoot":"","sources":["ES5For-of26.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAuB,UAAM,EAAN,MAAC,CAAC,EAAE,CAAC,CAAC,EAAN,cAAM,EAAN,IAAM,CAAC;IAA7B,eAAkB,EAAb,UAAK,EAAL,0BAAK,EAAE,UAAK,EAAL,0BAAK;IAClB,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of26.js","sourceRoot":"","sources":["ES5For-of26.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAuB,UAAM,EAAN,MAAC,CAAC,EAAE,CAAC,CAAC,EAAN,cAAM,EAAN,IAAM;IAAxB,IAAA,WAAc,EAAb,UAAK,EAAL,0BAAK,EAAE,UAAK,EAAL,0BAAK;IAClB,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of26.sourcemap.txt b/tests/baselines/reference/ES5For-of26.sourcemap.txt
index 00a1cc55f37..ce13a75e5cf 100644
--- a/tests/baselines/reference/ES5For-of26.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of26.sourcemap.txt
@@ -24,8 +24,7 @@ sourceFile:ES5For-of26.ts
 13>                              ^^^^^^^^^^^^^^
 14>                                            ^^
 15>                                              ^^^^
-16>                                                  ^
-17>                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >for
 3 >    
@@ -41,7 +40,6 @@ sourceFile:ES5For-of26.ts
 13>                              [2, 3]
 14>                                            
 15>                                              [2, 3]
-16>                                                  )
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
 3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
@@ -57,39 +55,41 @@ sourceFile:ES5For-of26.ts
 13>Emitted(1, 45) Source(1, 34) + SourceIndex(0)
 14>Emitted(1, 47) Source(1, 28) + SourceIndex(0)
 15>Emitted(1, 51) Source(1, 34) + SourceIndex(0)
-16>Emitted(1, 52) Source(1, 35) + SourceIndex(0)
 ---
 >>>    var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                           ^^
-8 >                                                             ^^^^^^^^^^
-9 >                                                                       ^^
-10>                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                           ^^
+9 >                                                             ^^^^^^^^^^
+10>                                                                       ^^
+11>                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    var [a = 0, b = 1]
-3 >                   
-4 >                     a = 0
-5 >                               
-6 >                                 a = 0
-7 >                                                           , 
-8 >                                                             b = 1
-9 >                                                                       
-10>                                                                         b = 1
-1->Emitted(2, 5) Source(1, 6) + SourceIndex(0)
-2 >Emitted(2, 20) Source(1, 24) + SourceIndex(0)
-3 >Emitted(2, 22) Source(1, 11) + SourceIndex(0)
-4 >Emitted(2, 32) Source(1, 16) + SourceIndex(0)
-5 >Emitted(2, 34) Source(1, 11) + SourceIndex(0)
-6 >Emitted(2, 60) Source(1, 16) + SourceIndex(0)
-7 >Emitted(2, 62) Source(1, 18) + SourceIndex(0)
-8 >Emitted(2, 72) Source(1, 23) + SourceIndex(0)
-9 >Emitted(2, 74) Source(1, 18) + SourceIndex(0)
-10>Emitted(2, 100) Source(1, 23) + SourceIndex(0)
+2 >    
+3 >        [a = 0, b = 1]
+4 >                   
+5 >                     a = 0
+6 >                               
+7 >                                 a = 0
+8 >                                                           , 
+9 >                                                             b = 1
+10>                                                                       
+11>                                                                         b = 1
+1->Emitted(2, 5) Source(1, 10) + SourceIndex(0)
+2 >Emitted(2, 9) Source(1, 10) + SourceIndex(0)
+3 >Emitted(2, 20) Source(1, 24) + SourceIndex(0)
+4 >Emitted(2, 22) Source(1, 11) + SourceIndex(0)
+5 >Emitted(2, 32) Source(1, 16) + SourceIndex(0)
+6 >Emitted(2, 34) Source(1, 11) + SourceIndex(0)
+7 >Emitted(2, 60) Source(1, 16) + SourceIndex(0)
+8 >Emitted(2, 62) Source(1, 18) + SourceIndex(0)
+9 >Emitted(2, 72) Source(1, 23) + SourceIndex(0)
+10>Emitted(2, 74) Source(1, 18) + SourceIndex(0)
+11>Emitted(2, 100) Source(1, 23) + SourceIndex(0)
 ---
 >>>    a;
 1 >^^^^
diff --git a/tests/baselines/reference/ES5For-of3.js.map b/tests/baselines/reference/ES5For-of3.js.map
index 5a91ff28e9c..ffcee0b3a52 100644
--- a/tests/baselines/reference/ES5For-of3.js.map
+++ b/tests/baselines/reference/ES5For-of3.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of3.js.map]
-{"version":3,"file":"ES5For-of3.js","sourceRoot":"","sources":["ES5For-of3.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CAAA"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of3.js","sourceRoot":"","sources":["ES5For-of3.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe;IAAxB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of3.sourcemap.txt b/tests/baselines/reference/ES5For-of3.sourcemap.txt
index 1c728f5df67..4eea9dfaed4 100644
--- a/tests/baselines/reference/ES5For-of3.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of3.sourcemap.txt
@@ -26,7 +26,6 @@ sourceFile:ES5For-of3.ts
 15>                                       ^^^^^^^^^^^^^^
 16>                                                     ^^
 17>                                                       ^^^^
-18>                                                           ^
 1 >
 2 >for
 3 >    
@@ -44,7 +43,6 @@ sourceFile:ES5For-of3.ts
 15>                                       ['a', 'b', 'c']
 16>                                                     
 17>                                                       ['a', 'b', 'c']
-18>                                                           )
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
 3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
@@ -62,7 +60,6 @@ sourceFile:ES5For-of3.ts
 15>Emitted(1, 54) Source(1, 30) + SourceIndex(0)
 16>Emitted(1, 56) Source(1, 15) + SourceIndex(0)
 17>Emitted(1, 60) Source(1, 30) + SourceIndex(0)
-18>Emitted(1, 61) Source(1, 31) + SourceIndex(0)
 ---
 >>>    var v = _a[_i];
 1 >^^^^
diff --git a/tests/baselines/reference/ES5For-of8.js.map b/tests/baselines/reference/ES5For-of8.js.map
index 3a1497eadcd..1f6cf096412 100644
--- a/tests/baselines/reference/ES5For-of8.js.map
+++ b/tests/baselines/reference/ES5For-of8.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of8.js.map]
-{"version":3,"file":"ES5For-of8.js","sourceRoot":"","sources":["ES5For-of8.ts"],"names":[],"mappings":"AAAA;IACI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACpB,CAAC;AACD,GAAG,CAAC,CAAY,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe,CAAC;IAA3B,GAAG,EAAE,CAAC,CAAC,SAAA;IACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;CACnB"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of8.js","sourceRoot":"","sources":["ES5For-of8.ts"],"names":[],"mappings":"AAAA;IACI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACpB,CAAC;AACD,GAAG,CAAC,CAAY,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAf,cAAe,EAAf,IAAe;IAA1B,GAAG,EAAE,CAAC,CAAC,SAAA;IACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;CACnB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of8.sourcemap.txt b/tests/baselines/reference/ES5For-of8.sourcemap.txt
index dbfce707ca6..1a58d5f107b 100644
--- a/tests/baselines/reference/ES5For-of8.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of8.sourcemap.txt
@@ -72,7 +72,6 @@ sourceFile:ES5For-of8.ts
 15>                                       ^^^^^^^^^^^^^^
 16>                                                     ^^
 17>                                                       ^^^^
-18>                                                           ^
 1->
   >
 2 >for
@@ -91,7 +90,6 @@ sourceFile:ES5For-of8.ts
 15>                                       ['a', 'b', 'c']
 16>                                                     
 17>                                                       ['a', 'b', 'c']
-18>                                                           )
 1->Emitted(4, 1) Source(4, 1) + SourceIndex(0)
 2 >Emitted(4, 4) Source(4, 4) + SourceIndex(0)
 3 >Emitted(4, 5) Source(4, 5) + SourceIndex(0)
@@ -109,7 +107,6 @@ sourceFile:ES5For-of8.ts
 15>Emitted(4, 54) Source(4, 32) + SourceIndex(0)
 16>Emitted(4, 56) Source(4, 17) + SourceIndex(0)
 17>Emitted(4, 60) Source(4, 32) + SourceIndex(0)
-18>Emitted(4, 61) Source(4, 33) + SourceIndex(0)
 ---
 >>>    foo().x = _a[_i];
 1 >^^^^
diff --git a/tests/baselines/reference/ES5SymbolProperty1.js b/tests/baselines/reference/ES5SymbolProperty1.js
index 1073a33163d..ab3f420c95c 100644
--- a/tests/baselines/reference/ES5SymbolProperty1.js
+++ b/tests/baselines/reference/ES5SymbolProperty1.js
@@ -14,7 +14,6 @@ obj[Symbol.foo];
 var Symbol;
 var obj = (_a = {},
     _a[Symbol.foo] = 0,
-    _a
-);
+    _a);
 obj[Symbol.foo];
 var _a;
diff --git a/tests/baselines/reference/FunctionDeclaration10_es6.js b/tests/baselines/reference/FunctionDeclaration10_es6.js
index ccff1ac1036..6ac2ec8d194 100644
--- a/tests/baselines/reference/FunctionDeclaration10_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration10_es6.js
@@ -3,6 +3,9 @@ function * foo(a = yield => yield) {
 }
 
 //// [FunctionDeclaration10_es6.js]
+function* foo(a) {
+    if (a === void 0) { a = yield; }
+}
 yield;
 {
 }
diff --git a/tests/baselines/reference/FunctionDeclaration11_es6.js b/tests/baselines/reference/FunctionDeclaration11_es6.js
index ba497b3e529..d56eebd3bb5 100644
--- a/tests/baselines/reference/FunctionDeclaration11_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration11_es6.js
@@ -3,5 +3,5 @@ function * yield() {
 }
 
 //// [FunctionDeclaration11_es6.js]
-function yield() {
+function* yield() {
 }
diff --git a/tests/baselines/reference/FunctionDeclaration12_es6.js b/tests/baselines/reference/FunctionDeclaration12_es6.js
index d9c1739cb49..87ea08215fe 100644
--- a/tests/baselines/reference/FunctionDeclaration12_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration12_es6.js
@@ -2,4 +2,4 @@
 var v = function * yield() { }
 
 //// [FunctionDeclaration12_es6.js]
-var v = , yield = function () { };
+var v = function* () { }, yield = function () { };
diff --git a/tests/baselines/reference/FunctionDeclaration13_es6.js b/tests/baselines/reference/FunctionDeclaration13_es6.js
index 4c82b037569..b0527ee47ef 100644
--- a/tests/baselines/reference/FunctionDeclaration13_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration13_es6.js
@@ -6,7 +6,7 @@ function * foo() {
 
 
 //// [FunctionDeclaration13_es6.js]
-function foo() {
+function* foo() {
     // Legal to use 'yield' in a type context.
     var v;
 }
diff --git a/tests/baselines/reference/FunctionDeclaration1_es6.js b/tests/baselines/reference/FunctionDeclaration1_es6.js
index 262c7ea02fb..534a4c21cd7 100644
--- a/tests/baselines/reference/FunctionDeclaration1_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration1_es6.js
@@ -3,5 +3,5 @@ function * foo() {
 }
 
 //// [FunctionDeclaration1_es6.js]
-function foo() {
+function* foo() {
 }
diff --git a/tests/baselines/reference/FunctionDeclaration5_es6.js b/tests/baselines/reference/FunctionDeclaration5_es6.js
index 2530baa220c..645ee976ecd 100644
--- a/tests/baselines/reference/FunctionDeclaration5_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration5_es6.js
@@ -3,6 +3,7 @@ function*foo(yield) {
 }
 
 //// [FunctionDeclaration5_es6.js]
+function* foo() { }
 yield;
 {
 }
diff --git a/tests/baselines/reference/FunctionDeclaration6_es6.js b/tests/baselines/reference/FunctionDeclaration6_es6.js
index 07b3ff52212..e0b871a9172 100644
--- a/tests/baselines/reference/FunctionDeclaration6_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration6_es6.js
@@ -3,6 +3,6 @@ function*foo(a = yield) {
 }
 
 //// [FunctionDeclaration6_es6.js]
-function foo(a) {
+function* foo(a) {
     if (a === void 0) { a = yield; }
 }
diff --git a/tests/baselines/reference/FunctionDeclaration7_es6.js b/tests/baselines/reference/FunctionDeclaration7_es6.js
index 661e1668e0f..49b43e2a2db 100644
--- a/tests/baselines/reference/FunctionDeclaration7_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration7_es6.js
@@ -6,9 +6,9 @@ function*bar() {
 }
 
 //// [FunctionDeclaration7_es6.js]
-function bar() {
+function* bar() {
     // 'yield' here is an identifier, and not a yield expression.
-    function foo(a) {
+    function* foo(a) {
         if (a === void 0) { a = yield; }
     }
 }
diff --git a/tests/baselines/reference/FunctionDeclaration9_es6.js b/tests/baselines/reference/FunctionDeclaration9_es6.js
index e19d862f21b..720e276ccba 100644
--- a/tests/baselines/reference/FunctionDeclaration9_es6.js
+++ b/tests/baselines/reference/FunctionDeclaration9_es6.js
@@ -4,7 +4,7 @@ function * foo() {
 }
 
 //// [FunctionDeclaration9_es6.js]
-function foo() {
+function* foo() {
     var v = (_a = {}, _a[yield] = foo, _a);
     var _a;
 }
diff --git a/tests/baselines/reference/FunctionExpression1_es6.js b/tests/baselines/reference/FunctionExpression1_es6.js
index 97e5d28887d..4d2f36843a9 100644
--- a/tests/baselines/reference/FunctionExpression1_es6.js
+++ b/tests/baselines/reference/FunctionExpression1_es6.js
@@ -2,4 +2,4 @@
 var v = function * () { }
 
 //// [FunctionExpression1_es6.js]
-var v = function () { };
+var v = function* () { };
diff --git a/tests/baselines/reference/FunctionExpression2_es6.js b/tests/baselines/reference/FunctionExpression2_es6.js
index 87960e37128..bd88efcc7ec 100644
--- a/tests/baselines/reference/FunctionExpression2_es6.js
+++ b/tests/baselines/reference/FunctionExpression2_es6.js
@@ -2,4 +2,4 @@
 var v = function * foo() { }
 
 //// [FunctionExpression2_es6.js]
-var v = function foo() { };
+var v = function* foo() { };
diff --git a/tests/baselines/reference/FunctionPropertyAssignments1_es6.js b/tests/baselines/reference/FunctionPropertyAssignments1_es6.js
index 0176b412713..5975745391a 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments1_es6.js
+++ b/tests/baselines/reference/FunctionPropertyAssignments1_es6.js
@@ -2,4 +2,4 @@
 var v = { *foo() { } }
 
 //// [FunctionPropertyAssignments1_es6.js]
-var v = { foo: function () { } };
+var v = { foo: function* () { } };
diff --git a/tests/baselines/reference/FunctionPropertyAssignments2_es6.js b/tests/baselines/reference/FunctionPropertyAssignments2_es6.js
index fc86a6a48d6..b055960b6a8 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments2_es6.js
+++ b/tests/baselines/reference/FunctionPropertyAssignments2_es6.js
@@ -2,4 +2,4 @@
 var v = { *() { } }
 
 //// [FunctionPropertyAssignments2_es6.js]
-var v = { : function () { } };
+var v = { : function* () { } };
diff --git a/tests/baselines/reference/FunctionPropertyAssignments3_es6.js b/tests/baselines/reference/FunctionPropertyAssignments3_es6.js
index 89963edbc6e..9642c28529d 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments3_es6.js
+++ b/tests/baselines/reference/FunctionPropertyAssignments3_es6.js
@@ -2,4 +2,4 @@
 var v = { *{ } }
 
 //// [FunctionPropertyAssignments3_es6.js]
-var v = { : function () { } };
+var v = { : function* () { } };
diff --git a/tests/baselines/reference/FunctionPropertyAssignments4_es6.js b/tests/baselines/reference/FunctionPropertyAssignments4_es6.js
index 71076523414..a76405e34df 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments4_es6.js
+++ b/tests/baselines/reference/FunctionPropertyAssignments4_es6.js
@@ -2,4 +2,4 @@
 var v = { * }
 
 //// [FunctionPropertyAssignments4_es6.js]
-var v = { : function () { } };
+var v = {};
diff --git a/tests/baselines/reference/FunctionPropertyAssignments5_es6.js b/tests/baselines/reference/FunctionPropertyAssignments5_es6.js
index 188a843f751..ba25922b670 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments5_es6.js
+++ b/tests/baselines/reference/FunctionPropertyAssignments5_es6.js
@@ -2,5 +2,5 @@
 var v = { *[foo()]() { } }
 
 //// [FunctionPropertyAssignments5_es6.js]
-var v = (_a = {}, _a[foo()] = function () { }, _a);
+var v = (_a = {}, _a[foo()] = function* () { }, _a);
 var _a;
diff --git a/tests/baselines/reference/FunctionPropertyAssignments6_es6.js b/tests/baselines/reference/FunctionPropertyAssignments6_es6.js
index 60f3677f108..edcd227f7b9 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments6_es6.js
+++ b/tests/baselines/reference/FunctionPropertyAssignments6_es6.js
@@ -2,4 +2,4 @@
 var v = { *<T>() { } }
 
 //// [FunctionPropertyAssignments6_es6.js]
-var v = { : function () { } };
+var v = { : function* () { } };
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
new file mode 100644
index 00000000000..3fe305d4106
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
@@ -0,0 +1,36 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 27,
+    "tags": {
+        "0": {
+            "kind": "JSDocTypeTag",
+            "pos": 8,
+            "end": 22,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 13,
+                "text": "type"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 14,
+                "end": 22,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 15,
+                    "end": 21
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 22
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
new file mode 100644
index 00000000000..3fe305d4106
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
@@ -0,0 +1,36 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 27,
+    "tags": {
+        "0": {
+            "kind": "JSDocTypeTag",
+            "pos": 8,
+            "end": 22,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 13,
+                "text": "type"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 14,
+                "end": 22,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 15,
+                    "end": 21
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 22
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
new file mode 100644
index 00000000000..7947de57a58
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
@@ -0,0 +1,26 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 20,
+    "tags": {
+        "0": {
+            "kind": "JSDocReturnTag",
+            "pos": 8,
+            "end": 15,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 15,
+                "text": "return"
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 15
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noType.json
new file mode 100644
index 00000000000..7a4b97b1336
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noType.json
@@ -0,0 +1,26 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 18,
+    "tags": {
+        "0": {
+            "kind": "JSDocTypeTag",
+            "pos": 8,
+            "end": 13,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 13,
+                "text": "type"
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 13
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
new file mode 100644
index 00000000000..746c4056f83
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 34,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 29,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 15,
+                "end": 23,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 16,
+                    "end": 22
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 24,
+                "end": 29,
+                "text": "name1"
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 29
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
new file mode 100644
index 00000000000..ff4bba576d2
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 59,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 29,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 15,
+                "end": 23,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 16,
+                    "end": 22
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 24,
+                "end": 29,
+                "text": "name1"
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 29
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
new file mode 100644
index 00000000000..23264572fed
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
@@ -0,0 +1,43 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 61,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 31,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 15,
+                "end": 23,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 16,
+                    "end": 22
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 25,
+                "end": 30,
+                "text": "name1"
+            },
+            "isBracketed": true
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 31
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
new file mode 100644
index 00000000000..ceb123b6b34
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
@@ -0,0 +1,43 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 66,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 36,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 15,
+                "end": 23,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 16,
+                    "end": 22
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 26,
+                "end": 31,
+                "text": "name1"
+            },
+            "isBracketed": true
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 36
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
new file mode 100644
index 00000000000..19bab08a77b
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 34,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 29,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "preParameterName": {
+                "kind": "Identifier",
+                "pos": 15,
+                "end": 20,
+                "text": "name1"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 21,
+                "end": 29,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 22,
+                    "end": 28
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 29
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
new file mode 100644
index 00000000000..5da9084897e
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 46,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 29,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "preParameterName": {
+                "kind": "Identifier",
+                "pos": 15,
+                "end": 20,
+                "text": "name1"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 21,
+                "end": 29,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 22,
+                    "end": 28
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 29
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
new file mode 100644
index 00000000000..293d2a4c212
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
@@ -0,0 +1,32 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 23,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 18,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "preParameterName": {
+                "kind": "Identifier",
+                "pos": 15,
+                "end": 18,
+                "text": "foo"
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 18
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
new file mode 100644
index 00000000000..a8425d833ae
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
@@ -0,0 +1,36 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 29,
+    "tags": {
+        "0": {
+            "kind": "JSDocReturnTag",
+            "pos": 8,
+            "end": 24,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 15,
+                "text": "return"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 16,
+                "end": 24,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 17,
+                    "end": 23
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 24
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
new file mode 100644
index 00000000000..af4fd91964d
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
@@ -0,0 +1,36 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 54,
+    "tags": {
+        "0": {
+            "kind": "JSDocReturnTag",
+            "pos": 8,
+            "end": 24,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 15,
+                "text": "return"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 16,
+                "end": 24,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 17,
+                    "end": 23
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 24
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
new file mode 100644
index 00000000000..ceca9584a2d
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
@@ -0,0 +1,36 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 30,
+    "tags": {
+        "0": {
+            "kind": "JSDocReturnTag",
+            "pos": 8,
+            "end": 25,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 16,
+                "text": "returns"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 17,
+                "end": 25,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 18,
+                    "end": 24
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 25
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
new file mode 100644
index 00000000000..2804a704ba7
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 24,
+    "tags": {
+        "0": {
+            "kind": "JSDocTemplateTag",
+            "pos": 8,
+            "end": 19,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 17,
+                "text": "template"
+            },
+            "typeParameters": {
+                "0": {
+                    "kind": "TypeParameter",
+                    "pos": 18,
+                    "end": 19,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 18,
+                        "end": 19,
+                        "text": "T"
+                    }
+                },
+                "length": 1,
+                "pos": 17,
+                "end": 19
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 19
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
new file mode 100644
index 00000000000..a55761a52b7
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
@@ -0,0 +1,53 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 26,
+    "tags": {
+        "0": {
+            "kind": "JSDocTemplateTag",
+            "pos": 8,
+            "end": 21,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 17,
+                "text": "template"
+            },
+            "typeParameters": {
+                "0": {
+                    "kind": "TypeParameter",
+                    "pos": 18,
+                    "end": 19,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 18,
+                        "end": 19,
+                        "text": "K"
+                    }
+                },
+                "1": {
+                    "kind": "TypeParameter",
+                    "pos": 20,
+                    "end": 21,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 20,
+                        "end": 21,
+                        "text": "V"
+                    }
+                },
+                "length": 2,
+                "pos": 17,
+                "end": 21
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 21
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
new file mode 100644
index 00000000000..64e6e206e11
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
@@ -0,0 +1,53 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 27,
+    "tags": {
+        "0": {
+            "kind": "JSDocTemplateTag",
+            "pos": 8,
+            "end": 22,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 17,
+                "text": "template"
+            },
+            "typeParameters": {
+                "0": {
+                    "kind": "TypeParameter",
+                    "pos": 18,
+                    "end": 19,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 18,
+                        "end": 19,
+                        "text": "K"
+                    }
+                },
+                "1": {
+                    "kind": "TypeParameter",
+                    "pos": 21,
+                    "end": 22,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 21,
+                        "end": 22,
+                        "text": "V"
+                    }
+                },
+                "length": 2,
+                "pos": 17,
+                "end": 22
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 22
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
new file mode 100644
index 00000000000..64e6e206e11
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
@@ -0,0 +1,53 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 27,
+    "tags": {
+        "0": {
+            "kind": "JSDocTemplateTag",
+            "pos": 8,
+            "end": 22,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 17,
+                "text": "template"
+            },
+            "typeParameters": {
+                "0": {
+                    "kind": "TypeParameter",
+                    "pos": 18,
+                    "end": 19,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 18,
+                        "end": 19,
+                        "text": "K"
+                    }
+                },
+                "1": {
+                    "kind": "TypeParameter",
+                    "pos": 21,
+                    "end": 22,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 21,
+                        "end": 22,
+                        "text": "V"
+                    }
+                },
+                "length": 2,
+                "pos": 17,
+                "end": 22
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 22
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
new file mode 100644
index 00000000000..9b5a4a6c790
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
@@ -0,0 +1,53 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 28,
+    "tags": {
+        "0": {
+            "kind": "JSDocTemplateTag",
+            "pos": 8,
+            "end": 23,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 17,
+                "text": "template"
+            },
+            "typeParameters": {
+                "0": {
+                    "kind": "TypeParameter",
+                    "pos": 18,
+                    "end": 19,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 18,
+                        "end": 19,
+                        "text": "K"
+                    }
+                },
+                "1": {
+                    "kind": "TypeParameter",
+                    "pos": 22,
+                    "end": 23,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 22,
+                        "end": 23,
+                        "text": "V"
+                    }
+                },
+                "length": 2,
+                "pos": 17,
+                "end": 23
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 23
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
new file mode 100644
index 00000000000..d5c1c997b02
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
@@ -0,0 +1,53 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 60,
+    "tags": {
+        "0": {
+            "kind": "JSDocTemplateTag",
+            "pos": 8,
+            "end": 23,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 17,
+                "text": "template"
+            },
+            "typeParameters": {
+                "0": {
+                    "kind": "TypeParameter",
+                    "pos": 18,
+                    "end": 19,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 18,
+                        "end": 19,
+                        "text": "K"
+                    }
+                },
+                "1": {
+                    "kind": "TypeParameter",
+                    "pos": 22,
+                    "end": 23,
+                    "name": {
+                        "kind": "Identifier",
+                        "pos": 22,
+                        "end": 23,
+                        "text": "V"
+                    }
+                },
+                "length": 2,
+                "pos": 17,
+                "end": 23
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 23
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
new file mode 100644
index 00000000000..da465077066
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
@@ -0,0 +1,74 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 60,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 29,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 15,
+                "end": 23,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 16,
+                    "end": 22
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 24,
+                "end": 29,
+                "text": "name1"
+            }
+        },
+        "1": {
+            "kind": "JSDocParameterTag",
+            "pos": 34,
+            "end": 55,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 34,
+                "end": 35
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 35,
+                "end": 40,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 41,
+                "end": 49,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 42,
+                    "end": 48
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 50,
+                "end": 55,
+                "text": "name2"
+            }
+        },
+        "length": 2,
+        "pos": 8,
+        "end": 55
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
new file mode 100644
index 00000000000..c995aa8bf22
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 56,
+    "tags": {
+        "0": {
+            "kind": "JSDocParameterTag",
+            "pos": 8,
+            "end": 29,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 14,
+                "text": "param"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 15,
+                "end": 23,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 16,
+                    "end": 22
+                }
+            },
+            "postParameterName": {
+                "kind": "Identifier",
+                "pos": 24,
+                "end": 29,
+                "text": "name1"
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 29
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
new file mode 100644
index 00000000000..3fe305d4106
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
@@ -0,0 +1,36 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 27,
+    "tags": {
+        "0": {
+            "kind": "JSDocTypeTag",
+            "pos": 8,
+            "end": 22,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 13,
+                "text": "type"
+            },
+            "typeExpression": {
+                "kind": "JSDocTypeExpression",
+                "pos": 14,
+                "end": 22,
+                "type": {
+                    "kind": "NumberKeyword",
+                    "pos": 15,
+                    "end": 21
+                }
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 22
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
new file mode 100644
index 00000000000..2d6d58d36b2
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
@@ -0,0 +1,135 @@
+{
+    "kind": "JSDocComment",
+    "pos": 0,
+    "end": 102,
+    "tags": {
+        "0": {
+            "kind": "JSDocTypedefTag",
+            "pos": 8,
+            "end": 97,
+            "atToken": {
+                "kind": "AtToken",
+                "pos": 8,
+                "end": 9
+            },
+            "tagName": {
+                "kind": "Identifier",
+                "pos": 9,
+                "end": 16,
+                "text": "typedef"
+            },
+            "name": {
+                "kind": "Identifier",
+                "pos": 17,
+                "end": 23,
+                "text": "People"
+            },
+            "jsDocTypeLiteral": {
+                "kind": "JSDocTypeLiteral",
+                "pos": 23,
+                "end": 97,
+                "jsDocTypeTag": {
+                    "kind": "JSDocTypeTag",
+                    "pos": 27,
+                    "end": 42,
+                    "atToken": {
+                        "kind": "AtToken",
+                        "pos": 27,
+                        "end": 29
+                    },
+                    "tagName": {
+                        "kind": "Identifier",
+                        "pos": 29,
+                        "end": 33,
+                        "text": "type"
+                    },
+                    "typeExpression": {
+                        "kind": "JSDocTypeExpression",
+                        "pos": 34,
+                        "end": 42,
+                        "type": {
+                            "kind": "JSDocTypeReference",
+                            "pos": 35,
+                            "end": 41,
+                            "name": {
+                                "kind": "Identifier",
+                                "pos": 35,
+                                "end": 41,
+                                "text": "Object"
+                            }
+                        }
+                    }
+                },
+                "jsDocPropertyTags": [
+                    {
+                        "kind": "JSDocPropertyTag",
+                        "pos": 46,
+                        "end": 69,
+                        "atToken": {
+                            "kind": "AtToken",
+                            "pos": 46,
+                            "end": 48
+                        },
+                        "tagName": {
+                            "kind": "Identifier",
+                            "pos": 48,
+                            "end": 56,
+                            "text": "property"
+                        },
+                        "name": {
+                            "kind": "Identifier",
+                            "pos": 66,
+                            "end": 69,
+                            "text": "age"
+                        },
+                        "typeExpression": {
+                            "kind": "JSDocTypeExpression",
+                            "pos": 57,
+                            "end": 65,
+                            "type": {
+                                "kind": "NumberKeyword",
+                                "pos": 58,
+                                "end": 64
+                            }
+                        }
+                    },
+                    {
+                        "kind": "JSDocPropertyTag",
+                        "pos": 73,
+                        "end": 97,
+                        "atToken": {
+                            "kind": "AtToken",
+                            "pos": 73,
+                            "end": 75
+                        },
+                        "tagName": {
+                            "kind": "Identifier",
+                            "pos": 75,
+                            "end": 83,
+                            "text": "property"
+                        },
+                        "name": {
+                            "kind": "Identifier",
+                            "pos": 93,
+                            "end": 97,
+                            "text": "name"
+                        },
+                        "typeExpression": {
+                            "kind": "JSDocTypeExpression",
+                            "pos": 84,
+                            "end": 92,
+                            "type": {
+                                "kind": "StringKeyword",
+                                "pos": 85,
+                                "end": 91
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "length": 1,
+        "pos": 8,
+        "end": 97
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.allType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.allType.json
new file mode 100644
index 00000000000..68081a1b9e4
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.allType.json
@@ -0,0 +1,5 @@
+{
+    "kind": "JSDocAllType",
+    "pos": 1,
+    "end": 2
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType1.json
new file mode 100644
index 00000000000..cd9255d392c
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType1.json
@@ -0,0 +1,16 @@
+{
+    "kind": "JSDocArrayType",
+    "pos": 1,
+    "end": 4,
+    "elementType": {
+        "kind": "JSDocTypeReference",
+        "pos": 1,
+        "end": 2,
+        "name": {
+            "kind": "Identifier",
+            "pos": 1,
+            "end": 2,
+            "text": "a"
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType2.json
new file mode 100644
index 00000000000..1fe6d184599
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType2.json
@@ -0,0 +1,21 @@
+{
+    "kind": "JSDocArrayType",
+    "pos": 1,
+    "end": 6,
+    "elementType": {
+        "kind": "JSDocArrayType",
+        "pos": 1,
+        "end": 4,
+        "elementType": {
+            "kind": "JSDocTypeReference",
+            "pos": 1,
+            "end": 2,
+            "name": {
+                "kind": "Identifier",
+                "pos": 1,
+                "end": 2,
+                "text": "a"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType3.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType3.json
new file mode 100644
index 00000000000..2fe27c67a1b
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.arrayType3.json
@@ -0,0 +1,26 @@
+{
+    "kind": "JSDocOptionalType",
+    "pos": 1,
+    "end": 7,
+    "type": {
+        "kind": "JSDocArrayType",
+        "pos": 1,
+        "end": 6,
+        "elementType": {
+            "kind": "JSDocArrayType",
+            "pos": 1,
+            "end": 4,
+            "elementType": {
+                "kind": "JSDocTypeReference",
+                "pos": 1,
+                "end": 2,
+                "name": {
+                    "kind": "Identifier",
+                    "pos": 1,
+                    "end": 2,
+                    "text": "a"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionReturnType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionReturnType1.json
new file mode 100644
index 00000000000..209b9440a87
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionReturnType1.json
@@ -0,0 +1,30 @@
+{
+    "kind": "JSDocFunctionType",
+    "pos": 1,
+    "end": 26,
+    "parameters": {
+        "0": {
+            "kind": "Parameter",
+            "pos": 10,
+            "end": 16,
+            "type": {
+                "kind": "StringKeyword",
+                "pos": 10,
+                "end": 16
+            }
+        },
+        "1": {
+            "kind": "Parameter",
+            "pos": 17,
+            "end": 25,
+            "type": {
+                "kind": "BooleanKeyword",
+                "pos": 17,
+                "end": 25
+            }
+        },
+        "length": 2,
+        "pos": 10,
+        "end": 25
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType1.json
new file mode 100644
index 00000000000..d3be94a76ff
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType1.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocFunctionType",
+    "pos": 1,
+    "end": 11,
+    "parameters": {
+        "length": 0,
+        "pos": 10,
+        "end": 10
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType2.json
new file mode 100644
index 00000000000..209b9440a87
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType2.json
@@ -0,0 +1,30 @@
+{
+    "kind": "JSDocFunctionType",
+    "pos": 1,
+    "end": 26,
+    "parameters": {
+        "0": {
+            "kind": "Parameter",
+            "pos": 10,
+            "end": 16,
+            "type": {
+                "kind": "StringKeyword",
+                "pos": 10,
+                "end": 16
+            }
+        },
+        "1": {
+            "kind": "Parameter",
+            "pos": 17,
+            "end": 25,
+            "type": {
+                "kind": "BooleanKeyword",
+                "pos": 17,
+                "end": 25
+            }
+        },
+        "length": 2,
+        "pos": 10,
+        "end": 25
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword1.json
new file mode 100644
index 00000000000..80b1378b291
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword1.json
@@ -0,0 +1,12 @@
+{
+    "kind": "JSDocTypeReference",
+    "pos": 1,
+    "end": 4,
+    "name": {
+        "kind": "Identifier",
+        "pos": 1,
+        "end": 4,
+        "originalKeywordKind": "VarKeyword",
+        "text": "var"
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword2.json
new file mode 100644
index 00000000000..4148937b278
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword2.json
@@ -0,0 +1,5 @@
+{
+    "kind": "NullKeyword",
+    "pos": 1,
+    "end": 5
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword3.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword3.json
new file mode 100644
index 00000000000..c61912f9eb8
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword3.json
@@ -0,0 +1,5 @@
+{
+    "kind": "UndefinedKeyword",
+    "pos": 1,
+    "end": 10
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.newType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.newType1.json
new file mode 100644
index 00000000000..194037970c5
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.newType1.json
@@ -0,0 +1,27 @@
+{
+    "kind": "JSDocConstructorType",
+    "pos": 1,
+    "end": 8,
+    "type": {
+        "kind": "JSDocTypeReference",
+        "pos": 5,
+        "end": 8,
+        "name": {
+            "kind": "FirstNode",
+            "pos": 5,
+            "end": 8,
+            "left": {
+                "kind": "Identifier",
+                "pos": 5,
+                "end": 6,
+                "text": "a"
+            },
+            "right": {
+                "kind": "Identifier",
+                "pos": 7,
+                "end": 8,
+                "text": "b"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nonNullableType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nonNullableType.json
new file mode 100644
index 00000000000..e089754a0de
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nonNullableType.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocNonNullableType",
+    "pos": 1,
+    "end": 8,
+    "type": {
+        "kind": "NumberKeyword",
+        "pos": 2,
+        "end": 8
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nonNullableType2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nonNullableType2.json
new file mode 100644
index 00000000000..377b19d0f70
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nonNullableType2.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocNonNullableType",
+    "pos": 1,
+    "end": 8,
+    "type": {
+        "kind": "NumberKeyword",
+        "pos": 1,
+        "end": 7
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nullableType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nullableType.json
new file mode 100644
index 00000000000..9c4457fba12
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nullableType.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocNullableType",
+    "pos": 1,
+    "end": 8,
+    "type": {
+        "kind": "NumberKeyword",
+        "pos": 2,
+        "end": 8
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nullableType2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nullableType2.json
new file mode 100644
index 00000000000..03aea7be8c5
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.nullableType2.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocNullableType",
+    "pos": 1,
+    "end": 8,
+    "type": {
+        "kind": "NumberKeyword",
+        "pos": 1,
+        "end": 7
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.optionalNullable.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.optionalNullable.json
new file mode 100644
index 00000000000..f4940c28475
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.optionalNullable.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocOptionalType",
+    "pos": 1,
+    "end": 3,
+    "type": {
+        "kind": "JSDocUnknownType",
+        "pos": 1,
+        "end": 2
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.optionalType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.optionalType.json
new file mode 100644
index 00000000000..6069107cc6e
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.optionalType.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocOptionalType",
+    "pos": 1,
+    "end": 8,
+    "type": {
+        "kind": "NumberKeyword",
+        "pos": 1,
+        "end": 7
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType1.json
new file mode 100644
index 00000000000..ab9bb050a89
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType1.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 3,
+    "members": {
+        "length": 0,
+        "pos": 2,
+        "end": 2
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType2.json
new file mode 100644
index 00000000000..73ff5dbfa60
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType2.json
@@ -0,0 +1,21 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 6,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 5,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 5,
+                "text": "foo"
+            }
+        },
+        "length": 1,
+        "pos": 2,
+        "end": 5
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType3.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType3.json
new file mode 100644
index 00000000000..0ffac6cba8f
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType3.json
@@ -0,0 +1,26 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 14,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 13,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 5,
+                "text": "foo"
+            },
+            "type": {
+                "kind": "NumberKeyword",
+                "pos": 6,
+                "end": 13
+            }
+        },
+        "length": 1,
+        "pos": 2,
+        "end": 13
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType4.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType4.json
new file mode 100644
index 00000000000..f49c2fd22ae
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType4.json
@@ -0,0 +1,32 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 11,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 5,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 5,
+                "text": "foo"
+            }
+        },
+        "1": {
+            "kind": "JSDocRecordMember",
+            "pos": 6,
+            "end": 10,
+            "name": {
+                "kind": "Identifier",
+                "pos": 6,
+                "end": 10,
+                "text": "bar"
+            }
+        },
+        "length": 2,
+        "pos": 2,
+        "end": 10
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType5.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType5.json
new file mode 100644
index 00000000000..4474dba8e21
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType5.json
@@ -0,0 +1,37 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 19,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 13,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 5,
+                "text": "foo"
+            },
+            "type": {
+                "kind": "NumberKeyword",
+                "pos": 6,
+                "end": 13
+            }
+        },
+        "1": {
+            "kind": "JSDocRecordMember",
+            "pos": 14,
+            "end": 18,
+            "name": {
+                "kind": "Identifier",
+                "pos": 14,
+                "end": 18,
+                "text": "bar"
+            }
+        },
+        "length": 2,
+        "pos": 2,
+        "end": 18
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType6.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType6.json
new file mode 100644
index 00000000000..a88005b0cec
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType6.json
@@ -0,0 +1,37 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 19,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 5,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 5,
+                "text": "foo"
+            }
+        },
+        "1": {
+            "kind": "JSDocRecordMember",
+            "pos": 6,
+            "end": 18,
+            "name": {
+                "kind": "Identifier",
+                "pos": 6,
+                "end": 10,
+                "text": "bar"
+            },
+            "type": {
+                "kind": "NumberKeyword",
+                "pos": 11,
+                "end": 18
+            }
+        },
+        "length": 2,
+        "pos": 2,
+        "end": 18
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType7.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType7.json
new file mode 100644
index 00000000000..e69f9a74682
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType7.json
@@ -0,0 +1,42 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 27,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 13,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 5,
+                "text": "foo"
+            },
+            "type": {
+                "kind": "NumberKeyword",
+                "pos": 6,
+                "end": 13
+            }
+        },
+        "1": {
+            "kind": "JSDocRecordMember",
+            "pos": 14,
+            "end": 26,
+            "name": {
+                "kind": "Identifier",
+                "pos": 14,
+                "end": 18,
+                "text": "bar"
+            },
+            "type": {
+                "kind": "NumberKeyword",
+                "pos": 19,
+                "end": 26
+            }
+        },
+        "length": 2,
+        "pos": 2,
+        "end": 26
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType8.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType8.json
new file mode 100644
index 00000000000..35701931097
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType8.json
@@ -0,0 +1,22 @@
+{
+    "kind": "JSDocRecordType",
+    "pos": 1,
+    "end": 11,
+    "members": {
+        "0": {
+            "kind": "JSDocRecordMember",
+            "pos": 2,
+            "end": 10,
+            "name": {
+                "kind": "Identifier",
+                "pos": 2,
+                "end": 10,
+                "originalKeywordKind": "FunctionKeyword",
+                "text": "function"
+            }
+        },
+        "length": 1,
+        "pos": 2,
+        "end": 10
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.thisType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.thisType1.json
new file mode 100644
index 00000000000..f0b8038b586
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.thisType1.json
@@ -0,0 +1,27 @@
+{
+    "kind": "JSDocThisType",
+    "pos": 1,
+    "end": 9,
+    "type": {
+        "kind": "JSDocTypeReference",
+        "pos": 6,
+        "end": 9,
+        "name": {
+            "kind": "FirstNode",
+            "pos": 6,
+            "end": 9,
+            "left": {
+                "kind": "Identifier",
+                "pos": 6,
+                "end": 7,
+                "text": "a"
+            },
+            "right": {
+                "kind": "Identifier",
+                "pos": 8,
+                "end": 9,
+                "text": "b"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.topLevelNoParenUnionType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.topLevelNoParenUnionType.json
new file mode 100644
index 00000000000..dd9ef74f8c6
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.topLevelNoParenUnionType.json
@@ -0,0 +1,20 @@
+{
+    "kind": "JSDocUnionType",
+    "pos": 1,
+    "end": 14,
+    "types": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 1,
+            "end": 7
+        },
+        "1": {
+            "kind": "StringKeyword",
+            "pos": 8,
+            "end": 14
+        },
+        "length": 2,
+        "pos": 1,
+        "end": 14
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType0.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType0.json
new file mode 100644
index 00000000000..2b5580f7622
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType0.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocTupleType",
+    "pos": 1,
+    "end": 3,
+    "types": {
+        "length": 0,
+        "pos": 2,
+        "end": 2
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType1.json
new file mode 100644
index 00000000000..f741169be4b
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType1.json
@@ -0,0 +1,15 @@
+{
+    "kind": "JSDocTupleType",
+    "pos": 1,
+    "end": 9,
+    "types": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 2,
+            "end": 8
+        },
+        "length": 1,
+        "pos": 2,
+        "end": 8
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType2.json
new file mode 100644
index 00000000000..939eec1cb0c
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType2.json
@@ -0,0 +1,20 @@
+{
+    "kind": "JSDocTupleType",
+    "pos": 1,
+    "end": 16,
+    "types": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 2,
+            "end": 8
+        },
+        "1": {
+            "kind": "StringKeyword",
+            "pos": 9,
+            "end": 15
+        },
+        "length": 2,
+        "pos": 2,
+        "end": 15
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType3.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType3.json
new file mode 100644
index 00000000000..50b0a702a84
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType3.json
@@ -0,0 +1,25 @@
+{
+    "kind": "JSDocTupleType",
+    "pos": 1,
+    "end": 24,
+    "types": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 2,
+            "end": 8
+        },
+        "1": {
+            "kind": "StringKeyword",
+            "pos": 9,
+            "end": 15
+        },
+        "2": {
+            "kind": "BooleanKeyword",
+            "pos": 16,
+            "end": 23
+        },
+        "length": 3,
+        "pos": 2,
+        "end": 23
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference1.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference1.json
new file mode 100644
index 00000000000..282bc8c8e64
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference1.json
@@ -0,0 +1,21 @@
+{
+    "kind": "JSDocTypeReference",
+    "pos": 1,
+    "end": 11,
+    "name": {
+        "kind": "Identifier",
+        "pos": 1,
+        "end": 2,
+        "text": "a"
+    },
+    "typeArguments": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 4,
+            "end": 10
+        },
+        "length": 1,
+        "pos": 4,
+        "end": 10
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference2.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference2.json
new file mode 100644
index 00000000000..570db907956
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference2.json
@@ -0,0 +1,26 @@
+{
+    "kind": "JSDocTypeReference",
+    "pos": 1,
+    "end": 18,
+    "name": {
+        "kind": "Identifier",
+        "pos": 1,
+        "end": 2,
+        "text": "a"
+    },
+    "typeArguments": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 4,
+            "end": 10
+        },
+        "1": {
+            "kind": "StringKeyword",
+            "pos": 11,
+            "end": 17
+        },
+        "length": 2,
+        "pos": 4,
+        "end": 17
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference3.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference3.json
new file mode 100644
index 00000000000..683c17e582e
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference3.json
@@ -0,0 +1,23 @@
+{
+    "kind": "JSDocTypeReference",
+    "pos": 1,
+    "end": 11,
+    "name": {
+        "kind": "FirstNode",
+        "pos": 1,
+        "end": 11,
+        "left": {
+            "kind": "Identifier",
+            "pos": 1,
+            "end": 2,
+            "text": "a"
+        },
+        "right": {
+            "kind": "Identifier",
+            "pos": 3,
+            "end": 11,
+            "originalKeywordKind": "FunctionKeyword",
+            "text": "function"
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unionType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unionType.json
new file mode 100644
index 00000000000..f9301d05cc5
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unionType.json
@@ -0,0 +1,20 @@
+{
+    "kind": "JSDocUnionType",
+    "pos": 1,
+    "end": 16,
+    "types": {
+        "0": {
+            "kind": "NumberKeyword",
+            "pos": 2,
+            "end": 8
+        },
+        "1": {
+            "kind": "StringKeyword",
+            "pos": 9,
+            "end": 15
+        },
+        "length": 2,
+        "pos": 2,
+        "end": 15
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unknownType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unknownType.json
new file mode 100644
index 00000000000..0fb7af7ef23
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unknownType.json
@@ -0,0 +1,5 @@
+{
+    "kind": "JSDocUnknownType",
+    "pos": 1,
+    "end": 2
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.variadicType.json b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.variadicType.json
new file mode 100644
index 00000000000..2cf6079533c
--- /dev/null
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.variadicType.json
@@ -0,0 +1,10 @@
+{
+    "kind": "JSDocVariadicType",
+    "pos": 1,
+    "end": 10,
+    "type": {
+        "kind": "NumberKeyword",
+        "pos": 4,
+        "end": 10
+    }
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js
index c69316783bd..ec37b3370b0 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js
@@ -7,6 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype.foo = function () { };
+    C.prototype.foo = function* () { };
     return C;
 }());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js
index ce1781fcac2..54550ef72e7 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js
@@ -7,6 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype.foo = function () { };
+    C.prototype.foo = function* () { };
     return C;
 }());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js
index b32bd6bc57e..07d9a021fcd 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js
@@ -7,6 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype[foo] = function () { };
+    C.prototype[foo] = function* () { };
     return C;
 }());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js
index abca2775ea0..f791d4a1156 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js
@@ -7,6 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype. = function () { };
+    C.prototype. = function* () { };
     return C;
 }());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js
index a7d80ae974b..8e19f0db333 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js
@@ -7,6 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype.foo = function () { };
+    C.prototype.foo = function* () { };
     return C;
 }());
diff --git a/tests/baselines/reference/YieldExpression10_es6.js b/tests/baselines/reference/YieldExpression10_es6.js
index 1400e8c277e..e1dd44b676b 100644
--- a/tests/baselines/reference/YieldExpression10_es6.js
+++ b/tests/baselines/reference/YieldExpression10_es6.js
@@ -6,7 +6,7 @@ var v = { * foo() {
 
 
 //// [YieldExpression10_es6.js]
-var v = { foo: function () {
+var v = { foo: function* () {
         yield (foo);
     }
 };
diff --git a/tests/baselines/reference/YieldExpression11_es6.js b/tests/baselines/reference/YieldExpression11_es6.js
index 6260309473d..fb4f83c7197 100644
--- a/tests/baselines/reference/YieldExpression11_es6.js
+++ b/tests/baselines/reference/YieldExpression11_es6.js
@@ -9,7 +9,7 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype.foo = function () {
+    C.prototype.foo = function* () {
         yield (foo);
     };
     return C;
diff --git a/tests/baselines/reference/YieldExpression13_es6.js b/tests/baselines/reference/YieldExpression13_es6.js
index 4923f124707..c75e964675a 100644
--- a/tests/baselines/reference/YieldExpression13_es6.js
+++ b/tests/baselines/reference/YieldExpression13_es6.js
@@ -2,4 +2,4 @@
 function* foo() { yield }
 
 //// [YieldExpression13_es6.js]
-function foo() { yield; }
+function* foo() { yield; }
diff --git a/tests/baselines/reference/YieldExpression16_es6.js b/tests/baselines/reference/YieldExpression16_es6.js
index 4bb019c8dbe..0937cfedcb9 100644
--- a/tests/baselines/reference/YieldExpression16_es6.js
+++ b/tests/baselines/reference/YieldExpression16_es6.js
@@ -6,7 +6,7 @@ function* foo() {
 }
 
 //// [YieldExpression16_es6.js]
-function foo() {
+function* foo() {
     function bar() {
         yield foo;
     }
diff --git a/tests/baselines/reference/YieldExpression19_es6.js b/tests/baselines/reference/YieldExpression19_es6.js
index d40b6e89a9d..444c7af7be1 100644
--- a/tests/baselines/reference/YieldExpression19_es6.js
+++ b/tests/baselines/reference/YieldExpression19_es6.js
@@ -8,9 +8,9 @@ function*foo() {
 }
 
 //// [YieldExpression19_es6.js]
-function foo() {
+function* foo() {
     function bar() {
-        function quux() {
+        function* quux() {
             yield (foo);
         }
     }
diff --git a/tests/baselines/reference/YieldExpression3_es6.js b/tests/baselines/reference/YieldExpression3_es6.js
index c69e8b29700..737b3534886 100644
--- a/tests/baselines/reference/YieldExpression3_es6.js
+++ b/tests/baselines/reference/YieldExpression3_es6.js
@@ -5,7 +5,7 @@ function* foo() {
 }
 
 //// [YieldExpression3_es6.js]
-function foo() {
+function* foo() {
     yield;
     yield;
 }
diff --git a/tests/baselines/reference/YieldExpression4_es6.js b/tests/baselines/reference/YieldExpression4_es6.js
index 5f50b721bc8..c97a7949b2b 100644
--- a/tests/baselines/reference/YieldExpression4_es6.js
+++ b/tests/baselines/reference/YieldExpression4_es6.js
@@ -5,7 +5,7 @@ function* foo() {
 }
 
 //// [YieldExpression4_es6.js]
-function foo() {
+function* foo() {
     yield;
     yield;
 }
diff --git a/tests/baselines/reference/YieldExpression5_es6.js b/tests/baselines/reference/YieldExpression5_es6.js
index 82b405a4cda..8599cfdb6bb 100644
--- a/tests/baselines/reference/YieldExpression5_es6.js
+++ b/tests/baselines/reference/YieldExpression5_es6.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [YieldExpression5_es6.js]
-function foo() {
+function* foo() {
     yield* ;
 }
diff --git a/tests/baselines/reference/YieldExpression6_es6.js b/tests/baselines/reference/YieldExpression6_es6.js
index 67d5a745e72..c511daec989 100644
--- a/tests/baselines/reference/YieldExpression6_es6.js
+++ b/tests/baselines/reference/YieldExpression6_es6.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [YieldExpression6_es6.js]
-function foo() {
+function* foo() {
     yield* foo;
 }
diff --git a/tests/baselines/reference/YieldExpression7_es6.js b/tests/baselines/reference/YieldExpression7_es6.js
index 226555dd6ef..8055b96ec73 100644
--- a/tests/baselines/reference/YieldExpression7_es6.js
+++ b/tests/baselines/reference/YieldExpression7_es6.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [YieldExpression7_es6.js]
-function foo() {
+function* foo() {
     yield foo;
 }
diff --git a/tests/baselines/reference/YieldExpression8_es6.js b/tests/baselines/reference/YieldExpression8_es6.js
index 990164af20d..cc92b79c722 100644
--- a/tests/baselines/reference/YieldExpression8_es6.js
+++ b/tests/baselines/reference/YieldExpression8_es6.js
@@ -6,6 +6,6 @@ function* foo() {
 
 //// [YieldExpression8_es6.js]
 yield(foo);
-function foo() {
+function* foo() {
     yield (foo);
 }
diff --git a/tests/baselines/reference/YieldExpression9_es6.js b/tests/baselines/reference/YieldExpression9_es6.js
index f38aa811fec..a2ffa0fa01b 100644
--- a/tests/baselines/reference/YieldExpression9_es6.js
+++ b/tests/baselines/reference/YieldExpression9_es6.js
@@ -4,6 +4,6 @@ var v = function*() {
 }
 
 //// [YieldExpression9_es6.js]
-var v = function () {
+var v = function* () {
     yield (foo);
 };
diff --git a/tests/baselines/reference/YieldStarExpression3_es6.js b/tests/baselines/reference/YieldStarExpression3_es6.js
index 7463fc01bc1..e64306dc4cf 100644
--- a/tests/baselines/reference/YieldStarExpression3_es6.js
+++ b/tests/baselines/reference/YieldStarExpression3_es6.js
@@ -4,6 +4,6 @@ function *g() {
 }
 
 //// [YieldStarExpression3_es6.js]
-function g() {
+function* g() {
     yield* ;
 }
diff --git a/tests/baselines/reference/YieldStarExpression4_es6.js b/tests/baselines/reference/YieldStarExpression4_es6.js
index 6283b81cca3..8ec5fa0c933 100644
--- a/tests/baselines/reference/YieldStarExpression4_es6.js
+++ b/tests/baselines/reference/YieldStarExpression4_es6.js
@@ -4,6 +4,6 @@ function *g() {
 }
 
 //// [YieldStarExpression4_es6.js]
-function g() {
+function* g() {
     yield* [];
 }
diff --git a/tests/baselines/reference/abstractProperty.js b/tests/baselines/reference/abstractProperty.js
index 9564be862dc..87b5475111b 100644
--- a/tests/baselines/reference/abstractProperty.js
+++ b/tests/baselines/reference/abstractProperty.js
@@ -30,12 +30,6 @@ var __extends = (this && this.__extends) || function (d, b) {
 var B = (function () {
     function B() {
     }
-    Object.defineProperty(B.prototype, "readonlyProp", {
-        get: function () { },
-        set: function (val) { },
-        enumerable: true,
-        configurable: true
-    });
     return B;
 }());
 var C = (function (_super) {
diff --git a/tests/baselines/reference/abstractPropertyNegative.js b/tests/baselines/reference/abstractPropertyNegative.js
index 55c9aea9411..5fc340c58d0 100644
--- a/tests/baselines/reference/abstractPropertyNegative.js
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -52,18 +52,6 @@ var __extends = (this && this.__extends) || function (d, b) {
 var B = (function () {
     function B() {
     }
-    Object.defineProperty(B.prototype, "readonlyProp", {
-        get: function () { },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(B.prototype, "mismatch", {
-        get: function () { },
-        set: function (val) { } // error, not same type
-        ,
-        enumerable: true,
-        configurable: true
-    });
     return B;
 }());
 var C = (function (_super) {
@@ -97,11 +85,6 @@ var WrongTypePropertyImpl = (function (_super) {
 var WrongTypeAccessor = (function () {
     function WrongTypeAccessor() {
     }
-    Object.defineProperty(WrongTypeAccessor.prototype, "num", {
-        get: function () { },
-        enumerable: true,
-        configurable: true
-    });
     return WrongTypeAccessor;
 }());
 var WrongTypeAccessorImpl = (function (_super) {
@@ -128,7 +111,6 @@ var AbstractAccessorMismatch = (function () {
     function AbstractAccessorMismatch() {
     }
     Object.defineProperty(AbstractAccessorMismatch.prototype, "p1", {
-        get: function () { },
         set: function (val) { },
         enumerable: true,
         configurable: true
@@ -136,7 +118,6 @@ var AbstractAccessorMismatch = (function () {
     ;
     Object.defineProperty(AbstractAccessorMismatch.prototype, "p2", {
         get: function () { return "should work"; },
-        set: function (val) { },
         enumerable: true,
         configurable: true
     });
diff --git a/tests/baselines/reference/aliasesInSystemModule1.js b/tests/baselines/reference/aliasesInSystemModule1.js
index 46d2b061dd3..24d7a5d1b0b 100644
--- a/tests/baselines/reference/aliasesInSystemModule1.js
+++ b/tests/baselines/reference/aliasesInSystemModule1.js
@@ -17,17 +17,17 @@ module M {
   
 
 //// [aliasesInSystemModule1.js]
-System.register(['foo'], function(exports_1, context_1) {
+System.register(["foo"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var alias;
-    var cls, cls2, x, y, z, M;
+    var alias, cls, cls2, x, y, z, M;
     return {
-        setters:[
+        setters: [
             function (alias_1) {
                 alias = alias_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             cls = alias.Class;
             exports_1("cls2", cls2 = alias.Class);
             x = new alias.Class();
@@ -40,5 +40,5 @@ System.register(['foo'], function(exports_1, context_1) {
                 var z = new cls2();
             })(M || (M = {}));
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/aliasesInSystemModule2.js b/tests/baselines/reference/aliasesInSystemModule2.js
index e30ba4fea56..71fe558d43a 100644
--- a/tests/baselines/reference/aliasesInSystemModule2.js
+++ b/tests/baselines/reference/aliasesInSystemModule2.js
@@ -16,17 +16,17 @@ module M {
 }
 
 //// [aliasesInSystemModule2.js]
-System.register(["foo"], function(exports_1, context_1) {
+System.register(["foo"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var foo_1;
-    var cls, cls2, x, y, z, M;
+    var foo_1, cls, cls2, x, y, z, M;
     return {
-        setters:[
+        setters: [
             function (foo_1_1) {
                 foo_1 = foo_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             cls = foo_1.alias.Class;
             exports_1("cls2", cls2 = foo_1.alias.Class);
             x = new foo_1.alias.Class();
@@ -39,5 +39,5 @@ System.register(["foo"], function(exports_1, context_1) {
                 var z = new cls2();
             })(M || (M = {}));
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.js b/tests/baselines/reference/allowSyntheticDefaultImports2.js
index 87e47f9c9a1..93c13617e4a 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports2.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports2.js
@@ -10,13 +10,13 @@ export class Foo {
 }
 
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var Foo;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             Foo = (function () {
                 function Foo() {
                 }
@@ -24,21 +24,21 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("Foo", Foo);
         }
-    }
+    };
 });
 //// [a.js]
-System.register(["./b"], function(exports_1, context_1) {
+System.register(["./b"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var b_1;
-    var x;
+    var b_1, x;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", x = new b_1["default"].Foo());
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.js b/tests/baselines/reference/allowSyntheticDefaultImports3.js
index 348ce42a60a..74b1dcb776d 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports3.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports3.js
@@ -11,13 +11,13 @@ export class Foo {
 
 
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var Foo;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             Foo = (function () {
                 function Foo() {
                 }
@@ -25,21 +25,21 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("Foo", Foo);
         }
-    }
+    };
 });
 //// [a.js]
-System.register(["./b"], function(exports_1, context_1) {
+System.register(["./b"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var b_1;
-    var x;
+    var b_1, x;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", x = new b_1["default"].Foo());
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.js b/tests/baselines/reference/allowSyntheticDefaultImports5.js
index f59226e152d..765d1140864 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports5.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports5.js
@@ -12,18 +12,18 @@ export var x = new Foo();
 
 
 //// [a.js]
-System.register(["./b"], function(exports_1, context_1) {
+System.register(["./b"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var b_1;
-    var x;
+    var b_1, x;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", x = new b_1["default"]());
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.js b/tests/baselines/reference/allowSyntheticDefaultImports6.js
index d2f25e538c5..9ae7acae919 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports6.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports6.js
@@ -12,18 +12,18 @@ export var x = new Foo();
 
 
 //// [a.js]
-System.register(["./b"], function(exports_1, context_1) {
+System.register(["./b"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var b_1;
-    var x;
+    var b_1, x;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", x = new b_1["default"]());
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports7.js b/tests/baselines/reference/allowSyntheticDefaultImports7.js
index 51cc63e6e11..6d0ea5b3be0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports7.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports7.js
@@ -11,18 +11,19 @@ Foo.bar();
 Foo.foo();
 
 //// [a.js]
-System.register(["./b"], function(exports_1, context_1) {
+System.register(["./b"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var b_1;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             b_1["default"].bar();
             b_1["default"].foo();
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports8.js b/tests/baselines/reference/allowSyntheticDefaultImports8.js
index 3c3c5fa8d28..5a77e51e6a2 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports8.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports8.js
@@ -11,18 +11,19 @@ Foo.bar();
 Foo.foo();
 
 //// [a.js]
-System.register(["./b"], function(exports_1, context_1) {
+System.register(["./b"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var b_1;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             b_1["default"].bar();
             b_1["default"].foo();
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index 42375bc1d09..b92993128ab 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/tests/baselines/reference/ambientDeclarationsExternal.js
@@ -29,6 +29,6 @@ var n: number;
 //// [consumer.js]
 "use strict";
 // Ambient external module members are always exported with or without export keyword when module lacks export assignment
-var imp3 = require('equ2');
+var imp3 = require("equ2");
 var n = imp3.x;
 var n;
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
index 77d8e2d830d..c91adaff864 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
@@ -20,7 +20,7 @@ var c = new A();
 
 //// [ambientExternalModuleWithInternalImportDeclaration_0.js]
 //// [ambientExternalModuleWithInternalImportDeclaration_1.js]
-define(["require", "exports", 'M'], function (require, exports, A) {
+define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
     var c = new A();
 });
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
index 158992234a2..4c70a338bc3 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
@@ -19,7 +19,7 @@ var c = new A();
 
 //// [ambientExternalModuleWithoutInternalImportDeclaration_0.js]
 //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js]
-define(["require", "exports", 'M'], function (require, exports, A) {
+define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
     var c = new A();
 });
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index beb91191bc0..b8e9f5346b0 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -38,10 +38,10 @@ define(["require", "exports"], function (require, exports) {
         function C1() {
             this.m1 = 42;
         }
-        C1.s1 = true;
         return C1;
     }());
     exports.C1 = C1;
+    C1.s1 = true;
     (function (E1) {
         E1[E1["A"] = 0] = "A";
         E1[E1["B"] = 1] = "B";
diff --git a/tests/baselines/reference/anonymousDefaultExportsSystem.js b/tests/baselines/reference/anonymousDefaultExportsSystem.js
index f68806eb1af..c1d2cf522fb 100644
--- a/tests/baselines/reference/anonymousDefaultExportsSystem.js
+++ b/tests/baselines/reference/anonymousDefaultExportsSystem.js
@@ -7,28 +7,28 @@ export default class {}
 export default function() {}
 
 //// [a.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var default_1;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             default_1 = class {
             };
             exports_1("default", default_1);
         }
-    }
+    };
 });
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function default_1() { }
     exports_1("default", default_1);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index 203b234dfa0..97910161999 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js
@@ -7,14 +7,14 @@ export default class {}
 export default function() {}
 
 //// [a.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     class default_1 {
     }
@@ -22,14 +22,14 @@ export default function() {}
     exports.default = default_1;
 });
 //// [b.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     function default_1() { }
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/anonymousModules.js b/tests/baselines/reference/anonymousModules.js
index 39b21f6990a..5270594e8ee 100644
--- a/tests/baselines/reference/anonymousModules.js
+++ b/tests/baselines/reference/anonymousModules.js
@@ -16,10 +16,10 @@ module {
 //// [anonymousModules.js]
 module;
 {
-    exports.foo = 1;
+    export var foo = 1;
     module;
     {
-        exports.bar = 1;
+        export var bar = 1;
     }
     var bar = 2;
     module;
diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js
index 7b424107bd1..73e3be15e11 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -102,9 +102,10 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
+var _this = this;
 // Arrow function used in with statement
 with (window) {
-    var p = function () { return this; };
+    var p = function () { return _this; };
 }
 // Arrow function as argument to super call
 var Base = (function () {
@@ -130,6 +131,7 @@ var arr; // Incorrect error here (bug 829597)
 // Arrow function as enum value
 var E;
 (function (E) {
+    var _this = this;
     E[E["x"] = function () { return 4; }] = "x";
     E[E["y"] = (function () { return _this; }).length] = "y"; // error, can't use this in enum
 })(E || (E = {}));
@@ -142,9 +144,10 @@ var M;
 // Repeat above for module members that are functions? (necessary to redo all of them?)
 var M2;
 (function (M2) {
+    var _this = this;
     // Arrow function used in with statement
     with (window) {
-        var p = function () { return this; };
+        var p = function () { return _this; };
     }
     // Arrow function as argument to super call
     var Base = (function () {
@@ -170,6 +173,7 @@ var M2;
     // Arrow function as enum value
     var E;
     (function (E) {
+        var _this = this;
         E[E["x"] = function () { return 4; }] = "x";
         E[E["y"] = (function () { return _this; }).length] = "y";
     })(E || (E = {}));
diff --git a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js
index 931520294e9..a828e1248c5 100644
--- a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js
+++ b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.js
@@ -6,6 +6,6 @@ var square = (x: number) => x * x;
 
 //// [arrowFunctionMissingCurlyWithSemicolon.js]
 // Should error at semicolon.
-var f = ;
+var f = function () { return ; };
 var b = 1 * 2 * 3 * 4;
 var square = function (x) { return x * x; };
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js
index d53f33deadc..85c0b85daea 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody1.js
@@ -2,4 +2,4 @@
 var v = a => <any>{}
 
 //// [arrowFunctionWithObjectLiteralBody1.js]
-var v = function (a) { return {}; };
+var v = function (a) { return ({}); };
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js
index f2fc086c082..5164a98331c 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody2.js
@@ -2,4 +2,4 @@
 var v = a => <any><any>{}
 
 //// [arrowFunctionWithObjectLiteralBody2.js]
-var v = function (a) { return {}; };
+var v = function (a) { return ({}); };
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js
index 77f5c2d4c3d..f9d924d6d9b 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.js
@@ -8,7 +8,7 @@ var c = () => ({ name: "foo", message: "bar" });
 var d = () => ((<Error>({ name: "foo", message: "bar" })));
 
 //// [arrowFunctionWithObjectLiteralBody5.js]
-var a = function () { return { name: "foo", message: "bar" }; };
+var a = function () { return ({ name: "foo", message: "bar" }); };
 var b = function () { return ({ name: "foo", message: "bar" }); };
 var c = function () { return ({ name: "foo", message: "bar" }); };
 var d = function () { return (({ name: "foo", message: "bar" })); };
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.js b/tests/baselines/reference/arrowFunctionWithParameterNameAsync.js
deleted file mode 100644
index 0baea798c03..00000000000
--- a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [arrowFunctionWithParameterNameAsync.ts]
-
-const x = async => async;
-
-//// [arrowFunctionWithParameterNameAsync.js]
-var x = function (async) { return async; };
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.symbols b/tests/baselines/reference/arrowFunctionWithParameterNameAsync.symbols
deleted file mode 100644
index 26f36f48df7..00000000000
--- a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.symbols
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts ===
-
-const x = async => async;
->x : Symbol(x, Decl(arrowFunctionWithParameterNameAsync.ts, 1, 5))
->async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync.ts, 1, 9))
->async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync.ts, 1, 9))
-
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.js b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.js
new file mode 100644
index 00000000000..df308028361
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.js
@@ -0,0 +1,6 @@
+//// [arrowFunctionWithParameterNameAsync_es5.ts]
+
+const x = async => async;
+
+//// [arrowFunctionWithParameterNameAsync_es5.js]
+var x = function (async) { return async; };
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.symbols b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.symbols
new file mode 100644
index 00000000000..43c9c343efe
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts ===
+
+const x = async => async;
+>x : Symbol(x, Decl(arrowFunctionWithParameterNameAsync_es5.ts, 1, 5))
+>async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync_es5.ts, 1, 9))
+>async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync_es5.ts, 1, 9))
+
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.types b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.types
new file mode 100644
index 00000000000..bd567320f1d
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts ===
+
+const x = async => async;
+>x : (async: any) => any
+>async => async : (async: any) => any
+>async : any
+>async : any
+
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.js b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.js
new file mode 100644
index 00000000000..8527fefc50d
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.js
@@ -0,0 +1,6 @@
+//// [arrowFunctionWithParameterNameAsync_es6.ts]
+
+const x = async => async;
+
+//// [arrowFunctionWithParameterNameAsync_es6.js]
+var x = function (async) { return async; };
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.symbols b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.symbols
new file mode 100644
index 00000000000..73e5f31aeb3
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts ===
+
+const x = async => async;
+>x : Symbol(x, Decl(arrowFunctionWithParameterNameAsync_es6.ts, 1, 5))
+>async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync_es6.ts, 1, 9))
+>async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync_es6.ts, 1, 9))
+
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.types b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.types
similarity index 79%
rename from tests/baselines/reference/arrowFunctionWithParameterNameAsync.types
rename to tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.types
index 4bdc60935ea..b6a19fe30ed 100644
--- a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.types
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts ===
+=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts ===
 
 const x = async => async;
 >x : (async: any) => any
diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.js b/tests/baselines/reference/arrowFunctionsMissingTokens.js
index e0e22578ac6..ef4476f6e45 100644
--- a/tests/baselines/reference/arrowFunctionsMissingTokens.js
+++ b/tests/baselines/reference/arrowFunctionsMissingTokens.js
@@ -88,25 +88,25 @@ var missingCurliesWithArrow;
     })(withStatement || (withStatement = {}));
     var withoutStatement;
     (function (withoutStatement) {
-        var a = ;
+        var a = function () { return ; };
     })(withoutStatement || (withoutStatement = {}));
     ;
-    var b = ;
+    var b = function () { return ; };
 })(missingCurliesWithArrow || (missingCurliesWithArrow = {}));
-var c = ;
+var c = function (x) { return ; };
 ;
-var d = ;
+var d = function (x, y) { return ; };
 ;
-var e = ;
+var e = function (x, y) { return ; };
 ;
-var f = ;
+var f = function () { return ; };
 var ce_nEst_pas_une_arrow_function;
 (function (ce_nEst_pas_une_arrow_function) {
     var a = ();
-    var b = ;
+    var b = function () { return ; };
     var c = (x);
-    var d = ;
-    var e = ;
+    var d = function (x, y) { return ; };
+    var e = function (x, y) { return ; };
 })(ce_nEst_pas_une_arrow_function || (ce_nEst_pas_une_arrow_function = {}));
 var okay;
 (function (okay) {
diff --git a/tests/baselines/reference/asOperator3.js b/tests/baselines/reference/asOperator3.js
index 406eae1c9d6..770a853ad25 100644
--- a/tests/baselines/reference/asOperator3.js
+++ b/tests/baselines/reference/asOperator3.js
@@ -11,10 +11,10 @@ var g = tag `Hello ${123} World` as string;
 var h = tag `Hello` as string;
 
 //// [asOperator3.js]
-var a = "" + 123 + 456;
-var b = "leading " + 123 + 456;
+var a = "" + (123 + 456);
+var b = "leading " + (123 + 456);
 var c = 123 + 456 + " trailing";
-var d = ("Hello " + 123 + " World");
+var d = "Hello " + 123 + " World";
 var e = "Hello";
 var f = 1 + (1 + " end of string");
 var g = (_a = ["Hello ", " World"], _a.raw = ["Hello ", " World"], tag(_a, 123));
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index 14978ce285c..41edf92416b 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/tests/baselines/reference/asOperator4.js
@@ -18,7 +18,7 @@ function foo() { }
 exports.foo = foo;
 //// [bar.js]
 "use strict";
-var foo_1 = require('./foo');
+var foo_1 = require("./foo");
 // These should emit identically
 foo_1.foo;
 foo_1.foo;
diff --git a/tests/baselines/reference/asyncAliasReturnType_es5.js b/tests/baselines/reference/asyncAliasReturnType_es5.js
new file mode 100644
index 00000000000..7684b413405
--- /dev/null
+++ b/tests/baselines/reference/asyncAliasReturnType_es5.js
@@ -0,0 +1,14 @@
+//// [asyncAliasReturnType_es5.ts]
+type PromiseAlias<T> = Promise<T>;
+
+async function f(): PromiseAlias<void> {
+}
+
+//// [asyncAliasReturnType_es5.js]
+function f() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncAliasReturnType_es5.symbols b/tests/baselines/reference/asyncAliasReturnType_es5.symbols
new file mode 100644
index 00000000000..b61fbf6e275
--- /dev/null
+++ b/tests/baselines/reference/asyncAliasReturnType_es5.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts ===
+type PromiseAlias<T> = Promise<T>;
+>PromiseAlias : Symbol(PromiseAlias, Decl(asyncAliasReturnType_es5.ts, 0, 0))
+>T : Symbol(T, Decl(asyncAliasReturnType_es5.ts, 0, 18))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>T : Symbol(T, Decl(asyncAliasReturnType_es5.ts, 0, 18))
+
+async function f(): PromiseAlias<void> {
+>f : Symbol(f, Decl(asyncAliasReturnType_es5.ts, 0, 34))
+>PromiseAlias : Symbol(PromiseAlias, Decl(asyncAliasReturnType_es5.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/asyncAliasReturnType_es5.types b/tests/baselines/reference/asyncAliasReturnType_es5.types
new file mode 100644
index 00000000000..2b8b576a4d3
--- /dev/null
+++ b/tests/baselines/reference/asyncAliasReturnType_es5.types
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts ===
+type PromiseAlias<T> = Promise<T>;
+>PromiseAlias : Promise<T>
+>T : T
+>Promise : Promise<T>
+>T : T
+
+async function f(): PromiseAlias<void> {
+>f : () => Promise<void>
+>PromiseAlias : Promise<T>
+}
diff --git a/tests/baselines/reference/asyncArrowFunction10_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction10_es5.errors.txt
new file mode 100644
index 00000000000..0b3596282ff
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction10_es5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction10_es5.ts(4,11): error TS2304: Cannot find name 'await'.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction10_es5.ts (1 errors) ====
+    
+    var foo = async (): Promise<void> => {
+       // Legal to use 'await' in a type context.
+       var v: await;
+              ~~~~~
+!!! error TS2304: Cannot find name 'await'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction10_es5.js b/tests/baselines/reference/asyncArrowFunction10_es5.js
new file mode 100644
index 00000000000..2fc2ac56f9f
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction10_es5.js
@@ -0,0 +1,16 @@
+//// [asyncArrowFunction10_es5.ts]
+
+var foo = async (): Promise<void> => {
+   // Legal to use 'await' in a type context.
+   var v: await;
+}
+
+
+//// [asyncArrowFunction10_es5.js]
+var _this = this;
+var foo = function () { return __awaiter(_this, void 0, void 0, function () {
+    var v;
+    return __generator(this, function (_a) {
+        return [2 /*return*/];
+    });
+}); };
diff --git a/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt b/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
index 08e59e69b9f..b5ea2a9d926 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
+++ b/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
@@ -1,21 +1,9 @@
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,11): error TS2304: Cannot find name 'async'.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,17): error TS1005: ',' expected.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,20): error TS1005: '=' expected.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,24): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(4,11): error TS2304: Cannot find name 'await'.
 
 
-==== tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts (5 errors) ====
+==== tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts (1 errors) ====
     
-    var foo = async foo(): Promise<void> => {
-              ~~~~~
-!!! error TS2304: Cannot find name 'async'.
-                    ~~~
-!!! error TS1005: ',' expected.
-                       ~
-!!! error TS1005: '=' expected.
-                           ~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+    var foo = async (): Promise<void> => {
        // Legal to use 'await' in a type context.
        var v: await;
               ~~~~~
diff --git a/tests/baselines/reference/asyncArrowFunction10_es6.js b/tests/baselines/reference/asyncArrowFunction10_es6.js
index 23b2c3af80e..301e41544bb 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction10_es6.js
@@ -1,13 +1,13 @@
 //// [asyncArrowFunction10_es6.ts]
 
-var foo = async foo(): Promise<void> => {
+var foo = async (): Promise<void> => {
    // Legal to use 'await' in a type context.
    var v: await;
 }
 
 
 //// [asyncArrowFunction10_es6.js]
-var foo = async, foo = () => {
+var foo = () => __awaiter(this, void 0, void 0, function* () {
     // Legal to use 'await' in a type context.
     var v;
-};
+});
diff --git a/tests/baselines/reference/asyncArrowFunction1_es5.js b/tests/baselines/reference/asyncArrowFunction1_es5.js
new file mode 100644
index 00000000000..aac185c63a1
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction1_es5.js
@@ -0,0 +1,12 @@
+//// [asyncArrowFunction1_es5.ts]
+
+var foo = async (): Promise<void> => {
+};
+
+//// [asyncArrowFunction1_es5.js]
+var _this = this;
+var foo = function () { return __awaiter(_this, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        return [2 /*return*/];
+    });
+}); };
diff --git a/tests/baselines/reference/asyncArrowFunction1_es5.symbols b/tests/baselines/reference/asyncArrowFunction1_es5.symbols
new file mode 100644
index 00000000000..c37985dc347
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction1_es5.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction1_es5.ts ===
+
+var foo = async (): Promise<void> => {
+>foo : Symbol(foo, Decl(asyncArrowFunction1_es5.ts, 1, 3))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+};
diff --git a/tests/baselines/reference/asyncArrowFunction1_es5.types b/tests/baselines/reference/asyncArrowFunction1_es5.types
new file mode 100644
index 00000000000..bde82d2b836
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction1_es5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction1_es5.ts ===
+
+var foo = async (): Promise<void> => {
+>foo : () => Promise<void>
+>async (): Promise<void> => {} : () => Promise<void>
+>Promise : Promise<T>
+
+};
diff --git a/tests/baselines/reference/asyncArrowFunction2_es5.js b/tests/baselines/reference/asyncArrowFunction2_es5.js
new file mode 100644
index 00000000000..d77837a5433
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction2_es5.js
@@ -0,0 +1,7 @@
+//// [asyncArrowFunction2_es5.ts]
+var f = (await) => {
+}
+
+//// [asyncArrowFunction2_es5.js]
+var f = function (await) {
+};
diff --git a/tests/baselines/reference/asyncArrowFunction2_es5.symbols b/tests/baselines/reference/asyncArrowFunction2_es5.symbols
new file mode 100644
index 00000000000..b195e9c2695
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction2_es5.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts ===
+var f = (await) => {
+>f : Symbol(f, Decl(asyncArrowFunction2_es5.ts, 0, 3))
+>await : Symbol(await, Decl(asyncArrowFunction2_es5.ts, 0, 9))
+}
diff --git a/tests/baselines/reference/asyncArrowFunction2_es5.types b/tests/baselines/reference/asyncArrowFunction2_es5.types
new file mode 100644
index 00000000000..e51a17abd35
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction2_es5.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts ===
+var f = (await) => {
+>f : (await: any) => void
+>(await) => {} : (await: any) => void
+>await : any
+}
diff --git a/tests/baselines/reference/asyncArrowFunction3_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction3_es5.errors.txt
new file mode 100644
index 00000000000..01c74ab3620
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction3_es5.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts(1,20): error TS2372: Parameter 'await' cannot be referenced in its initializer.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts (1 errors) ====
+    function f(await = await) {
+                       ~~~~~
+!!! error TS2372: Parameter 'await' cannot be referenced in its initializer.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction3_es5.js b/tests/baselines/reference/asyncArrowFunction3_es5.js
new file mode 100644
index 00000000000..3c73e6f9f58
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction3_es5.js
@@ -0,0 +1,8 @@
+//// [asyncArrowFunction3_es5.ts]
+function f(await = await) {
+}
+
+//// [asyncArrowFunction3_es5.js]
+function f(await) {
+    if (await === void 0) { await = await; }
+}
diff --git a/tests/baselines/reference/asyncArrowFunction4_es5.js b/tests/baselines/reference/asyncArrowFunction4_es5.js
new file mode 100644
index 00000000000..cbaae99a9c6
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction4_es5.js
@@ -0,0 +1,7 @@
+//// [asyncArrowFunction4_es5.ts]
+var await = () => {
+}
+
+//// [asyncArrowFunction4_es5.js]
+var await = function () {
+};
diff --git a/tests/baselines/reference/asyncArrowFunction4_es5.symbols b/tests/baselines/reference/asyncArrowFunction4_es5.symbols
new file mode 100644
index 00000000000..affb1f188a8
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction4_es5.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction4_es5.ts ===
+var await = () => {
+>await : Symbol(await, Decl(asyncArrowFunction4_es5.ts, 0, 3))
+}
diff --git a/tests/baselines/reference/asyncArrowFunction4_es5.types b/tests/baselines/reference/asyncArrowFunction4_es5.types
new file mode 100644
index 00000000000..3b452365095
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction4_es5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction4_es5.ts ===
+var await = () => {
+>await : () => void
+>() => {} : () => void
+}
diff --git a/tests/baselines/reference/asyncArrowFunction5_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction5_es5.errors.txt
new file mode 100644
index 00000000000..e19113e66f8
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction5_es5.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts(2,11): error TS2304: Cannot find name 'async'.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts(2,18): error TS2304: Cannot find name 'await'.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts(2,24): error TS1005: ',' expected.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts(2,26): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'void'.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts(2,33): error TS1005: '=' expected.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts(2,40): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts (6 errors) ====
+    
+    var foo = async (await): Promise<void> => {
+              ~~~~~
+!!! error TS2304: Cannot find name 'async'.
+                     ~~~~~
+!!! error TS2304: Cannot find name 'await'.
+                           ~
+!!! error TS1005: ',' expected.
+                             ~~~~~~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'void'.
+                                    ~
+!!! error TS1005: '=' expected.
+                                           ~~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction5_es5.js b/tests/baselines/reference/asyncArrowFunction5_es5.js
new file mode 100644
index 00000000000..ff5ee68d4c7
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction5_es5.js
@@ -0,0 +1,9 @@
+//// [asyncArrowFunction5_es5.ts]
+
+var foo = async (await): Promise<void> => {
+}
+
+//// [asyncArrowFunction5_es5.js]
+var foo = async(await), Promise = ;
+{
+}
diff --git a/tests/baselines/reference/asyncArrowFunction6_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction6_es5.errors.txt
new file mode 100644
index 00000000000..a957589bd94
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction6_es5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction6_es5.ts(2,22): error TS2524: 'await' expressions cannot be used in a parameter initializer.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction6_es5.ts(2,27): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction6_es5.ts (2 errors) ====
+    
+    var foo = async (a = await): Promise<void> => {
+                         ~~~~~
+!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
+                              ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction6_es5.js b/tests/baselines/reference/asyncArrowFunction6_es5.js
new file mode 100644
index 00000000000..ea61a1b44b5
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction6_es5.js
@@ -0,0 +1,15 @@
+//// [asyncArrowFunction6_es5.ts]
+
+var foo = async (a = await): Promise<void> => {
+}
+
+//// [asyncArrowFunction6_es5.js]
+var _this = this;
+var foo = function (a) {
+    if (a === void 0) { a = yield ; }
+    return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+};
diff --git a/tests/baselines/reference/asyncArrowFunction7_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction7_es5.errors.txt
new file mode 100644
index 00000000000..cc5cf2bb61d
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction7_es5.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction7_es5.ts(4,24): error TS2524: 'await' expressions cannot be used in a parameter initializer.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction7_es5.ts(4,29): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction7_es5.ts (2 errors) ====
+    
+    var bar = async (): Promise<void> => {
+      // 'await' here is an identifier, and not an await expression.
+      var foo = async (a = await): Promise<void> => {
+                           ~~~~~
+!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
+                                ~
+!!! error TS1109: Expression expected.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction7_es5.js b/tests/baselines/reference/asyncArrowFunction7_es5.js
new file mode 100644
index 00000000000..19e589fa542
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction7_es5.js
@@ -0,0 +1,25 @@
+//// [asyncArrowFunction7_es5.ts]
+
+var bar = async (): Promise<void> => {
+  // 'await' here is an identifier, and not an await expression.
+  var foo = async (a = await): Promise<void> => {
+  }
+}
+
+//// [asyncArrowFunction7_es5.js]
+var _this = this;
+var bar = function () { return __awaiter(_this, void 0, void 0, function () {
+    _this = this;
+    var foo;
+    return __generator(this, function (_a) {
+        foo = function (a) {
+            if (a === void 0) { a = yield ; }
+            return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/];
+                });
+            });
+        };
+        return [2 /*return*/];
+    });
+}); var _this; };
diff --git a/tests/baselines/reference/asyncArrowFunction8_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction8_es5.errors.txt
new file mode 100644
index 00000000000..e2e69fc5bee
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction8_es5.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction8_es5.ts(3,19): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction8_es5.ts (1 errors) ====
+    
+    var foo = async (): Promise<void> => {
+      var v = { [await]: foo }
+                      ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction8_es5.js b/tests/baselines/reference/asyncArrowFunction8_es5.js
new file mode 100644
index 00000000000..30432949262
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction8_es5.js
@@ -0,0 +1,21 @@
+//// [asyncArrowFunction8_es5.ts]
+
+var foo = async (): Promise<void> => {
+  var v = { [await]: foo }
+}
+
+//// [asyncArrowFunction8_es5.js]
+var _this = this;
+var foo = function () { return __awaiter(_this, void 0, void 0, function () {
+    var v, _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                _a = {};
+                return [4 /*yield*/, ];
+            case 1:
+                v = (_a[_b.sent()] = foo, _a);
+                return [2 /*return*/];
+        }
+    });
+}); };
diff --git a/tests/baselines/reference/asyncArrowFunction9_es5.errors.txt b/tests/baselines/reference/asyncArrowFunction9_es5.errors.txt
new file mode 100644
index 00000000000..30846e06d6a
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction9_es5.errors.txt
@@ -0,0 +1,23 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(1,11): error TS2304: Cannot find name 'async'.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(1,18): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(1,37): error TS1005: ',' expected.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(1,39): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'void'.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(1,46): error TS1005: '=' expected.
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(1,53): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts (6 errors) ====
+    var foo = async (a = await => await): Promise<void> => {
+              ~~~~~
+!!! error TS2304: Cannot find name 'async'.
+                     ~
+!!! error TS2304: Cannot find name 'a'.
+                                        ~
+!!! error TS1005: ',' expected.
+                                          ~~~~~~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'void'.
+                                                 ~
+!!! error TS1005: '=' expected.
+                                                        ~~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunction9_es5.js b/tests/baselines/reference/asyncArrowFunction9_es5.js
new file mode 100644
index 00000000000..2506024f326
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunction9_es5.js
@@ -0,0 +1,8 @@
+//// [asyncArrowFunction9_es5.ts]
+var foo = async (a = await => await): Promise<void> => {
+}
+
+//// [asyncArrowFunction9_es5.js]
+var foo = async(a = function (await) { return await; }), Promise = ;
+{
+}
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt
new file mode 100644
index 00000000000..e0a1ef45e8c
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5.ts(4,52): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
+
+
+==== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5.ts (1 errors) ====
+    class C {
+       method() {
+          function other() {}
+          var fn = async () => await other.apply(this, arguments);
+                                                       ~~~~~~~~~
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
+       }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.js b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.js
new file mode 100644
index 00000000000..e73ef6ddd4d
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.js
@@ -0,0 +1,25 @@
+//// [asyncArrowFunctionCapturesArguments_es5.ts]
+class C {
+   method() {
+      function other() {}
+      var fn = async () => await other.apply(this, arguments);
+   }
+}
+
+
+//// [asyncArrowFunctionCapturesArguments_es5.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+        var _this = this;
+        function other() { }
+        var fn = function () { return __awaiter(_this, arguments, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, other.apply(this, arguments)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); };
+    };
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.js b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.js
new file mode 100644
index 00000000000..5c9727bddab
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.js
@@ -0,0 +1,23 @@
+//// [asyncArrowFunctionCapturesThis_es5.ts]
+class C {
+   method() {
+      var fn = async () => await this;
+   }
+}
+
+
+//// [asyncArrowFunctionCapturesThis_es5.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+        var _this = this;
+        var fn = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, this];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); };
+    };
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.symbols b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.symbols
new file mode 100644
index 00000000000..c0415839891
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5.ts ===
+class C {
+>C : Symbol(C, Decl(asyncArrowFunctionCapturesThis_es5.ts, 0, 0))
+
+   method() {
+>method : Symbol(C.method, Decl(asyncArrowFunctionCapturesThis_es5.ts, 0, 9))
+
+      var fn = async () => await this;
+>fn : Symbol(fn, Decl(asyncArrowFunctionCapturesThis_es5.ts, 2, 9))
+>this : Symbol(C, Decl(asyncArrowFunctionCapturesThis_es5.ts, 0, 0))
+   }
+}
+
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.types b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.types
new file mode 100644
index 00000000000..da378ee2718
--- /dev/null
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es5.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5.ts ===
+class C {
+>C : C
+
+   method() {
+>method : () => void
+
+      var fn = async () => await this;
+>fn : () => Promise<this>
+>async () => await this : () => Promise<this>
+>await this : this
+>this : this
+   }
+}
+
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt
new file mode 100644
index 00000000000..7d46517ca15
--- /dev/null
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt
@@ -0,0 +1,45 @@
+tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts(1,27): error TS2307: Cannot find module 'missing'.
+
+
+==== tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts (1 errors) ====
+    import { MyPromise } from "missing";
+                              ~~~~~~~~~
+!!! error TS2307: Cannot find module 'missing'.
+    
+    declare var p: Promise<number>;
+    declare var mp: MyPromise<number>;
+    
+    async function f0() { }
+    async function f1(): Promise<void> { }
+    async function f3(): MyPromise<void> { }
+    
+    let f4 = async function() { }
+    let f5 = async function(): Promise<void> { }
+    let f6 = async function(): MyPromise<void> { }
+    
+    let f7 = async () => { };
+    let f8 = async (): Promise<void> => { };
+    let f9 = async (): MyPromise<void> => { };
+    let f10 = async () => p;
+    let f11 = async () => mp;
+    let f12 = async (): Promise<number> => mp;
+    let f13 = async (): MyPromise<number> => p;
+    
+    let o = {
+    	async m1() { },
+    	async m2(): Promise<void> { },
+    	async m3(): MyPromise<void> { }
+    };
+    
+    class C {
+    	async m1() { }
+    	async m2(): Promise<void> { }
+    	async m3(): MyPromise<void> { }
+    	static async m4() { }
+    	static async m5(): Promise<void> { }
+    	static async m6(): MyPromise<void> { }
+    }
+    
+    module M {
+    	export async function f1() { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
new file mode 100644
index 00000000000..95416f3aaa2
--- /dev/null
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -0,0 +1,201 @@
+//// [asyncAwaitIsolatedModules_es5.ts]
+import { MyPromise } from "missing";
+
+declare var p: Promise<number>;
+declare var mp: MyPromise<number>;
+
+async function f0() { }
+async function f1(): Promise<void> { }
+async function f3(): MyPromise<void> { }
+
+let f4 = async function() { }
+let f5 = async function(): Promise<void> { }
+let f6 = async function(): MyPromise<void> { }
+
+let f7 = async () => { };
+let f8 = async (): Promise<void> => { };
+let f9 = async (): MyPromise<void> => { };
+let f10 = async () => p;
+let f11 = async () => mp;
+let f12 = async (): Promise<number> => mp;
+let f13 = async (): MyPromise<number> => p;
+
+let o = {
+	async m1() { },
+	async m2(): Promise<void> { },
+	async m3(): MyPromise<void> { }
+};
+
+class C {
+	async m1() { }
+	async m2(): Promise<void> { }
+	async m3(): MyPromise<void> { }
+	static async m4() { }
+	static async m5(): Promise<void> { }
+	static async m6(): MyPromise<void> { }
+}
+
+module M {
+	export async function f1() { }
+}
+
+//// [asyncAwaitIsolatedModules_es5.js]
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+var _this = this;
+function f0() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+function f1() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+function f3() {
+    return __awaiter(this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+var f4 = function () {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+};
+var f5 = function () {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+};
+var f6 = function () {
+    return __awaiter(this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+};
+var f7 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/];
+}); }); };
+var f8 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/];
+}); }); };
+var f9 = function () { return __awaiter(_this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+    return [2 /*return*/];
+}); }); };
+var f10 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, p];
+}); }); };
+var f11 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, mp];
+}); }); };
+var f12 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, mp];
+}); }); };
+var f13 = function () { return __awaiter(_this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, p];
+}); }); };
+var o = {
+    m1: function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    },
+    m2: function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    },
+    m3: function () {
+        return __awaiter(this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    }
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.m1 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.prototype.m2 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.prototype.m3 = function () {
+        return __awaiter(this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.m4 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.m5 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.m6 = function () {
+        return __awaiter(this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    return C;
+}());
+var M;
+(function (M) {
+    function f1() {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    }
+    M.f1 = f1;
+})(M || (M = {}));
diff --git a/tests/baselines/reference/asyncAwait_es5.js b/tests/baselines/reference/asyncAwait_es5.js
new file mode 100644
index 00000000000..e148de70ad2
--- /dev/null
+++ b/tests/baselines/reference/asyncAwait_es5.js
@@ -0,0 +1,200 @@
+//// [asyncAwait_es5.ts]
+type MyPromise<T> = Promise<T>;
+declare var MyPromise: typeof Promise;
+declare var p: Promise<number>;
+declare var mp: MyPromise<number>;
+
+async function f0() { }
+async function f1(): Promise<void> { }
+async function f3(): MyPromise<void> { }
+
+let f4 = async function() { }
+let f5 = async function(): Promise<void> { }
+let f6 = async function(): MyPromise<void> { }
+
+let f7 = async () => { };
+let f8 = async (): Promise<void> => { };
+let f9 = async (): MyPromise<void> => { };
+let f10 = async () => p;
+let f11 = async () => mp;
+let f12 = async (): Promise<number> => mp;
+let f13 = async (): MyPromise<number> => p;
+
+let o = {
+	async m1() { },
+	async m2(): Promise<void> { },
+	async m3(): MyPromise<void> { }
+};
+
+class C {
+	async m1() { }
+	async m2(): Promise<void> { }
+	async m3(): MyPromise<void> { }
+	static async m4() { }
+	static async m5(): Promise<void> { }
+	static async m6(): MyPromise<void> { }
+}
+
+module M {
+	export async function f1() { }
+}
+
+//// [asyncAwait_es5.js]
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+var _this = this;
+function f0() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+function f1() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+function f3() {
+    return __awaiter(this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+var f4 = function () {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+};
+var f5 = function () {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+};
+var f6 = function () {
+    return __awaiter(this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+};
+var f7 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/];
+}); }); };
+var f8 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/];
+}); }); };
+var f9 = function () { return __awaiter(_this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+    return [2 /*return*/];
+}); }); };
+var f10 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, p];
+}); }); };
+var f11 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, mp];
+}); }); };
+var f12 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, mp];
+}); }); };
+var f13 = function () { return __awaiter(_this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, p];
+}); }); };
+var o = {
+    m1: function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    },
+    m2: function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    },
+    m3: function () {
+        return __awaiter(this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    }
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.m1 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.prototype.m2 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.prototype.m3 = function () {
+        return __awaiter(this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.m4 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.m5 = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    C.m6 = function () {
+        return __awaiter(this, void 0, MyPromise, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    return C;
+}());
+var M;
+(function (M) {
+    function f1() {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    }
+    M.f1 = f1;
+})(M || (M = {}));
diff --git a/tests/baselines/reference/asyncAwait_es5.symbols b/tests/baselines/reference/asyncAwait_es5.symbols
new file mode 100644
index 00000000000..2f80a025ade
--- /dev/null
+++ b/tests/baselines/reference/asyncAwait_es5.symbols
@@ -0,0 +1,118 @@
+=== tests/cases/conformance/async/es5/asyncAwait_es5.ts ===
+type MyPromise<T> = Promise<T>;
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+>T : Symbol(T, Decl(asyncAwait_es5.ts, 0, 15))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>T : Symbol(T, Decl(asyncAwait_es5.ts, 0, 15))
+
+declare var MyPromise: typeof Promise;
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare var p: Promise<number>;
+>p : Symbol(p, Decl(asyncAwait_es5.ts, 2, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare var mp: MyPromise<number>;
+>mp : Symbol(mp, Decl(asyncAwait_es5.ts, 3, 11))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+
+async function f0() { }
+>f0 : Symbol(f0, Decl(asyncAwait_es5.ts, 3, 34))
+
+async function f1(): Promise<void> { }
+>f1 : Symbol(f1, Decl(asyncAwait_es5.ts, 5, 23))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+async function f3(): MyPromise<void> { }
+>f3 : Symbol(f3, Decl(asyncAwait_es5.ts, 6, 38))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+
+let f4 = async function() { }
+>f4 : Symbol(f4, Decl(asyncAwait_es5.ts, 9, 3))
+
+let f5 = async function(): Promise<void> { }
+>f5 : Symbol(f5, Decl(asyncAwait_es5.ts, 10, 3))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+let f6 = async function(): MyPromise<void> { }
+>f6 : Symbol(f6, Decl(asyncAwait_es5.ts, 11, 3))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+
+let f7 = async () => { };
+>f7 : Symbol(f7, Decl(asyncAwait_es5.ts, 13, 3))
+
+let f8 = async (): Promise<void> => { };
+>f8 : Symbol(f8, Decl(asyncAwait_es5.ts, 14, 3))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+let f9 = async (): MyPromise<void> => { };
+>f9 : Symbol(f9, Decl(asyncAwait_es5.ts, 15, 3))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+
+let f10 = async () => p;
+>f10 : Symbol(f10, Decl(asyncAwait_es5.ts, 16, 3))
+>p : Symbol(p, Decl(asyncAwait_es5.ts, 2, 11))
+
+let f11 = async () => mp;
+>f11 : Symbol(f11, Decl(asyncAwait_es5.ts, 17, 3))
+>mp : Symbol(mp, Decl(asyncAwait_es5.ts, 3, 11))
+
+let f12 = async (): Promise<number> => mp;
+>f12 : Symbol(f12, Decl(asyncAwait_es5.ts, 18, 3))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>mp : Symbol(mp, Decl(asyncAwait_es5.ts, 3, 11))
+
+let f13 = async (): MyPromise<number> => p;
+>f13 : Symbol(f13, Decl(asyncAwait_es5.ts, 19, 3))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+>p : Symbol(p, Decl(asyncAwait_es5.ts, 2, 11))
+
+let o = {
+>o : Symbol(o, Decl(asyncAwait_es5.ts, 21, 3))
+
+	async m1() { },
+>m1 : Symbol(m1, Decl(asyncAwait_es5.ts, 21, 9))
+
+	async m2(): Promise<void> { },
+>m2 : Symbol(m2, Decl(asyncAwait_es5.ts, 22, 16))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+	async m3(): MyPromise<void> { }
+>m3 : Symbol(m3, Decl(asyncAwait_es5.ts, 23, 31))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+
+};
+
+class C {
+>C : Symbol(C, Decl(asyncAwait_es5.ts, 25, 2))
+
+	async m1() { }
+>m1 : Symbol(C.m1, Decl(asyncAwait_es5.ts, 27, 9))
+
+	async m2(): Promise<void> { }
+>m2 : Symbol(C.m2, Decl(asyncAwait_es5.ts, 28, 15))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+	async m3(): MyPromise<void> { }
+>m3 : Symbol(C.m3, Decl(asyncAwait_es5.ts, 29, 30))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+
+	static async m4() { }
+>m4 : Symbol(C.m4, Decl(asyncAwait_es5.ts, 30, 32))
+
+	static async m5(): Promise<void> { }
+>m5 : Symbol(C.m5, Decl(asyncAwait_es5.ts, 31, 22))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+	static async m6(): MyPromise<void> { }
+>m6 : Symbol(C.m6, Decl(asyncAwait_es5.ts, 32, 37))
+>MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11))
+}
+
+module M {
+>M : Symbol(M, Decl(asyncAwait_es5.ts, 34, 1))
+
+	export async function f1() { }
+>f1 : Symbol(f1, Decl(asyncAwait_es5.ts, 36, 10))
+}
diff --git a/tests/baselines/reference/asyncAwait_es5.types b/tests/baselines/reference/asyncAwait_es5.types
new file mode 100644
index 00000000000..4162aa84b76
--- /dev/null
+++ b/tests/baselines/reference/asyncAwait_es5.types
@@ -0,0 +1,129 @@
+=== tests/cases/conformance/async/es5/asyncAwait_es5.ts ===
+type MyPromise<T> = Promise<T>;
+>MyPromise : Promise<T>
+>T : T
+>Promise : Promise<T>
+>T : T
+
+declare var MyPromise: typeof Promise;
+>MyPromise : PromiseConstructor
+>Promise : PromiseConstructor
+
+declare var p: Promise<number>;
+>p : Promise<number>
+>Promise : Promise<T>
+
+declare var mp: MyPromise<number>;
+>mp : Promise<number>
+>MyPromise : Promise<T>
+
+async function f0() { }
+>f0 : () => Promise<void>
+
+async function f1(): Promise<void> { }
+>f1 : () => Promise<void>
+>Promise : Promise<T>
+
+async function f3(): MyPromise<void> { }
+>f3 : () => Promise<void>
+>MyPromise : Promise<T>
+
+let f4 = async function() { }
+>f4 : () => Promise<void>
+>async function() { } : () => Promise<void>
+
+let f5 = async function(): Promise<void> { }
+>f5 : () => Promise<void>
+>async function(): Promise<void> { } : () => Promise<void>
+>Promise : Promise<T>
+
+let f6 = async function(): MyPromise<void> { }
+>f6 : () => Promise<void>
+>async function(): MyPromise<void> { } : () => Promise<void>
+>MyPromise : Promise<T>
+
+let f7 = async () => { };
+>f7 : () => Promise<void>
+>async () => { } : () => Promise<void>
+
+let f8 = async (): Promise<void> => { };
+>f8 : () => Promise<void>
+>async (): Promise<void> => { } : () => Promise<void>
+>Promise : Promise<T>
+
+let f9 = async (): MyPromise<void> => { };
+>f9 : () => Promise<void>
+>async (): MyPromise<void> => { } : () => Promise<void>
+>MyPromise : Promise<T>
+
+let f10 = async () => p;
+>f10 : () => Promise<number>
+>async () => p : () => Promise<number>
+>p : Promise<number>
+
+let f11 = async () => mp;
+>f11 : () => Promise<number>
+>async () => mp : () => Promise<number>
+>mp : Promise<number>
+
+let f12 = async (): Promise<number> => mp;
+>f12 : () => Promise<number>
+>async (): Promise<number> => mp : () => Promise<number>
+>Promise : Promise<T>
+>mp : Promise<number>
+
+let f13 = async (): MyPromise<number> => p;
+>f13 : () => Promise<number>
+>async (): MyPromise<number> => p : () => Promise<number>
+>MyPromise : Promise<T>
+>p : Promise<number>
+
+let o = {
+>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
+>{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
+
+	async m1() { },
+>m1 : () => Promise<void>
+
+	async m2(): Promise<void> { },
+>m2 : () => Promise<void>
+>Promise : Promise<T>
+
+	async m3(): MyPromise<void> { }
+>m3 : () => Promise<void>
+>MyPromise : Promise<T>
+
+};
+
+class C {
+>C : C
+
+	async m1() { }
+>m1 : () => Promise<void>
+
+	async m2(): Promise<void> { }
+>m2 : () => Promise<void>
+>Promise : Promise<T>
+
+	async m3(): MyPromise<void> { }
+>m3 : () => Promise<void>
+>MyPromise : Promise<T>
+
+	static async m4() { }
+>m4 : () => Promise<void>
+
+	static async m5(): Promise<void> { }
+>m5 : () => Promise<void>
+>Promise : Promise<T>
+
+	static async m6(): MyPromise<void> { }
+>m6 : () => Promise<void>
+>MyPromise : Promise<T>
+}
+
+module M {
+>M : typeof M
+
+	export async function f1() { }
+>f1 : () => Promise<void>
+}
diff --git a/tests/baselines/reference/asyncClass_es5.errors.txt b/tests/baselines/reference/asyncClass_es5.errors.txt
new file mode 100644
index 00000000000..e8f4efd4f07
--- /dev/null
+++ b/tests/baselines/reference/asyncClass_es5.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/async/es5/asyncClass_es5.ts(1,1): error TS1042: 'async' modifier cannot be used here.
+
+
+==== tests/cases/conformance/async/es5/asyncClass_es5.ts (1 errors) ====
+    async class C {
+    ~~~~~
+!!! error TS1042: 'async' modifier cannot be used here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncClass_es5.js b/tests/baselines/reference/asyncClass_es5.js
new file mode 100644
index 00000000000..a552349118a
--- /dev/null
+++ b/tests/baselines/reference/asyncClass_es5.js
@@ -0,0 +1,10 @@
+//// [asyncClass_es5.ts]
+async class C {
+}
+
+//// [asyncClass_es5.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncConstructor_es5.errors.txt b/tests/baselines/reference/asyncConstructor_es5.errors.txt
new file mode 100644
index 00000000000..c24bf87ae67
--- /dev/null
+++ b/tests/baselines/reference/asyncConstructor_es5.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/async/es5/asyncConstructor_es5.ts(2,3): error TS1089: 'async' modifier cannot appear on a constructor declaration.
+
+
+==== tests/cases/conformance/async/es5/asyncConstructor_es5.ts (1 errors) ====
+    class C {
+      async constructor() {
+      ~~~~~
+!!! error TS1089: 'async' modifier cannot appear on a constructor declaration.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncConstructor_es5.js b/tests/baselines/reference/asyncConstructor_es5.js
new file mode 100644
index 00000000000..95470ccf9b0
--- /dev/null
+++ b/tests/baselines/reference/asyncConstructor_es5.js
@@ -0,0 +1,12 @@
+//// [asyncConstructor_es5.ts]
+class C {
+  async constructor() {
+  }
+}
+
+//// [asyncConstructor_es5.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncDeclare_es5.errors.txt b/tests/baselines/reference/asyncDeclare_es5.errors.txt
new file mode 100644
index 00000000000..bfa467acca2
--- /dev/null
+++ b/tests/baselines/reference/asyncDeclare_es5.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/async/es5/asyncDeclare_es5.ts(1,9): error TS1040: 'async' modifier cannot be used in an ambient context.
+
+
+==== tests/cases/conformance/async/es5/asyncDeclare_es5.ts (1 errors) ====
+    declare async function foo(): Promise<void>;
+            ~~~~~
+!!! error TS1040: 'async' modifier cannot be used in an ambient context.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncDeclare_es5.js b/tests/baselines/reference/asyncDeclare_es5.js
new file mode 100644
index 00000000000..80ee6017ad5
--- /dev/null
+++ b/tests/baselines/reference/asyncDeclare_es5.js
@@ -0,0 +1,4 @@
+//// [asyncDeclare_es5.ts]
+declare async function foo(): Promise<void>;
+
+//// [asyncDeclare_es5.js]
diff --git a/tests/baselines/reference/asyncEnum_es5.errors.txt b/tests/baselines/reference/asyncEnum_es5.errors.txt
new file mode 100644
index 00000000000..6029ae9c9d0
--- /dev/null
+++ b/tests/baselines/reference/asyncEnum_es5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/async/es5/asyncEnum_es5.ts(1,1): error TS1042: 'async' modifier cannot be used here.
+
+
+==== tests/cases/conformance/async/es5/asyncEnum_es5.ts (1 errors) ====
+    async enum E {
+    ~~~~~
+!!! error TS1042: 'async' modifier cannot be used here.
+      Value
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncEnum_es5.js b/tests/baselines/reference/asyncEnum_es5.js
new file mode 100644
index 00000000000..d65b4bdb510
--- /dev/null
+++ b/tests/baselines/reference/asyncEnum_es5.js
@@ -0,0 +1,10 @@
+//// [asyncEnum_es5.ts]
+async enum E {
+  Value
+}
+
+//// [asyncEnum_es5.js]
+var E;
+(function (E) {
+    E[E["Value"] = 0] = "Value";
+})(E || (E = {}));
diff --git a/tests/baselines/reference/asyncFunctionDeclaration10_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration10_es5.errors.txt
new file mode 100644
index 00000000000..dc814e9c887
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration10_es5.errors.txt
@@ -0,0 +1,26 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,20): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,30): error TS1109: Expression expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,33): error TS1138: Parameter declaration expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,33): error TS2304: Cannot find name 'await'.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,38): error TS1005: ';' expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,39): error TS1128: Declaration or statement expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,53): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts (7 errors) ====
+    async function foo(a = await => await): Promise<void> {
+                       ~~~~~~~~~
+!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
+                                 ~~
+!!! error TS1109: Expression expected.
+                                    ~~~~~
+!!! error TS1138: Parameter declaration expected.
+                                    ~~~~~
+!!! error TS2304: Cannot find name 'await'.
+                                         ~
+!!! error TS1005: ';' expected.
+                                          ~
+!!! error TS1128: Declaration or statement expected.
+                                                        ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration10_es5.js b/tests/baselines/reference/asyncFunctionDeclaration10_es5.js
new file mode 100644
index 00000000000..05ff9daa9da
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration10_es5.js
@@ -0,0 +1,7 @@
+//// [asyncFunctionDeclaration10_es5.ts]
+async function foo(a = await => await): Promise<void> {
+}
+
+//// [asyncFunctionDeclaration10_es5.js]
+await;
+Promise < void  > {};
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es5.js b/tests/baselines/reference/asyncFunctionDeclaration11_es5.js
new file mode 100644
index 00000000000..27d16ebb0c1
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es5.js
@@ -0,0 +1,12 @@
+//// [asyncFunctionDeclaration11_es5.ts]
+async function await(): Promise<void> {
+}
+
+//// [asyncFunctionDeclaration11_es5.js]
+function await() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols
new file mode 100644
index 00000000000..fc20251d567
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts ===
+async function await(): Promise<void> {
+>await : Symbol(await, Decl(asyncFunctionDeclaration11_es5.ts, 0, 0))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es5.types b/tests/baselines/reference/asyncFunctionDeclaration11_es5.types
new file mode 100644
index 00000000000..fdda0b0a084
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts ===
+async function await(): Promise<void> {
+>await : () => Promise<void>
+>Promise : Promise<T>
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration12_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration12_es5.errors.txt
new file mode 100644
index 00000000000..6468ec69716
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration12_es5.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts(1,24): error TS1005: '(' expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts(1,29): error TS1005: '=' expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts(1,33): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts(1,47): error TS1005: '=>' expected.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts (4 errors) ====
+    var v = async function await(): Promise<void> { }
+                           ~~~~~
+!!! error TS1005: '(' expected.
+                                ~
+!!! error TS1005: '=' expected.
+                                    ~~~~~~~~~~~~~
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+                                                  ~
+!!! error TS1005: '=>' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration12_es5.js b/tests/baselines/reference/asyncFunctionDeclaration12_es5.js
new file mode 100644
index 00000000000..4123175b22c
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration12_es5.js
@@ -0,0 +1,5 @@
+//// [asyncFunctionDeclaration12_es5.ts]
+var v = async function await(): Promise<void> { }
+
+//// [asyncFunctionDeclaration12_es5.js]
+var v = , await = function () { };
diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration13_es5.errors.txt
new file mode 100644
index 00000000000..ce83aabc4be
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration13_es5.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5.ts(3,11): error TS2304: Cannot find name 'await'.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5.ts (1 errors) ====
+    async function foo(): Promise<void> {
+       // Legal to use 'await' in a type context.
+       var v: await;
+              ~~~~~
+!!! error TS2304: Cannot find name 'await'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es5.js b/tests/baselines/reference/asyncFunctionDeclaration13_es5.js
new file mode 100644
index 00000000000..e097192fbbf
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration13_es5.js
@@ -0,0 +1,16 @@
+//// [asyncFunctionDeclaration13_es5.ts]
+async function foo(): Promise<void> {
+   // Legal to use 'await' in a type context.
+   var v: await;
+}
+
+
+//// [asyncFunctionDeclaration13_es5.js]
+function foo() {
+    return __awaiter(this, void 0, void 0, function () {
+        var v;
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es5.js b/tests/baselines/reference/asyncFunctionDeclaration14_es5.js
new file mode 100644
index 00000000000..5ef6ce61084
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es5.js
@@ -0,0 +1,13 @@
+//// [asyncFunctionDeclaration14_es5.ts]
+async function foo(): Promise<void> {
+  return;
+}
+
+//// [asyncFunctionDeclaration14_es5.js]
+function foo() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols
new file mode 100644
index 00000000000..1126618cfe7
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts ===
+async function foo(): Promise<void> {
+>foo : Symbol(foo, Decl(asyncFunctionDeclaration14_es5.ts, 0, 0))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+  return;
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es5.types b/tests/baselines/reference/asyncFunctionDeclaration14_es5.types
new file mode 100644
index 00000000000..5c2575c9cc9
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts ===
+async function foo(): Promise<void> {
+>foo : () => Promise<void>
+>Promise : Promise<T>
+
+  return;
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt
new file mode 100644
index 00000000000..62c64f2cd54
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt
@@ -0,0 +1,59 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(6,23): error TS1055: Type '{}' is not a valid async function return type.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(7,23): error TS1055: Type 'any' is not a valid async function return type.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(8,23): error TS1055: Type 'number' is not a valid async function return type.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(9,23): error TS1055: Type 'PromiseLike' is not a valid async function return type.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(10,23): error TS1055: Type 'typeof Thenable' is not a valid async function return type.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(10,23): error TS1055: Type 'typeof Thenable' is not a valid async function return type.
+  Type 'Thenable' is not assignable to type 'PromiseLike<any>'.
+    Types of property 'then' are incompatible.
+      Type '() => void' is not assignable to type '{ <TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>; <TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>; }'.
+        Type 'void' is not assignable to type 'PromiseLike<any>'.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(17,16): error TS1059: Return expression in async function does not have a valid callable 'then' member.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts(23,25): error TS1058: Operand for 'await' does not have a valid callable 'then' member.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts (8 errors) ====
+    declare class Thenable { then(): void; }
+    declare let a: any;
+    declare let obj: { then: string; };
+    declare let thenable: Thenable;
+    async function fn1() { } // valid: Promise<void>
+    async function fn2(): { } { } // error
+                          ~~~
+!!! error TS1055: Type '{}' is not a valid async function return type.
+    async function fn3(): any { } // error
+                          ~~~
+!!! error TS1055: Type 'any' is not a valid async function return type.
+    async function fn4(): number { } // error
+                          ~~~~~~
+!!! error TS1055: Type 'number' is not a valid async function return type.
+    async function fn5(): PromiseLike<void> { } // error
+                          ~~~~~~~~~~~~~~~~~
+!!! error TS1055: Type 'PromiseLike' is not a valid async function return type.
+    async function fn6(): Thenable { } // error
+                          ~~~~~~~~
+!!! error TS1055: Type 'typeof Thenable' is not a valid async function return type.
+                          ~~~~~~~~
+!!! error TS1055: Type 'typeof Thenable' is not a valid async function return type.
+!!! error TS1055:   Type 'Thenable' is not assignable to type 'PromiseLike<any>'.
+!!! error TS1055:     Types of property 'then' are incompatible.
+!!! error TS1055:       Type '() => void' is not assignable to type '{ <TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>; <TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>; }'.
+!!! error TS1055:         Type 'void' is not assignable to type 'PromiseLike<any>'.
+    async function fn7() { return; } // valid: Promise<void>
+    async function fn8() { return 1; } // valid: Promise<number>
+    async function fn9() { return null; } // valid: Promise<any>
+    async function fn10() { return undefined; } // valid: Promise<any>
+    async function fn11() { return a; } // valid: Promise<any>
+    async function fn12() { return obj; } // valid: Promise<{ then: string; }>
+    async function fn13() { return thenable; } // error
+                   ~~~~
+!!! error TS1059: Return expression in async function does not have a valid callable 'then' member.
+    async function fn14() { await 1; } // valid: Promise<void>
+    async function fn15() { await null; } // valid: Promise<void>
+    async function fn16() { await undefined; } // valid: Promise<void>
+    async function fn17() { await a; } // valid: Promise<void>
+    async function fn18() { await obj; } // valid: Promise<void>
+    async function fn19() { await thenable; } // error
+                            ~~~~~~~~~~~~~~
+!!! error TS1058: Operand for 'await' does not have a valid callable 'then' member.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es5.js b/tests/baselines/reference/asyncFunctionDeclaration15_es5.js
new file mode 100644
index 00000000000..5ca93d3eca8
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es5.js
@@ -0,0 +1,152 @@
+//// [asyncFunctionDeclaration15_es5.ts]
+declare class Thenable { then(): void; }
+declare let a: any;
+declare let obj: { then: string; };
+declare let thenable: Thenable;
+async function fn1() { } // valid: Promise<void>
+async function fn2(): { } { } // error
+async function fn3(): any { } // error
+async function fn4(): number { } // error
+async function fn5(): PromiseLike<void> { } // error
+async function fn6(): Thenable { } // error
+async function fn7() { return; } // valid: Promise<void>
+async function fn8() { return 1; } // valid: Promise<number>
+async function fn9() { return null; } // valid: Promise<any>
+async function fn10() { return undefined; } // valid: Promise<any>
+async function fn11() { return a; } // valid: Promise<any>
+async function fn12() { return obj; } // valid: Promise<{ then: string; }>
+async function fn13() { return thenable; } // error
+async function fn14() { await 1; } // valid: Promise<void>
+async function fn15() { await null; } // valid: Promise<void>
+async function fn16() { await undefined; } // valid: Promise<void>
+async function fn17() { await a; } // valid: Promise<void>
+async function fn18() { await obj; } // valid: Promise<void>
+async function fn19() { await thenable; } // error
+
+
+//// [asyncFunctionDeclaration15_es5.js]
+function fn1() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // valid: Promise<void>
+function fn2() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // error
+function fn3() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // error
+function fn4() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // error
+function fn5() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // error
+function fn6() {
+    return __awaiter(this, void 0, Thenable, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // error
+function fn7() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+} // valid: Promise<void>
+function fn8() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/, 1];
+    }); });
+} // valid: Promise<number>
+function fn9() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/, null];
+    }); });
+} // valid: Promise<any>
+function fn10() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/, undefined];
+    }); });
+} // valid: Promise<any>
+function fn11() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/, a];
+    }); });
+} // valid: Promise<any>
+function fn12() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/, obj];
+    }); });
+} // valid: Promise<{ then: string; }>
+function fn13() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/, thenable];
+    }); });
+} // error
+function fn14() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, 1];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    }); });
+} // valid: Promise<void>
+function fn15() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, null];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    }); });
+} // valid: Promise<void>
+function fn16() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, undefined];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    }); });
+} // valid: Promise<void>
+function fn17() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, a];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    }); });
+} // valid: Promise<void>
+function fn18() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, obj];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    }); });
+} // valid: Promise<void>
+function fn19() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, thenable];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    }); });
+} // error
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es5.js b/tests/baselines/reference/asyncFunctionDeclaration1_es5.js
new file mode 100644
index 00000000000..913a0b3c4e2
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es5.js
@@ -0,0 +1,12 @@
+//// [asyncFunctionDeclaration1_es5.ts]
+async function foo(): Promise<void> {
+}
+
+//// [asyncFunctionDeclaration1_es5.js]
+function foo() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols
new file mode 100644
index 00000000000..ba7616ac293
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts ===
+async function foo(): Promise<void> {
+>foo : Symbol(foo, Decl(asyncFunctionDeclaration1_es5.ts, 0, 0))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es5.types b/tests/baselines/reference/asyncFunctionDeclaration1_es5.types
new file mode 100644
index 00000000000..b1336715bfb
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts ===
+async function foo(): Promise<void> {
+>foo : () => Promise<void>
+>Promise : Promise<T>
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration2_es5.js b/tests/baselines/reference/asyncFunctionDeclaration2_es5.js
new file mode 100644
index 00000000000..427fb2b1bf9
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration2_es5.js
@@ -0,0 +1,7 @@
+//// [asyncFunctionDeclaration2_es5.ts]
+function f(await) {
+}
+
+//// [asyncFunctionDeclaration2_es5.js]
+function f(await) {
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration2_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration2_es5.symbols
new file mode 100644
index 00000000000..78f4da3c25e
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration2_es5.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts ===
+function f(await) {
+>f : Symbol(f, Decl(asyncFunctionDeclaration2_es5.ts, 0, 0))
+>await : Symbol(await, Decl(asyncFunctionDeclaration2_es5.ts, 0, 11))
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration2_es5.types b/tests/baselines/reference/asyncFunctionDeclaration2_es5.types
new file mode 100644
index 00000000000..7add17dd5d6
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration2_es5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts ===
+function f(await) {
+>f : (await: any) => void
+>await : any
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration3_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration3_es5.errors.txt
new file mode 100644
index 00000000000..1192e396a64
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration3_es5.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts(1,20): error TS2372: Parameter 'await' cannot be referenced in its initializer.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts (1 errors) ====
+    function f(await = await) {
+                       ~~~~~
+!!! error TS2372: Parameter 'await' cannot be referenced in its initializer.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration3_es5.js b/tests/baselines/reference/asyncFunctionDeclaration3_es5.js
new file mode 100644
index 00000000000..0bcc99b6bc7
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration3_es5.js
@@ -0,0 +1,8 @@
+//// [asyncFunctionDeclaration3_es5.ts]
+function f(await = await) {
+}
+
+//// [asyncFunctionDeclaration3_es5.js]
+function f(await) {
+    if (await === void 0) { await = await; }
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration4_es5.js b/tests/baselines/reference/asyncFunctionDeclaration4_es5.js
new file mode 100644
index 00000000000..8b6f58b84ab
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration4_es5.js
@@ -0,0 +1,7 @@
+//// [asyncFunctionDeclaration4_es5.ts]
+function await() {
+}
+
+//// [asyncFunctionDeclaration4_es5.js]
+function await() {
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration4_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration4_es5.symbols
new file mode 100644
index 00000000000..0690c333095
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration4_es5.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5.ts ===
+function await() {
+>await : Symbol(await, Decl(asyncFunctionDeclaration4_es5.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration4_es5.types b/tests/baselines/reference/asyncFunctionDeclaration4_es5.types
new file mode 100644
index 00000000000..8dac2282032
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration4_es5.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5.ts ===
+function await() {
+>await : () => void
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration5_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration5_es5.errors.txt
new file mode 100644
index 00000000000..3060c2c836b
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration5_es5.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts(1,20): error TS1138: Parameter declaration expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts(1,20): error TS2304: Cannot find name 'await'.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts(1,25): error TS1005: ';' expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts(1,26): error TS1128: Declaration or statement expected.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts(1,40): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts (5 errors) ====
+    async function foo(await): Promise<void> {
+                       ~~~~~
+!!! error TS1138: Parameter declaration expected.
+                       ~~~~~
+!!! error TS2304: Cannot find name 'await'.
+                            ~
+!!! error TS1005: ';' expected.
+                             ~
+!!! error TS1128: Declaration or statement expected.
+                                           ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration5_es5.js b/tests/baselines/reference/asyncFunctionDeclaration5_es5.js
new file mode 100644
index 00000000000..22c18ff6ad4
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration5_es5.js
@@ -0,0 +1,7 @@
+//// [asyncFunctionDeclaration5_es5.ts]
+async function foo(await): Promise<void> {
+}
+
+//// [asyncFunctionDeclaration5_es5.js]
+await;
+Promise < void  > {};
diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration6_es5.errors.txt
new file mode 100644
index 00000000000..d8cf82fbc28
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration6_es5.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration6_es5.ts(1,24): error TS2524: 'await' expressions cannot be used in a parameter initializer.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration6_es5.ts(1,29): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration6_es5.ts (2 errors) ====
+    async function foo(a = await): Promise<void> {
+                           ~~~~~
+!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
+                                ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es5.js b/tests/baselines/reference/asyncFunctionDeclaration6_es5.js
new file mode 100644
index 00000000000..282036f97de
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration6_es5.js
@@ -0,0 +1,13 @@
+//// [asyncFunctionDeclaration6_es5.ts]
+async function foo(a = await): Promise<void> {
+}
+
+//// [asyncFunctionDeclaration6_es5.js]
+function foo(a) {
+    if (a === void 0) { a = yield ; }
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration7_es5.errors.txt
new file mode 100644
index 00000000000..48984724e4c
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration7_es5.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts(3,26): error TS2524: 'await' expressions cannot be used in a parameter initializer.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts(3,31): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts (2 errors) ====
+    async function bar(): Promise<void> {
+      // 'await' here is an identifier, and not a yield expression.
+      async function foo(a = await): Promise<void> {
+                             ~~~~~
+!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
+                                  ~
+!!! error TS1109: Expression expected.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es5.js b/tests/baselines/reference/asyncFunctionDeclaration7_es5.js
new file mode 100644
index 00000000000..60dd0d6e3bf
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration7_es5.js
@@ -0,0 +1,24 @@
+//// [asyncFunctionDeclaration7_es5.ts]
+async function bar(): Promise<void> {
+  // 'await' here is an identifier, and not a yield expression.
+  async function foo(a = await): Promise<void> {
+  }
+}
+
+//// [asyncFunctionDeclaration7_es5.js]
+function bar() {
+    return __awaiter(this, void 0, void 0, function () {
+        // 'await' here is an identifier, and not a yield expression.
+        function foo(a) {
+            if (a === void 0) { a = yield ; }
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/];
+                });
+            });
+        }
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration8_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration8_es5.errors.txt
new file mode 100644
index 00000000000..7f2a4cc650b
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration8_es5.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts(1,12): error TS2304: Cannot find name 'await'.
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts(1,20): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts (2 errors) ====
+    var v = { [await]: foo }
+               ~~~~~
+!!! error TS2304: Cannot find name 'await'.
+                       ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration8_es5.js b/tests/baselines/reference/asyncFunctionDeclaration8_es5.js
new file mode 100644
index 00000000000..3e518481178
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration8_es5.js
@@ -0,0 +1,6 @@
+//// [asyncFunctionDeclaration8_es5.ts]
+var v = { [await]: foo }
+
+//// [asyncFunctionDeclaration8_es5.js]
+var v = (_a = {}, _a[await] = foo, _a);
+var _a;
diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration9_es5.errors.txt
new file mode 100644
index 00000000000..8eed8dade45
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration9_es5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration9_es5.ts(2,19): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration9_es5.ts (1 errors) ====
+    async function foo(): Promise<void> {
+      var v = { [await]: foo }
+                      ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es5.js b/tests/baselines/reference/asyncFunctionDeclaration9_es5.js
new file mode 100644
index 00000000000..e35ec29595b
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclaration9_es5.js
@@ -0,0 +1,21 @@
+//// [asyncFunctionDeclaration9_es5.ts]
+async function foo(): Promise<void> {
+  var v = { [await]: foo }
+}
+
+//// [asyncFunctionDeclaration9_es5.js]
+function foo() {
+    return __awaiter(this, void 0, void 0, function () {
+        var v, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = {};
+                    return [4 /*yield*/, ];
+                case 1:
+                    v = (_a[_b.sent()] = foo, _a);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt
new file mode 100644
index 00000000000..7a35b1d5223
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5.ts(5,36): error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method.
+
+
+==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5.ts (1 errors) ====
+    class C {
+       method() {
+          function other() {}
+          async function fn () {
+               await other.apply(this, arguments);
+                                       ~~~~~~~~~
+!!! error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method.
+          }
+       }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.js b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.js
new file mode 100644
index 00000000000..8881ad555a7
--- /dev/null
+++ b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.js
@@ -0,0 +1,32 @@
+//// [asyncFunctionDeclarationCapturesArguments_es5.ts]
+class C {
+   method() {
+      function other() {}
+      async function fn () {
+           await other.apply(this, arguments);
+      }
+   }
+}
+
+
+//// [asyncFunctionDeclarationCapturesArguments_es5.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+        function other() { }
+        function fn() {
+            return __awaiter(this, arguments, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, other.apply(this, arguments)];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        }
+    };
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt b/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt
index a7dbb6ecb64..599bf41a7f2 100644
--- a/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt
+++ b/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt
@@ -1,5 +1,4 @@
 error TS2318: Cannot find global type 'Promise'.
-tests/cases/compiler/asyncFunctionNoReturnType.ts(1,1): error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
 tests/cases/compiler/asyncFunctionNoReturnType.ts(1,1): error TS1057: An async function or method must have a valid awaitable return type.
 tests/cases/compiler/asyncFunctionNoReturnType.ts(1,1): error TS7030: Not all code paths return a value.
 tests/cases/compiler/asyncFunctionNoReturnType.ts(2,9): error TS2304: Cannot find name 'window'.
@@ -7,10 +6,8 @@ tests/cases/compiler/asyncFunctionNoReturnType.ts(3,9): error TS7030: Not all co
 
 
 !!! error TS2318: Cannot find global type 'Promise'.
-==== tests/cases/compiler/asyncFunctionNoReturnType.ts (5 errors) ====
+==== tests/cases/compiler/asyncFunctionNoReturnType.ts (4 errors) ====
     async () => {
-    ~~~~~
-!!! error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
     ~~~~~~~~~~~~~
 !!! error TS1057: An async function or method must have a valid awaitable return type.
     ~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/asyncFunctionNoReturnType.js b/tests/baselines/reference/asyncFunctionNoReturnType.js
index dd84e17c88b..a3635b85a09 100644
--- a/tests/baselines/reference/asyncFunctionNoReturnType.js
+++ b/tests/baselines/reference/asyncFunctionNoReturnType.js
@@ -14,7 +14,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments)).next());
     });
 };
-(function () __awaiter(this, void 0, void 0, function* () {
-    if (window)
-        return;
-}));
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+var _this = this;
+(function () { return __awaiter(_this, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        if (window)
+            return [2 /*return*/];
+        return [2 /*return*/];
+    });
+}); });
diff --git a/tests/baselines/reference/asyncGetter_es5.errors.txt b/tests/baselines/reference/asyncGetter_es5.errors.txt
new file mode 100644
index 00000000000..fd3fba40a60
--- /dev/null
+++ b/tests/baselines/reference/asyncGetter_es5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/async/es5/asyncGetter_es5.ts(2,3): error TS1042: 'async' modifier cannot be used here.
+tests/cases/conformance/async/es5/asyncGetter_es5.ts(2,13): error TS2378: A 'get' accessor must return a value.
+
+
+==== tests/cases/conformance/async/es5/asyncGetter_es5.ts (2 errors) ====
+    class C {
+      async get foo() {
+      ~~~~~
+!!! error TS1042: 'async' modifier cannot be used here.
+                ~~~
+!!! error TS2378: A 'get' accessor must return a value.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncGetter_es5.js b/tests/baselines/reference/asyncGetter_es5.js
new file mode 100644
index 00000000000..a9c7f6355d3
--- /dev/null
+++ b/tests/baselines/reference/asyncGetter_es5.js
@@ -0,0 +1,18 @@
+//// [asyncGetter_es5.ts]
+class C {
+  async get foo() {
+  }
+}
+
+//// [asyncGetter_es5.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "foo", {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
new file mode 100644
index 00000000000..54d1b0fdac8
--- /dev/null
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -0,0 +1,84 @@
+//// [tests/cases/conformance/async/es5/asyncImportedPromise_es5.ts] ////
+
+//// [task.ts]
+export class Task<T> extends Promise<T> { }
+
+//// [test.ts]
+import { Task } from "./task";
+class Test {
+    async example<T>(): Task<T> { return; }
+}
+
+//// [task.js]
+"use strict";
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Task = (function (_super) {
+    __extends(Task, _super);
+    function Task() {
+        _super.apply(this, arguments);
+    }
+    return Task;
+}(Promise));
+exports.Task = Task;
+//// [test.js]
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+var task_1 = require("./task");
+var Test = (function () {
+    function Test() {
+    }
+    Test.prototype.example = function () {
+        return __awaiter(this, void 0, task_1.Task, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    return Test;
+}());
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.symbols b/tests/baselines/reference/asyncImportedPromise_es5.symbols
new file mode 100644
index 00000000000..b889299bd7e
--- /dev/null
+++ b/tests/baselines/reference/asyncImportedPromise_es5.symbols
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/async/es5/task.ts ===
+export class Task<T> extends Promise<T> { }
+>Task : Symbol(Task, Decl(task.ts, 0, 0))
+>T : Symbol(T, Decl(task.ts, 0, 18))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>T : Symbol(T, Decl(task.ts, 0, 18))
+
+=== tests/cases/conformance/async/es5/test.ts ===
+import { Task } from "./task";
+>Task : Symbol(Task, Decl(test.ts, 0, 8))
+
+class Test {
+>Test : Symbol(Test, Decl(test.ts, 0, 30))
+
+    async example<T>(): Task<T> { return; }
+>example : Symbol(Test.example, Decl(test.ts, 1, 12))
+>T : Symbol(T, Decl(test.ts, 2, 18))
+>Task : Symbol(Task, Decl(test.ts, 0, 8))
+>T : Symbol(T, Decl(test.ts, 2, 18))
+}
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.types b/tests/baselines/reference/asyncImportedPromise_es5.types
new file mode 100644
index 00000000000..54a6e52fa17
--- /dev/null
+++ b/tests/baselines/reference/asyncImportedPromise_es5.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/async/es5/task.ts ===
+export class Task<T> extends Promise<T> { }
+>Task : Task<T>
+>T : T
+>Promise : Promise<T>
+>T : T
+
+=== tests/cases/conformance/async/es5/test.ts ===
+import { Task } from "./task";
+>Task : typeof Task
+
+class Test {
+>Test : Test
+
+    async example<T>(): Task<T> { return; }
+>example : <T>() => Task<T>
+>T : T
+>Task : Task<T>
+>T : T
+}
diff --git a/tests/baselines/reference/asyncInterface_es5.errors.txt b/tests/baselines/reference/asyncInterface_es5.errors.txt
new file mode 100644
index 00000000000..30d2c554da7
--- /dev/null
+++ b/tests/baselines/reference/asyncInterface_es5.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/async/es5/asyncInterface_es5.ts(1,1): error TS1042: 'async' modifier cannot be used here.
+
+
+==== tests/cases/conformance/async/es5/asyncInterface_es5.ts (1 errors) ====
+    async interface I {
+    ~~~~~
+!!! error TS1042: 'async' modifier cannot be used here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncInterface_es5.js b/tests/baselines/reference/asyncInterface_es5.js
new file mode 100644
index 00000000000..280dade3869
--- /dev/null
+++ b/tests/baselines/reference/asyncInterface_es5.js
@@ -0,0 +1,5 @@
+//// [asyncInterface_es5.ts]
+async interface I {
+}
+
+//// [asyncInterface_es5.js]
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es5.js b/tests/baselines/reference/asyncMethodWithSuper_es5.js
new file mode 100644
index 00000000000..87debbdc55c
--- /dev/null
+++ b/tests/baselines/reference/asyncMethodWithSuper_es5.js
@@ -0,0 +1,106 @@
+//// [asyncMethodWithSuper_es5.ts]
+class A {
+    x() {
+    }
+}
+
+class B extends A {
+    // async method with only call/get on 'super' does not require a binding
+    async simple() {
+        // call with property access
+        super.x();
+
+        // call with element access
+        super["x"]();
+
+        // property access (read)
+        const a = super.x;
+
+        // element access (read)
+        const b = super["x"];
+    }
+
+    // async method with assignment/destructuring on 'super' requires a binding
+    async advanced() {
+        const f = () => {};
+
+        // call with property access
+        super.x();
+
+        // call with element access
+        super["x"]();
+
+        // property access (read)
+        const a = super.x;
+
+        // element access (read)
+        const b = super["x"];
+
+        // property access (assign)
+        super.x = f;
+
+        // element access (assign)
+        super["x"] = f;
+
+        // destructuring assign with property access
+        ({ f: super.x } = { f });
+
+        // destructuring assign with element access
+        ({ f: super["x"] } = { f });
+    }
+}
+
+//// [asyncMethodWithSuper_es5.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.x = function () {
+    };
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    // async method with only call/get on 'super' does not require a binding
+    B.prototype.simple = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var a, b;
+            return __generator(this, function (_a) {
+                // call with property access
+                _super.x.call(this);
+                // call with element access
+                _super["x"].call(this);
+                a = _super.x;
+                b = _super["x"];
+                return [2 /*return*/];
+            });
+        });
+    };
+    // async method with assignment/destructuring on 'super' requires a binding
+    B.prototype.advanced = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var f, a, b, _a, _b;
+            return __generator(this, function (_c) {
+                f = function () { };
+                // call with property access
+                _super.x.call(this);
+                // call with element access
+                _super["x"].call(this);
+                a = _super.x;
+                b = _super["x"];
+                // property access (assign)
+                _super.x = f;
+                // element access (assign)
+                _super["x"] = f;
+                // destructuring assign with property access
+                (_a = { f: f }, super.x = _a.f, _a);
+                // destructuring assign with element access
+                (_b = { f: f }, super["x"] = _b.f, _b);
+                return [2 /*return*/];
+            });
+        });
+    };
+    return B;
+}(A));
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es5.symbols b/tests/baselines/reference/asyncMethodWithSuper_es5.symbols
new file mode 100644
index 00000000000..e05f00a8e97
--- /dev/null
+++ b/tests/baselines/reference/asyncMethodWithSuper_es5.symbols
@@ -0,0 +1,102 @@
+=== tests/cases/conformance/async/es5/asyncMethodWithSuper_es5.ts ===
+class A {
+>A : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+
+    x() {
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+    }
+}
+
+class B extends A {
+>B : Symbol(B, Decl(asyncMethodWithSuper_es5.ts, 3, 1))
+>A : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+
+    // async method with only call/get on 'super' does not require a binding
+    async simple() {
+>simple : Symbol(B.simple, Decl(asyncMethodWithSuper_es5.ts, 5, 19))
+
+        // call with property access
+        super.x();
+>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // call with element access
+        super["x"]();
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // property access (read)
+        const a = super.x;
+>a : Symbol(a, Decl(asyncMethodWithSuper_es5.ts, 15, 13))
+>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // element access (read)
+        const b = super["x"];
+>b : Symbol(b, Decl(asyncMethodWithSuper_es5.ts, 18, 13))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+    }
+
+    // async method with assignment/destructuring on 'super' requires a binding
+    async advanced() {
+>advanced : Symbol(B.advanced, Decl(asyncMethodWithSuper_es5.ts, 19, 5))
+
+        const f = () => {};
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 23, 13))
+
+        // call with property access
+        super.x();
+>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // call with element access
+        super["x"]();
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // property access (read)
+        const a = super.x;
+>a : Symbol(a, Decl(asyncMethodWithSuper_es5.ts, 32, 13))
+>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // element access (read)
+        const b = super["x"];
+>b : Symbol(b, Decl(asyncMethodWithSuper_es5.ts, 35, 13))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+
+        // property access (assign)
+        super.x = f;
+>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 23, 13))
+
+        // element access (assign)
+        super["x"] = f;
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 23, 13))
+
+        // destructuring assign with property access
+        ({ f: super.x } = { f });
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 44, 10))
+>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 44, 27))
+
+        // destructuring assign with element access
+        ({ f: super["x"] } = { f });
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 47, 10))
+>super : Symbol(A, Decl(asyncMethodWithSuper_es5.ts, 0, 0))
+>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es5.ts, 0, 9))
+>f : Symbol(f, Decl(asyncMethodWithSuper_es5.ts, 47, 30))
+    }
+}
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es5.types b/tests/baselines/reference/asyncMethodWithSuper_es5.types
new file mode 100644
index 00000000000..4d14528409c
--- /dev/null
+++ b/tests/baselines/reference/asyncMethodWithSuper_es5.types
@@ -0,0 +1,123 @@
+=== tests/cases/conformance/async/es5/asyncMethodWithSuper_es5.ts ===
+class A {
+>A : A
+
+    x() {
+>x : () => void
+    }
+}
+
+class B extends A {
+>B : B
+>A : A
+
+    // async method with only call/get on 'super' does not require a binding
+    async simple() {
+>simple : () => Promise<void>
+
+        // call with property access
+        super.x();
+>super.x() : void
+>super.x : () => void
+>super : A
+>x : () => void
+
+        // call with element access
+        super["x"]();
+>super["x"]() : void
+>super["x"] : () => void
+>super : A
+>"x" : string
+
+        // property access (read)
+        const a = super.x;
+>a : () => void
+>super.x : () => void
+>super : A
+>x : () => void
+
+        // element access (read)
+        const b = super["x"];
+>b : () => void
+>super["x"] : () => void
+>super : A
+>"x" : string
+    }
+
+    // async method with assignment/destructuring on 'super' requires a binding
+    async advanced() {
+>advanced : () => Promise<void>
+
+        const f = () => {};
+>f : () => void
+>() => {} : () => void
+
+        // call with property access
+        super.x();
+>super.x() : void
+>super.x : () => void
+>super : A
+>x : () => void
+
+        // call with element access
+        super["x"]();
+>super["x"]() : void
+>super["x"] : () => void
+>super : A
+>"x" : string
+
+        // property access (read)
+        const a = super.x;
+>a : () => void
+>super.x : () => void
+>super : A
+>x : () => void
+
+        // element access (read)
+        const b = super["x"];
+>b : () => void
+>super["x"] : () => void
+>super : A
+>"x" : string
+
+        // property access (assign)
+        super.x = f;
+>super.x = f : () => void
+>super.x : () => void
+>super : A
+>x : () => void
+>f : () => void
+
+        // element access (assign)
+        super["x"] = f;
+>super["x"] = f : () => void
+>super["x"] : () => void
+>super : A
+>"x" : string
+>f : () => void
+
+        // destructuring assign with property access
+        ({ f: super.x } = { f });
+>({ f: super.x } = { f }) : { f: () => void; }
+>{ f: super.x } = { f } : { f: () => void; }
+>{ f: super.x } : { f: () => void; }
+>f : () => void
+>super.x : () => void
+>super : A
+>x : () => void
+>{ f } : { f: () => void; }
+>f : () => void
+
+        // destructuring assign with element access
+        ({ f: super["x"] } = { f });
+>({ f: super["x"] } = { f }) : { f: () => void; }
+>{ f: super["x"] } = { f } : { f: () => void; }
+>{ f: super["x"] } : { f: () => void; }
+>f : () => void
+>super["x"] : () => void
+>super : A
+>"x" : string
+>{ f } : { f: () => void; }
+>f : () => void
+    }
+}
diff --git a/tests/baselines/reference/asyncModule_es5.errors.txt b/tests/baselines/reference/asyncModule_es5.errors.txt
new file mode 100644
index 00000000000..f3f1b588288
--- /dev/null
+++ b/tests/baselines/reference/asyncModule_es5.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/async/es5/asyncModule_es5.ts(1,1): error TS1042: 'async' modifier cannot be used here.
+
+
+==== tests/cases/conformance/async/es5/asyncModule_es5.ts (1 errors) ====
+    async module M {
+    ~~~~~
+!!! error TS1042: 'async' modifier cannot be used here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncModule_es5.js b/tests/baselines/reference/asyncModule_es5.js
new file mode 100644
index 00000000000..a3635646330
--- /dev/null
+++ b/tests/baselines/reference/asyncModule_es5.js
@@ -0,0 +1,5 @@
+//// [asyncModule_es5.ts]
+async module M {
+}
+
+//// [asyncModule_es5.js]
diff --git a/tests/baselines/reference/asyncMultiFile_es5.js b/tests/baselines/reference/asyncMultiFile_es5.js
new file mode 100644
index 00000000000..197127c5f10
--- /dev/null
+++ b/tests/baselines/reference/asyncMultiFile_es5.js
@@ -0,0 +1,60 @@
+//// [tests/cases/conformance/async/es5/asyncMultiFile_es5.ts] ////
+
+//// [a.ts]
+async function f() {}
+//// [b.ts]
+function g() { }
+
+//// [a.js]
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+function f() {
+    return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); });
+}
+//// [b.js]
+function g() { }
diff --git a/tests/baselines/reference/asyncMultiFile_es5.symbols b/tests/baselines/reference/asyncMultiFile_es5.symbols
new file mode 100644
index 00000000000..e8e5bf2850e
--- /dev/null
+++ b/tests/baselines/reference/asyncMultiFile_es5.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/async/es5/a.ts ===
+async function f() {}
+>f : Symbol(f, Decl(a.ts, 0, 0))
+
+=== tests/cases/conformance/async/es5/b.ts ===
+function g() { }
+>g : Symbol(g, Decl(b.ts, 0, 0))
+
diff --git a/tests/baselines/reference/asyncMultiFile_es5.types b/tests/baselines/reference/asyncMultiFile_es5.types
new file mode 100644
index 00000000000..52ca4f49e81
--- /dev/null
+++ b/tests/baselines/reference/asyncMultiFile_es5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/async/es5/a.ts ===
+async function f() {}
+>f : () => Promise<void>
+
+=== tests/cases/conformance/async/es5/b.ts ===
+function g() { }
+>g : () => void
+
diff --git a/tests/baselines/reference/asyncMultiFile.js b/tests/baselines/reference/asyncMultiFile_es6.js
similarity index 89%
rename from tests/baselines/reference/asyncMultiFile.js
rename to tests/baselines/reference/asyncMultiFile_es6.js
index cbf3445ecc9..08d63521fb5 100644
--- a/tests/baselines/reference/asyncMultiFile.js
+++ b/tests/baselines/reference/asyncMultiFile_es6.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/async/es6/asyncMultiFile.ts] ////
+//// [tests/cases/conformance/async/es6/asyncMultiFile_es6.ts] ////
 
 //// [a.ts]
 async function f() {}
diff --git a/tests/baselines/reference/asyncMultiFile.symbols b/tests/baselines/reference/asyncMultiFile_es6.symbols
similarity index 100%
rename from tests/baselines/reference/asyncMultiFile.symbols
rename to tests/baselines/reference/asyncMultiFile_es6.symbols
diff --git a/tests/baselines/reference/asyncMultiFile.types b/tests/baselines/reference/asyncMultiFile_es6.types
similarity index 100%
rename from tests/baselines/reference/asyncMultiFile.types
rename to tests/baselines/reference/asyncMultiFile_es6.types
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.js b/tests/baselines/reference/asyncQualifiedReturnType_es5.js
new file mode 100644
index 00000000000..19de38325e2
--- /dev/null
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.js
@@ -0,0 +1,28 @@
+//// [asyncQualifiedReturnType_es5.ts]
+namespace X {
+    export class MyPromise<T> extends Promise<T> {
+    }
+}
+
+async function f(): X.MyPromise<void> {
+}
+
+//// [asyncQualifiedReturnType_es5.js]
+var X;
+(function (X) {
+    var MyPromise = (function (_super) {
+        __extends(MyPromise, _super);
+        function MyPromise() {
+            _super.apply(this, arguments);
+        }
+        return MyPromise;
+    }(Promise));
+    X.MyPromise = MyPromise;
+})(X || (X = {}));
+function f() {
+    return __awaiter(this, void 0, X.MyPromise, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols b/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols
new file mode 100644
index 00000000000..1fcc5d4e609
--- /dev/null
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/async/es5/asyncQualifiedReturnType_es5.ts ===
+namespace X {
+>X : Symbol(X, Decl(asyncQualifiedReturnType_es5.ts, 0, 0))
+
+    export class MyPromise<T> extends Promise<T> {
+>MyPromise : Symbol(MyPromise, Decl(asyncQualifiedReturnType_es5.ts, 0, 13))
+>T : Symbol(T, Decl(asyncQualifiedReturnType_es5.ts, 1, 27))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>T : Symbol(T, Decl(asyncQualifiedReturnType_es5.ts, 1, 27))
+    }
+}
+
+async function f(): X.MyPromise<void> {
+>f : Symbol(f, Decl(asyncQualifiedReturnType_es5.ts, 3, 1))
+>X : Symbol(X, Decl(asyncQualifiedReturnType_es5.ts, 0, 0))
+>MyPromise : Symbol(X.MyPromise, Decl(asyncQualifiedReturnType_es5.ts, 0, 13))
+}
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.types b/tests/baselines/reference/asyncQualifiedReturnType_es5.types
new file mode 100644
index 00000000000..2fccf45f2a4
--- /dev/null
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.types
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/async/es5/asyncQualifiedReturnType_es5.ts ===
+namespace X {
+>X : typeof X
+
+    export class MyPromise<T> extends Promise<T> {
+>MyPromise : MyPromise<T>
+>T : T
+>Promise : Promise<T>
+>T : T
+    }
+}
+
+async function f(): X.MyPromise<void> {
+>f : () => X.MyPromise<void>
+>X : any
+>MyPromise : X.MyPromise<T>
+}
diff --git a/tests/baselines/reference/asyncSetter_es5.errors.txt b/tests/baselines/reference/asyncSetter_es5.errors.txt
new file mode 100644
index 00000000000..59557ec9313
--- /dev/null
+++ b/tests/baselines/reference/asyncSetter_es5.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/async/es5/asyncSetter_es5.ts(2,3): error TS1042: 'async' modifier cannot be used here.
+
+
+==== tests/cases/conformance/async/es5/asyncSetter_es5.ts (1 errors) ====
+    class C {
+      async set foo(value) {
+      ~~~~~
+!!! error TS1042: 'async' modifier cannot be used here.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncSetter_es5.js b/tests/baselines/reference/asyncSetter_es5.js
new file mode 100644
index 00000000000..a260ae67bd1
--- /dev/null
+++ b/tests/baselines/reference/asyncSetter_es5.js
@@ -0,0 +1,18 @@
+//// [asyncSetter_es5.ts]
+class C {
+  async set foo(value) {
+  }
+}
+
+//// [asyncSetter_es5.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "foo", {
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+}());
diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.js b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.js
new file mode 100644
index 00000000000..20b0421d013
--- /dev/null
+++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.js
@@ -0,0 +1,20 @@
+//// [asyncUnParenthesizedArrowFunction_es5.ts]
+
+declare function someOtherFunction(i: any): Promise<void>;
+const x = async i => await someOtherFunction(i)
+const x1 = async (i) => await someOtherFunction(i);
+
+//// [asyncUnParenthesizedArrowFunction_es5.js]
+var _this = this;
+var x = function (i) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    switch (_a.label) {
+        case 0: return [4 /*yield*/, someOtherFunction(i)];
+        case 1: return [2 /*return*/, _a.sent()];
+    }
+}); }); };
+var x1 = function (i) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+    switch (_a.label) {
+        case 0: return [4 /*yield*/, someOtherFunction(i)];
+        case 1: return [2 /*return*/, _a.sent()];
+    }
+}); }); };
diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols
new file mode 100644
index 00000000000..0f43ba7773e
--- /dev/null
+++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts ===
+
+declare function someOtherFunction(i: any): Promise<void>;
+>someOtherFunction : Symbol(someOtherFunction, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 0, 0))
+>i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 1, 35))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+const x = async i => await someOtherFunction(i)
+>x : Symbol(x, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 2, 5))
+>i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 2, 15))
+>someOtherFunction : Symbol(someOtherFunction, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 0, 0))
+>i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 2, 15))
+
+const x1 = async (i) => await someOtherFunction(i);
+>x1 : Symbol(x1, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 3, 5))
+>i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 3, 18))
+>someOtherFunction : Symbol(someOtherFunction, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 0, 0))
+>i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 3, 18))
+
diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types
new file mode 100644
index 00000000000..745c56cf09b
--- /dev/null
+++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts ===
+
+declare function someOtherFunction(i: any): Promise<void>;
+>someOtherFunction : (i: any) => Promise<void>
+>i : any
+>Promise : Promise<T>
+
+const x = async i => await someOtherFunction(i)
+>x : (i: any) => Promise<void>
+>async i => await someOtherFunction(i) : (i: any) => Promise<void>
+>i : any
+>await someOtherFunction(i) : void
+>someOtherFunction(i) : Promise<void>
+>someOtherFunction : (i: any) => Promise<void>
+>i : any
+
+const x1 = async (i) => await someOtherFunction(i);
+>x1 : (i: any) => Promise<void>
+>async (i) => await someOtherFunction(i) : (i: any) => Promise<void>
+>i : any
+>await someOtherFunction(i) : void
+>someOtherFunction(i) : Promise<void>
+>someOtherFunction : (i: any) => Promise<void>
+>i : any
+
diff --git a/tests/baselines/reference/asyncUseStrict_es5.js b/tests/baselines/reference/asyncUseStrict_es5.js
new file mode 100644
index 00000000000..0a1b61b96d8
--- /dev/null
+++ b/tests/baselines/reference/asyncUseStrict_es5.js
@@ -0,0 +1,23 @@
+//// [asyncUseStrict_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+async function func(): Promise<void> {
+    "use strict";
+    var b = await p || a;
+}
+
+//// [asyncUseStrict_es5.js]
+function func() {
+    "use strict";
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, p];
+                case 1:
+                    b = (_a.sent()) || a;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/asyncUseStrict_es5.symbols b/tests/baselines/reference/asyncUseStrict_es5.symbols
new file mode 100644
index 00000000000..a70f3ca546a
--- /dev/null
+++ b/tests/baselines/reference/asyncUseStrict_es5.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/async/es5/asyncUseStrict_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(asyncUseStrict_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(asyncUseStrict_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(asyncUseStrict_es5.ts, 1, 32))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    "use strict";
+    var b = await p || a;
+>b : Symbol(b, Decl(asyncUseStrict_es5.ts, 4, 7))
+>p : Symbol(p, Decl(asyncUseStrict_es5.ts, 1, 11))
+>a : Symbol(a, Decl(asyncUseStrict_es5.ts, 0, 11))
+}
diff --git a/tests/baselines/reference/asyncUseStrict_es5.types b/tests/baselines/reference/asyncUseStrict_es5.types
new file mode 100644
index 00000000000..c7eafb3433c
--- /dev/null
+++ b/tests/baselines/reference/asyncUseStrict_es5.types
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/async/es5/asyncUseStrict_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    "use strict";
+>"use strict" : string
+
+    var b = await p || a;
+>b : boolean
+>await p || a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+}
diff --git a/tests/baselines/reference/asyncUseStrict_es6.js b/tests/baselines/reference/asyncUseStrict_es6.js
new file mode 100644
index 00000000000..5475a71102a
--- /dev/null
+++ b/tests/baselines/reference/asyncUseStrict_es6.js
@@ -0,0 +1,15 @@
+//// [asyncUseStrict_es6.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+async function func(): Promise<void> {
+    "use strict";
+    var b = await p || a;
+}
+
+//// [asyncUseStrict_es6.js]
+function func() {
+    "use strict";
+    return __awaiter(this, void 0, void 0, function* () {
+        var b = (yield p) || a;
+    });
+}
diff --git a/tests/baselines/reference/asyncUseStrict_es6.symbols b/tests/baselines/reference/asyncUseStrict_es6.symbols
new file mode 100644
index 00000000000..f94c16664e7
--- /dev/null
+++ b/tests/baselines/reference/asyncUseStrict_es6.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/async/es6/asyncUseStrict_es6.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(asyncUseStrict_es6.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(asyncUseStrict_es6.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(asyncUseStrict_es6.ts, 1, 32))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+
+    "use strict";
+    var b = await p || a;
+>b : Symbol(b, Decl(asyncUseStrict_es6.ts, 4, 7))
+>p : Symbol(p, Decl(asyncUseStrict_es6.ts, 1, 11))
+>a : Symbol(a, Decl(asyncUseStrict_es6.ts, 0, 11))
+}
diff --git a/tests/baselines/reference/asyncUseStrict_es6.types b/tests/baselines/reference/asyncUseStrict_es6.types
new file mode 100644
index 00000000000..7e6fd872081
--- /dev/null
+++ b/tests/baselines/reference/asyncUseStrict_es6.types
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/async/es6/asyncUseStrict_es6.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    "use strict";
+>"use strict" : string
+
+    var b = await p || a;
+>b : boolean
+>await p || a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+}
diff --git a/tests/baselines/reference/autolift4.js b/tests/baselines/reference/autolift4.js
index 8ee1f397d43..e6790021f63 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -37,9 +37,9 @@ var Point = (function () {
     Point.prototype.getDist = function () {
         return Math.sqrt(this.x * this.x + this.y * this.y);
     };
-    Point.origin = new Point(0, 0);
     return Point;
 }());
+Point.origin = new Point(0, 0);
 var Point3D = (function (_super) {
     __extends(Point3D, _super);
     function Point3D(x, y, z, m) {
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es5.js b/tests/baselines/reference/awaitBinaryExpression1_es5.js
new file mode 100644
index 00000000000..41b090d2c46
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression1_es5.js
@@ -0,0 +1,28 @@
+//// [awaitBinaryExpression1_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = await p || a;
+    after();
+}
+
+//// [awaitBinaryExpression1_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    before();
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = (_a.sent()) || a;
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es5.symbols b/tests/baselines/reference/awaitBinaryExpression1_es5.symbols
new file mode 100644
index 00000000000..84d3b17b126
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression1_es5.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitBinaryExpression1_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitBinaryExpression1_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression1_es5.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression1_es5.ts, 2, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitBinaryExpression1_es5.ts, 3, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression1_es5.ts, 1, 32))
+
+    var b = await p || a;
+>b : Symbol(b, Decl(awaitBinaryExpression1_es5.ts, 6, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression1_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitBinaryExpression1_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression1_es5.ts, 2, 32))
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es5.types b/tests/baselines/reference/awaitBinaryExpression1_es5.types
new file mode 100644
index 00000000000..f704eb632b4
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression1_es5.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = await p || a;
+>b : boolean
+>await p || a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.js b/tests/baselines/reference/awaitBinaryExpression1_es6.js
index a19e94353d5..83979a5b19b 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression1_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p || a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression1_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield p) || a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
index aee3dbefe96..0f05f6521cb 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression1_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression1_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
+
     var b = await p || a;
->b : Symbol(b, Decl(awaitBinaryExpression1_es6.ts, 4, 7))
+>b : Symbol(b, Decl(awaitBinaryExpression1_es6.ts, 6, 7))
 >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression1_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression1_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.types b/tests/baselines/reference/awaitBinaryExpression1_es6.types
index 4718f5f8fe9..6078e2b6dff 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p || a;
 >b : boolean
@@ -20,6 +27,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es5.js b/tests/baselines/reference/awaitBinaryExpression2_es5.js
new file mode 100644
index 00000000000..dd84d069c27
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression2_es5.js
@@ -0,0 +1,28 @@
+//// [awaitBinaryExpression2_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = await p && a;
+    after();
+}
+
+//// [awaitBinaryExpression2_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    before();
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = (_a.sent()) && a;
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es5.symbols b/tests/baselines/reference/awaitBinaryExpression2_es5.symbols
new file mode 100644
index 00000000000..e44238d4172
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression2_es5.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitBinaryExpression2_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitBinaryExpression2_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression2_es5.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression2_es5.ts, 2, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitBinaryExpression2_es5.ts, 3, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression2_es5.ts, 1, 32))
+
+    var b = await p && a;
+>b : Symbol(b, Decl(awaitBinaryExpression2_es5.ts, 6, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression2_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitBinaryExpression2_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression2_es5.ts, 2, 32))
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es5.types b/tests/baselines/reference/awaitBinaryExpression2_es5.types
new file mode 100644
index 00000000000..d3f1f861a45
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression2_es5.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = await p && a;
+>b : boolean
+>await p && a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.js b/tests/baselines/reference/awaitBinaryExpression2_es6.js
index 7fb1a70446b..a40a948576d 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression2_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p && a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression2_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield p) && a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
index a4ed0ec14bd..518e6eec528 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression2_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression2_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
+
     var b = await p && a;
->b : Symbol(b, Decl(awaitBinaryExpression2_es6.ts, 4, 7))
+>b : Symbol(b, Decl(awaitBinaryExpression2_es6.ts, 6, 7))
 >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression2_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression2_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.types b/tests/baselines/reference/awaitBinaryExpression2_es6.types
index 6154377a6f1..5f092675e85 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p && a;
 >b : boolean
@@ -20,6 +27,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es5.js b/tests/baselines/reference/awaitBinaryExpression3_es5.js
new file mode 100644
index 00000000000..0c301dec2c8
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression3_es5.js
@@ -0,0 +1,28 @@
+//// [awaitBinaryExpression3_es5.ts]
+declare var a: number;
+declare var p: Promise<number>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = await p + a;
+    after();
+}
+
+//// [awaitBinaryExpression3_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    before();
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = (_a.sent()) + a;
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es5.symbols b/tests/baselines/reference/awaitBinaryExpression3_es5.symbols
new file mode 100644
index 00000000000..d9480fdf524
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression3_es5.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5.ts ===
+declare var a: number;
+>a : Symbol(a, Decl(awaitBinaryExpression3_es5.ts, 0, 11))
+
+declare var p: Promise<number>;
+>p : Symbol(p, Decl(awaitBinaryExpression3_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression3_es5.ts, 1, 31))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression3_es5.ts, 2, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitBinaryExpression3_es5.ts, 3, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression3_es5.ts, 1, 31))
+
+    var b = await p + a;
+>b : Symbol(b, Decl(awaitBinaryExpression3_es5.ts, 6, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression3_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitBinaryExpression3_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression3_es5.ts, 2, 32))
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es5.types b/tests/baselines/reference/awaitBinaryExpression3_es5.types
new file mode 100644
index 00000000000..debc71a6475
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression3_es5.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5.ts ===
+declare var a: number;
+>a : number
+
+declare var p: Promise<number>;
+>p : Promise<number>
+>Promise : Promise<T>
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = await p + a;
+>b : number
+>await p + a : number
+>await p : number
+>p : Promise<number>
+>a : number
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.js b/tests/baselines/reference/awaitBinaryExpression3_es6.js
index f845ce12421..56092a490b3 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression3_es6.ts]
 declare var a: number;
 declare var p: Promise<number>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p + a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression3_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield p) + a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
index 4b3beb9d9a5..0d653c1ff7b 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<number>;
 >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression3_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
+>func : Symbol(func, Decl(awaitBinaryExpression3_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
+
     var b = await p + a;
->b : Symbol(b, Decl(awaitBinaryExpression3_es6.ts, 4, 7))
+>b : Symbol(b, Decl(awaitBinaryExpression3_es6.ts, 6, 7))
 >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression3_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression3_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.types b/tests/baselines/reference/awaitBinaryExpression3_es6.types
index 2d5b087d6e3..98bff3b9439 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<number>;
 >p : Promise<number>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p + a;
 >b : number
@@ -20,6 +27,7 @@ async function func(): Promise<void> {
 >p : Promise<number>
 >a : number
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es5.js b/tests/baselines/reference/awaitBinaryExpression4_es5.js
new file mode 100644
index 00000000000..26c0e5de5f1
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression4_es5.js
@@ -0,0 +1,28 @@
+//// [awaitBinaryExpression4_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = (await p, a);
+    after();
+}
+
+//// [awaitBinaryExpression4_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    before();
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = (_a.sent(), a);
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es5.symbols b/tests/baselines/reference/awaitBinaryExpression4_es5.symbols
new file mode 100644
index 00000000000..ab2cbeadfc5
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression4_es5.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitBinaryExpression4_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitBinaryExpression4_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression4_es5.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression4_es5.ts, 2, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitBinaryExpression4_es5.ts, 3, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression4_es5.ts, 1, 32))
+
+    var b = (await p, a);
+>b : Symbol(b, Decl(awaitBinaryExpression4_es5.ts, 6, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression4_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitBinaryExpression4_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression4_es5.ts, 2, 32))
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es5.types b/tests/baselines/reference/awaitBinaryExpression4_es5.types
new file mode 100644
index 00000000000..f535741fa45
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression4_es5.types
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = (await p, a);
+>b : boolean
+>(await p, a) : boolean
+>await p, a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.js b/tests/baselines/reference/awaitBinaryExpression4_es6.js
index b6e14c82487..1e909282d43 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression4_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
-    var b = await p, a;
-    "after";
+    before();
+    var b = (await p, a);
+    after();
 }
 
 //// [awaitBinaryExpression4_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
-        var b = yield p, a;
-        "after";
+        before();
+        var b = (yield p, a);
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
index 1c52cbb48ef..18a59322558 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression4_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression4_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
-    var b = await p, a;
->b : Symbol(b, Decl(awaitBinaryExpression4_es6.ts, 4, 7))
->p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
->a : Symbol(a, Decl(awaitBinaryExpression4_es6.ts, 4, 20))
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
 
-    "after";
+    var b = (await p, a);
+>b : Symbol(b, Decl(awaitBinaryExpression4_es6.ts, 6, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
+>a : Symbol(a, Decl(awaitBinaryExpression4_es6.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression4_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.types b/tests/baselines/reference/awaitBinaryExpression4_es6.types
index 80135203a82..ea1d968346d 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.types
@@ -6,19 +6,29 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
-    var b = await p, a;
+    var b = (await p, a);
 >b : boolean
+>(await p, a) : boolean
+>await p, a : boolean
 >await p : boolean
 >p : Promise<boolean>
->a : any
+>a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es5.js b/tests/baselines/reference/awaitBinaryExpression5_es5.js
new file mode 100644
index 00000000000..4e07e40a174
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression5_es5.js
@@ -0,0 +1,30 @@
+//// [awaitBinaryExpression5_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var o: { a: boolean; };
+    o.a = await p;
+    after();
+}
+
+//// [awaitBinaryExpression5_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var o, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    before();
+                    _a = o;
+                    return [4 /*yield*/, p];
+                case 1:
+                    _a.a = _b.sent();
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es5.symbols b/tests/baselines/reference/awaitBinaryExpression5_es5.symbols
new file mode 100644
index 00000000000..ad258355d38
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression5_es5.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitBinaryExpression5_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitBinaryExpression5_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression5_es5.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression5_es5.ts, 2, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitBinaryExpression5_es5.ts, 3, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression5_es5.ts, 1, 32))
+
+    var o: { a: boolean; };
+>o : Symbol(o, Decl(awaitBinaryExpression5_es5.ts, 6, 7))
+>a : Symbol(a, Decl(awaitBinaryExpression5_es5.ts, 6, 12))
+
+    o.a = await p;
+>o.a : Symbol(a, Decl(awaitBinaryExpression5_es5.ts, 6, 12))
+>o : Symbol(o, Decl(awaitBinaryExpression5_es5.ts, 6, 7))
+>a : Symbol(a, Decl(awaitBinaryExpression5_es5.ts, 6, 12))
+>p : Symbol(p, Decl(awaitBinaryExpression5_es5.ts, 1, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression5_es5.ts, 2, 32))
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es5.types b/tests/baselines/reference/awaitBinaryExpression5_es5.types
new file mode 100644
index 00000000000..6d1ebb42c84
--- /dev/null
+++ b/tests/baselines/reference/awaitBinaryExpression5_es5.types
@@ -0,0 +1,38 @@
+=== tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var o: { a: boolean; };
+>o : { a: boolean; }
+>a : boolean
+
+    o.a = await p;
+>o.a = await p : boolean
+>o.a : boolean
+>o : { a: boolean; }
+>a : boolean
+>await p : boolean
+>p : Promise<boolean>
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.js b/tests/baselines/reference/awaitBinaryExpression5_es6.js
index 65a5bbfee77..1b5d7677b52 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.js
@@ -1,19 +1,21 @@
 //// [awaitBinaryExpression5_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var o: { a: boolean; };
     o.a = await p;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression5_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var o;
         o.a = yield p;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
index 28f96aa55f5..57a7958a13c 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
@@ -6,20 +6,29 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression5_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression5_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
+
     var o: { a: boolean; };
->o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 4, 7))
->a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
+>o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 6, 7))
+>a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 6, 12))
 
     o.a = await p;
->o.a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
->o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 4, 7))
->a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
+>o.a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 6, 12))
+>o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 6, 7))
+>a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 6, 12))
 >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression5_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.types b/tests/baselines/reference/awaitBinaryExpression5_es6.types
index 8b76b6f8b88..649d160a847 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var o: { a: boolean; };
 >o : { a: boolean; }
@@ -25,6 +32,7 @@ async function func(): Promise<void> {
 >await p : boolean
 >p : Promise<boolean>
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es5.js b/tests/baselines/reference/awaitCallExpression1_es5.js
new file mode 100644
index 00000000000..dfc0e2cbd84
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression1_es5.js
@@ -0,0 +1,27 @@
+//// [awaitCallExpression1_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = fn(a, a, a);
+    after();
+}
+
+//// [awaitCallExpression1_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            before();
+            b = fn(a, a, a);
+            after();
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression1_es5.symbols b/tests/baselines/reference/awaitCallExpression1_es5.symbols
new file mode 100644
index 00000000000..b172db760e3
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression1_es5.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression1_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression1_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression1_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression1_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression1_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression1_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression1_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression1_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression1_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression1_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression1_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression1_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression1_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression1_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression1_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression1_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression1_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression1_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression1_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression1_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression1_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression1_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression1_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression1_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression1_es5.ts, 5, 84))
+
+    var b = fn(a, a, a);
+>b : Symbol(b, Decl(awaitCallExpression1_es5.ts, 10, 7))
+>fn : Symbol(fn, Decl(awaitCallExpression1_es5.ts, 1, 32))
+>a : Symbol(a, Decl(awaitCallExpression1_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression1_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression1_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression1_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression1_es5.types b/tests/baselines/reference/awaitCallExpression1_es5.types
new file mode 100644
index 00000000000..8e712443cab
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression1_es5.types
@@ -0,0 +1,62 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression1_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = fn(a, a, a);
+>b : void
+>fn(a, a, a) : void
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>a : boolean
+>a : boolean
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.js b/tests/baselines/reference/awaitCallExpression1_es6.js
index aeeb598e3bf..19ac51a6dad 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.js
+++ b/tests/baselines/reference/awaitCallExpression1_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression1_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = fn(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.symbols b/tests/baselines/reference/awaitCallExpression1_es6.symbols
index c4a91817a46..1b1deb0f579 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression1_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression1_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression1_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression1_es6.ts, 5, 84))
+
     var b = fn(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression1_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression1_es6.ts, 10, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 1, 32))
 >a : Symbol(a, Decl(awaitCallExpression1_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression1_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression1_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression1_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.types b/tests/baselines/reference/awaitCallExpression1_es6.types
index 334175b7edb..3807379a2f2 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.types
+++ b/tests/baselines/reference/awaitCallExpression1_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = fn(a, a, a);
 >b : void
@@ -49,6 +56,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es5.js b/tests/baselines/reference/awaitCallExpression2_es5.js
new file mode 100644
index 00000000000..6b0d6e4b648
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression2_es5.js
@@ -0,0 +1,33 @@
+//// [awaitCallExpression2_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = fn(await p, a, a);
+    after();
+}
+
+//// [awaitCallExpression2_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    before();
+                    _a = fn;
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = _a.apply(void 0, [_c.sent(), a, a]);
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression2_es5.symbols b/tests/baselines/reference/awaitCallExpression2_es5.symbols
new file mode 100644
index 00000000000..95e1f650030
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression2_es5.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression2_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression2_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression2_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression2_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression2_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression2_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression2_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression2_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression2_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression2_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression2_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression2_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression2_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression2_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression2_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression2_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression2_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression2_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression2_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression2_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression2_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression2_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression2_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression2_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression2_es5.ts, 5, 84))
+
+    var b = fn(await p, a, a);
+>b : Symbol(b, Decl(awaitCallExpression2_es5.ts, 10, 7))
+>fn : Symbol(fn, Decl(awaitCallExpression2_es5.ts, 1, 32))
+>p : Symbol(p, Decl(awaitCallExpression2_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitCallExpression2_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression2_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression2_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression2_es5.types b/tests/baselines/reference/awaitCallExpression2_es5.types
new file mode 100644
index 00000000000..5fd85ce3921
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression2_es5.types
@@ -0,0 +1,63 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression2_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = fn(await p, a, a);
+>b : void
+>fn(await p, a, a) : void
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.js b/tests/baselines/reference/awaitCallExpression2_es6.js
index b41735275a8..d8a45fa1bf8 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.js
+++ b/tests/baselines/reference/awaitCallExpression2_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(await p, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression2_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = fn(yield p, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.symbols b/tests/baselines/reference/awaitCallExpression2_es6.symbols
index 3931e28045d..d7f3cc0d4bd 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression2_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression2_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression2_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression2_es6.ts, 5, 84))
+
     var b = fn(await p, a, a);
->b : Symbol(b, Decl(awaitCallExpression2_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression2_es6.ts, 10, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 1, 32))
 >p : Symbol(p, Decl(awaitCallExpression2_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression2_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression2_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression2_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.types b/tests/baselines/reference/awaitCallExpression2_es6.types
index 1617f4a14ff..8758fea7f95 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.types
+++ b/tests/baselines/reference/awaitCallExpression2_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = fn(await p, a, a);
 >b : void
@@ -50,6 +57,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es5.js b/tests/baselines/reference/awaitCallExpression3_es5.js
new file mode 100644
index 00000000000..685616b23dd
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression3_es5.js
@@ -0,0 +1,34 @@
+//// [awaitCallExpression3_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = fn(a, await p, a);
+    after();
+}
+
+//// [awaitCallExpression3_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    before();
+                    _a = fn;
+                    _b = [a];
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = _a.apply(void 0, _b.concat([_c.sent(), a]));
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression3_es5.symbols b/tests/baselines/reference/awaitCallExpression3_es5.symbols
new file mode 100644
index 00000000000..2c18507340a
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression3_es5.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression3_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression3_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression3_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression3_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression3_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression3_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression3_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression3_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression3_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression3_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression3_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression3_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression3_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression3_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression3_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression3_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression3_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression3_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression3_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression3_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression3_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression3_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression3_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression3_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression3_es5.ts, 5, 84))
+
+    var b = fn(a, await p, a);
+>b : Symbol(b, Decl(awaitCallExpression3_es5.ts, 10, 7))
+>fn : Symbol(fn, Decl(awaitCallExpression3_es5.ts, 1, 32))
+>a : Symbol(a, Decl(awaitCallExpression3_es5.ts, 0, 11))
+>p : Symbol(p, Decl(awaitCallExpression3_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitCallExpression3_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression3_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression3_es5.types b/tests/baselines/reference/awaitCallExpression3_es5.types
new file mode 100644
index 00000000000..d2d851c1dae
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression3_es5.types
@@ -0,0 +1,63 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression3_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = fn(a, await p, a);
+>b : void
+>fn(a, await p, a) : void
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.js b/tests/baselines/reference/awaitCallExpression3_es6.js
index 74dee3e7e42..cf19e28b867 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.js
+++ b/tests/baselines/reference/awaitCallExpression3_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, await p, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression3_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = fn(a, yield p, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.symbols b/tests/baselines/reference/awaitCallExpression3_es6.symbols
index 2002748c9ba..14b6f35bc30 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression3_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression3_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression3_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression3_es6.ts, 5, 84))
+
     var b = fn(a, await p, a);
->b : Symbol(b, Decl(awaitCallExpression3_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression3_es6.ts, 10, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 1, 32))
 >a : Symbol(a, Decl(awaitCallExpression3_es6.ts, 0, 11))
 >p : Symbol(p, Decl(awaitCallExpression3_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression3_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression3_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.types b/tests/baselines/reference/awaitCallExpression3_es6.types
index 6304a803f64..490fd861a61 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.types
+++ b/tests/baselines/reference/awaitCallExpression3_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = fn(a, await p, a);
 >b : void
@@ -50,6 +57,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es5.js b/tests/baselines/reference/awaitCallExpression4_es5.js
new file mode 100644
index 00000000000..88c3cea35bd
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression4_es5.js
@@ -0,0 +1,32 @@
+//// [awaitCallExpression4_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = (await pfn)(a, a, a);
+    after();
+}
+
+//// [awaitCallExpression4_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    before();
+                    return [4 /*yield*/, pfn];
+                case 1:
+                    b = (_a.sent())(a, a, a);
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression4_es5.symbols b/tests/baselines/reference/awaitCallExpression4_es5.symbols
new file mode 100644
index 00000000000..46a5b942956
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression4_es5.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression4_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression4_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression4_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression4_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression4_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression4_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression4_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression4_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression4_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression4_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression4_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression4_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression4_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression4_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression4_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression4_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression4_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression4_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression4_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression4_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression4_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression4_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression4_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression4_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression4_es5.ts, 5, 84))
+
+    var b = (await pfn)(a, a, a);
+>b : Symbol(b, Decl(awaitCallExpression4_es5.ts, 10, 7))
+>pfn : Symbol(pfn, Decl(awaitCallExpression4_es5.ts, 4, 11))
+>a : Symbol(a, Decl(awaitCallExpression4_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression4_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression4_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression4_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression4_es5.types b/tests/baselines/reference/awaitCallExpression4_es5.types
new file mode 100644
index 00000000000..0b510c46998
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression4_es5.types
@@ -0,0 +1,64 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression4_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = (await pfn)(a, a, a);
+>b : void
+>(await pfn)(a, a, a) : void
+>(await pfn) : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>await pfn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>a : boolean
+>a : boolean
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.js b/tests/baselines/reference/awaitCallExpression4_es6.js
index 682a1776ac5..832f0cf20e3 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.js
+++ b/tests/baselines/reference/awaitCallExpression4_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await pfn)(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression4_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield pfn)(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.symbols b/tests/baselines/reference/awaitCallExpression4_es6.symbols
index d31cf100ad4..d7e90fc4a53 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression4_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression4_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression4_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression4_es6.ts, 5, 84))
+
     var b = (await pfn)(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression4_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression4_es6.ts, 10, 7))
 >pfn : Symbol(pfn, Decl(awaitCallExpression4_es6.ts, 4, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression4_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.types b/tests/baselines/reference/awaitCallExpression4_es6.types
index ff5d8f4012b..d8a514a67e6 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.types
+++ b/tests/baselines/reference/awaitCallExpression4_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = (await pfn)(a, a, a);
 >b : void
@@ -51,6 +58,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es5.js b/tests/baselines/reference/awaitCallExpression5_es5.js
new file mode 100644
index 00000000000..72c0e200c8d
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression5_es5.js
@@ -0,0 +1,27 @@
+//// [awaitCallExpression5_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = o.fn(a, a, a);
+    after();
+}
+
+//// [awaitCallExpression5_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            before();
+            b = o.fn(a, a, a);
+            after();
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression5_es5.symbols b/tests/baselines/reference/awaitCallExpression5_es5.symbols
new file mode 100644
index 00000000000..9f34c3e9fe8
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression5_es5.symbols
@@ -0,0 +1,61 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression5_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression5_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression5_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression5_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression5_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression5_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression5_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression5_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression5_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression5_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression5_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression5_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression5_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression5_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression5_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression5_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression5_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression5_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression5_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression5_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression5_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression5_es5.ts, 5, 84))
+
+    var b = o.fn(a, a, a);
+>b : Symbol(b, Decl(awaitCallExpression5_es5.ts, 10, 7))
+>o.fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 3, 16))
+>o : Symbol(o, Decl(awaitCallExpression5_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 3, 16))
+>a : Symbol(a, Decl(awaitCallExpression5_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression5_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression5_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression5_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression5_es5.types b/tests/baselines/reference/awaitCallExpression5_es5.types
new file mode 100644
index 00000000000..b4b6d947275
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression5_es5.types
@@ -0,0 +1,64 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression5_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = o.fn(a, a, a);
+>b : void
+>o.fn(a, a, a) : void
+>o.fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>a : boolean
+>a : boolean
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.js b/tests/baselines/reference/awaitCallExpression5_es6.js
index 30889b35011..05b06e7fc2f 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.js
+++ b/tests/baselines/reference/awaitCallExpression5_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression5_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = o.fn(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.symbols b/tests/baselines/reference/awaitCallExpression5_es6.symbols
index d14a966b0b1..ba8f9878188 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression5_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression5_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression5_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression5_es6.ts, 5, 84))
+
     var b = o.fn(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression5_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression5_es6.ts, 10, 7))
 >o.fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression5_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 3, 16))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >a : Symbol(a, Decl(awaitCallExpression5_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression5_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression5_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.types b/tests/baselines/reference/awaitCallExpression5_es6.types
index 5074c007743..3e9f1c6387e 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.types
+++ b/tests/baselines/reference/awaitCallExpression5_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = o.fn(a, a, a);
 >b : void
@@ -51,6 +58,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es5.js b/tests/baselines/reference/awaitCallExpression6_es5.js
new file mode 100644
index 00000000000..acc4261eacb
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression6_es5.js
@@ -0,0 +1,33 @@
+//// [awaitCallExpression6_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = o.fn(await p, a, a);
+    after();
+}
+
+//// [awaitCallExpression6_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b, _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    before();
+                    _b = (_a = o).fn;
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = _b.apply(_a, [_d.sent(), a, a]);
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression6_es5.symbols b/tests/baselines/reference/awaitCallExpression6_es5.symbols
new file mode 100644
index 00000000000..fc3ae4cbdbb
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression6_es5.symbols
@@ -0,0 +1,61 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression6_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression6_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression6_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression6_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression6_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression6_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression6_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression6_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression6_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression6_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression6_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression6_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression6_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression6_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression6_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression6_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression6_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression6_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression6_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression6_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression6_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression6_es5.ts, 5, 84))
+
+    var b = o.fn(await p, a, a);
+>b : Symbol(b, Decl(awaitCallExpression6_es5.ts, 10, 7))
+>o.fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 3, 16))
+>o : Symbol(o, Decl(awaitCallExpression6_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 3, 16))
+>p : Symbol(p, Decl(awaitCallExpression6_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitCallExpression6_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression6_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression6_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression6_es5.types b/tests/baselines/reference/awaitCallExpression6_es5.types
new file mode 100644
index 00000000000..e34839f3c15
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression6_es5.types
@@ -0,0 +1,65 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression6_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = o.fn(await p, a, a);
+>b : void
+>o.fn(await p, a, a) : void
+>o.fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.js b/tests/baselines/reference/awaitCallExpression6_es6.js
index 55d86119d64..ba488d53347 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.js
+++ b/tests/baselines/reference/awaitCallExpression6_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(await p, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression6_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = o.fn(yield p, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.symbols b/tests/baselines/reference/awaitCallExpression6_es6.symbols
index afd07fd0185..938c49d1d41 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression6_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression6_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression6_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression6_es6.ts, 5, 84))
+
     var b = o.fn(await p, a, a);
->b : Symbol(b, Decl(awaitCallExpression6_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression6_es6.ts, 10, 7))
 >o.fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression6_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 3, 16))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >a : Symbol(a, Decl(awaitCallExpression6_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression6_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression6_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.types b/tests/baselines/reference/awaitCallExpression6_es6.types
index 3266733fab0..6c5f0f9063e 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.types
+++ b/tests/baselines/reference/awaitCallExpression6_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = o.fn(await p, a, a);
 >b : void
@@ -52,6 +59,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es5.js b/tests/baselines/reference/awaitCallExpression7_es5.js
new file mode 100644
index 00000000000..dd69abc0514
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression7_es5.js
@@ -0,0 +1,34 @@
+//// [awaitCallExpression7_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = o.fn(a, await p, a);
+    after();
+}
+
+//// [awaitCallExpression7_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b, _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    before();
+                    _b = (_a = o).fn;
+                    _c = [a];
+                    return [4 /*yield*/, p];
+                case 1:
+                    b = _b.apply(_a, _c.concat([_d.sent(), a]));
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression7_es5.symbols b/tests/baselines/reference/awaitCallExpression7_es5.symbols
new file mode 100644
index 00000000000..96a7252ef04
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression7_es5.symbols
@@ -0,0 +1,61 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression7_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression7_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression7_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression7_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression7_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression7_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression7_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression7_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression7_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression7_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression7_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression7_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression7_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression7_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression7_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression7_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression7_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression7_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression7_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression7_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression7_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression7_es5.ts, 5, 84))
+
+    var b = o.fn(a, await p, a);
+>b : Symbol(b, Decl(awaitCallExpression7_es5.ts, 10, 7))
+>o.fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 3, 16))
+>o : Symbol(o, Decl(awaitCallExpression7_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 3, 16))
+>a : Symbol(a, Decl(awaitCallExpression7_es5.ts, 0, 11))
+>p : Symbol(p, Decl(awaitCallExpression7_es5.ts, 1, 11))
+>a : Symbol(a, Decl(awaitCallExpression7_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression7_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression7_es5.types b/tests/baselines/reference/awaitCallExpression7_es5.types
new file mode 100644
index 00000000000..9d220c6c8b8
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression7_es5.types
@@ -0,0 +1,65 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression7_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = o.fn(a, await p, a);
+>b : void
+>o.fn(a, await p, a) : void
+>o.fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>a : boolean
+>await p : boolean
+>p : Promise<boolean>
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.js b/tests/baselines/reference/awaitCallExpression7_es6.js
index df805266ff3..2eb830986d9 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.js
+++ b/tests/baselines/reference/awaitCallExpression7_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, await p, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression7_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = o.fn(a, yield p, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.symbols b/tests/baselines/reference/awaitCallExpression7_es6.symbols
index bb503d4b3a1..f366417b23f 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression7_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression7_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression7_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression7_es6.ts, 5, 84))
+
     var b = o.fn(a, await p, a);
->b : Symbol(b, Decl(awaitCallExpression7_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression7_es6.ts, 10, 7))
 >o.fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression7_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 3, 16))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >p : Symbol(p, Decl(awaitCallExpression7_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression7_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression7_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.types b/tests/baselines/reference/awaitCallExpression7_es6.types
index b1b382f7325..e36b3773091 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.types
+++ b/tests/baselines/reference/awaitCallExpression7_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = o.fn(a, await p, a);
 >b : void
@@ -52,6 +59,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es5.js b/tests/baselines/reference/awaitCallExpression8_es5.js
new file mode 100644
index 00000000000..6d7d5dceba9
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression8_es5.js
@@ -0,0 +1,32 @@
+//// [awaitCallExpression8_es5.ts]
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = (await po).fn(a, a, a);
+    after();
+}
+
+//// [awaitCallExpression8_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    before();
+                    return [4 /*yield*/, po];
+                case 1:
+                    b = (_a.sent()).fn(a, a, a);
+                    after();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitCallExpression8_es5.symbols b/tests/baselines/reference/awaitCallExpression8_es5.symbols
new file mode 100644
index 00000000000..50b564481b9
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression8_es5.symbols
@@ -0,0 +1,61 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression8_es5.ts ===
+declare var a: boolean;
+>a : Symbol(a, Decl(awaitCallExpression8_es5.ts, 0, 11))
+
+declare var p: Promise<boolean>;
+>p : Symbol(p, Decl(awaitCallExpression8_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 1, 32))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression8_es5.ts, 2, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression8_es5.ts, 2, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression8_es5.ts, 2, 49))
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : Symbol(o, Decl(awaitCallExpression8_es5.ts, 3, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 3, 16))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression8_es5.ts, 3, 20))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression8_es5.ts, 3, 34))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression8_es5.ts, 3, 49))
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Symbol(pfn, Decl(awaitCallExpression8_es5.ts, 4, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression8_es5.ts, 4, 28))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression8_es5.ts, 4, 42))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression8_es5.ts, 4, 57))
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Symbol(po, Decl(awaitCallExpression8_es5.ts, 5, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 5, 25))
+>arg0 : Symbol(arg0, Decl(awaitCallExpression8_es5.ts, 5, 29))
+>arg1 : Symbol(arg1, Decl(awaitCallExpression8_es5.ts, 5, 43))
+>arg2 : Symbol(arg2, Decl(awaitCallExpression8_es5.ts, 5, 58))
+
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression8_es5.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression8_es5.ts, 6, 32))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitCallExpression8_es5.ts, 7, 31))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    before();
+>before : Symbol(before, Decl(awaitCallExpression8_es5.ts, 5, 84))
+
+    var b = (await po).fn(a, a, a);
+>b : Symbol(b, Decl(awaitCallExpression8_es5.ts, 10, 7))
+>(await po).fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 5, 25))
+>po : Symbol(po, Decl(awaitCallExpression8_es5.ts, 5, 11))
+>fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 5, 25))
+>a : Symbol(a, Decl(awaitCallExpression8_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression8_es5.ts, 0, 11))
+>a : Symbol(a, Decl(awaitCallExpression8_es5.ts, 0, 11))
+
+    after();
+>after : Symbol(after, Decl(awaitCallExpression8_es5.ts, 6, 32))
+}
diff --git a/tests/baselines/reference/awaitCallExpression8_es5.types b/tests/baselines/reference/awaitCallExpression8_es5.types
new file mode 100644
index 00000000000..1b2fa16d1fc
--- /dev/null
+++ b/tests/baselines/reference/awaitCallExpression8_es5.types
@@ -0,0 +1,66 @@
+=== tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression8_es5.ts ===
+declare var a: boolean;
+>a : boolean
+
+declare var p: Promise<boolean>;
+>p : Promise<boolean>
+>Promise : Promise<T>
+
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+>o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
+>Promise : Promise<T>
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>Promise : Promise<T>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>arg0 : boolean
+>arg1 : boolean
+>arg2 : boolean
+
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    before();
+>before() : void
+>before : () => void
+
+    var b = (await po).fn(a, a, a);
+>b : void
+>(await po).fn(a, a, a) : void
+>(await po).fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>(await po) : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>await po : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
+>fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>a : boolean
+>a : boolean
+>a : boolean
+
+    after();
+>after() : void
+>after : () => void
+}
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.js b/tests/baselines/reference/awaitCallExpression8_es6.js
index 8d7bb4b83ce..ecf36a31936 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.js
+++ b/tests/baselines/reference/awaitCallExpression8_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await po).fn(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression8_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield po).fn(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.symbols b/tests/baselines/reference/awaitCallExpression8_es6.symbols
index 9f4df1046f4..89441ea3e37 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression8_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression8_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression8_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression8_es6.ts, 5, 84))
+
     var b = (await po).fn(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression8_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression8_es6.ts, 10, 7))
 >(await po).fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
 >po : Symbol(po, Decl(awaitCallExpression8_es6.ts, 5, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >a : Symbol(a, Decl(awaitCallExpression8_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression8_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression8_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.types b/tests/baselines/reference/awaitCallExpression8_es6.types
index 76719c09c85..8258ba830b2 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.types
+++ b/tests/baselines/reference/awaitCallExpression8_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = (await po).fn(a, a, a);
 >b : void
@@ -53,6 +60,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitClassExpression_es5.js b/tests/baselines/reference/awaitClassExpression_es5.js
new file mode 100644
index 00000000000..9123f5f2ea8
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es5.js
@@ -0,0 +1,31 @@
+//// [awaitClassExpression_es5.ts]
+declare class C { }
+declare var p: Promise<typeof C>;
+
+async function func(): Promise<void> {
+    class D extends (await p) {
+    }
+}
+
+//// [awaitClassExpression_es5.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function () {
+        var D, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = function (_super) {
+                        __extends(D, _super);
+                        function D() {
+                            _super.apply(this, arguments);
+                        }
+                        return D;
+                    };
+                    return [4 /*yield*/, p];
+                case 1:
+                    D = (_a.apply(void 0, [(_c.sent())]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es5.symbols b/tests/baselines/reference/awaitClassExpression_es5.symbols
new file mode 100644
index 00000000000..1f550576c09
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es5.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/async/es5/awaitClassExpression_es5.ts ===
+declare class C { }
+>C : Symbol(C, Decl(awaitClassExpression_es5.ts, 0, 0))
+
+declare var p: Promise<typeof C>;
+>p : Symbol(p, Decl(awaitClassExpression_es5.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>C : Symbol(C, Decl(awaitClassExpression_es5.ts, 0, 0))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitClassExpression_es5.ts, 1, 33))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    class D extends (await p) {
+>D : Symbol(D, Decl(awaitClassExpression_es5.ts, 3, 38))
+>p : Symbol(p, Decl(awaitClassExpression_es5.ts, 1, 11))
+    }
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es5.types b/tests/baselines/reference/awaitClassExpression_es5.types
new file mode 100644
index 00000000000..e1f4bf8f82e
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es5.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/async/es5/awaitClassExpression_es5.ts ===
+declare class C { }
+>C : C
+
+declare var p: Promise<typeof C>;
+>p : Promise<typeof C>
+>Promise : Promise<T>
+>C : typeof C
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    class D extends (await p) {
+>D : D
+>(await p) : C
+>await p : typeof C
+>p : Promise<typeof C>
+    }
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es6.js b/tests/baselines/reference/awaitClassExpression_es6.js
new file mode 100644
index 00000000000..26740b9de6d
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es6.js
@@ -0,0 +1,16 @@
+//// [awaitClassExpression_es6.ts]
+declare class C { }
+declare var p: Promise<typeof C>;
+
+async function func(): Promise<void> {
+    class D extends (await p) {
+    }
+}
+
+//// [awaitClassExpression_es6.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function* () {
+        class D extends (yield p) {
+        }
+    });
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es6.symbols b/tests/baselines/reference/awaitClassExpression_es6.symbols
new file mode 100644
index 00000000000..6d1e9f1a103
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es6.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/async/es6/awaitClassExpression_es6.ts ===
+declare class C { }
+>C : Symbol(C, Decl(awaitClassExpression_es6.ts, 0, 0))
+
+declare var p: Promise<typeof C>;
+>p : Symbol(p, Decl(awaitClassExpression_es6.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>C : Symbol(C, Decl(awaitClassExpression_es6.ts, 0, 0))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitClassExpression_es6.ts, 1, 33))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+
+    class D extends (await p) {
+>D : Symbol(D, Decl(awaitClassExpression_es6.ts, 3, 38))
+>p : Symbol(p, Decl(awaitClassExpression_es6.ts, 1, 11))
+    }
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es6.types b/tests/baselines/reference/awaitClassExpression_es6.types
new file mode 100644
index 00000000000..4a778021720
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es6.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/async/es6/awaitClassExpression_es6.ts ===
+declare class C { }
+>C : C
+
+declare var p: Promise<typeof C>;
+>p : Promise<typeof C>
+>Promise : Promise<T>
+>C : typeof C
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    class D extends (await p) {
+>D : D
+>(await p) : C
+>await p : typeof C
+>p : Promise<typeof C>
+    }
+}
diff --git a/tests/baselines/reference/awaitUnion_es5.js b/tests/baselines/reference/awaitUnion_es5.js
new file mode 100644
index 00000000000..e4ebaa4f62e
--- /dev/null
+++ b/tests/baselines/reference/awaitUnion_es5.js
@@ -0,0 +1,40 @@
+//// [awaitUnion_es5.ts]
+declare let a: number | string;
+declare let b: PromiseLike<number> | PromiseLike<string>;
+declare let c: PromiseLike<number | string>;
+declare let d: number | PromiseLike<string>;
+declare let e: number | PromiseLike<number | string>;
+async function f() {
+	let await_a = await a;
+	let await_b = await b;
+	let await_c = await c;
+	let await_d = await d;
+	let await_e = await e;
+}
+
+//// [awaitUnion_es5.js]
+function f() {
+    return __awaiter(this, void 0, void 0, function () {
+        var await_a, await_b, await_c, await_d, await_e;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, a];
+                case 1:
+                    await_a = _a.sent();
+                    return [4 /*yield*/, b];
+                case 2:
+                    await_b = _a.sent();
+                    return [4 /*yield*/, c];
+                case 3:
+                    await_c = _a.sent();
+                    return [4 /*yield*/, d];
+                case 4:
+                    await_d = _a.sent();
+                    return [4 /*yield*/, e];
+                case 5:
+                    await_e = _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/awaitUnion_es5.symbols b/tests/baselines/reference/awaitUnion_es5.symbols
new file mode 100644
index 00000000000..b8fb6dbed38
--- /dev/null
+++ b/tests/baselines/reference/awaitUnion_es5.symbols
@@ -0,0 +1,44 @@
+=== tests/cases/conformance/async/es5/awaitUnion_es5.ts ===
+declare let a: number | string;
+>a : Symbol(a, Decl(awaitUnion_es5.ts, 0, 11))
+
+declare let b: PromiseLike<number> | PromiseLike<string>;
+>b : Symbol(b, Decl(awaitUnion_es5.ts, 1, 11))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+
+declare let c: PromiseLike<number | string>;
+>c : Symbol(c, Decl(awaitUnion_es5.ts, 2, 11))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+
+declare let d: number | PromiseLike<string>;
+>d : Symbol(d, Decl(awaitUnion_es5.ts, 3, 11))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+
+declare let e: number | PromiseLike<number | string>;
+>e : Symbol(e, Decl(awaitUnion_es5.ts, 4, 11))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+
+async function f() {
+>f : Symbol(f, Decl(awaitUnion_es5.ts, 4, 53))
+
+	let await_a = await a;
+>await_a : Symbol(await_a, Decl(awaitUnion_es5.ts, 6, 4))
+>a : Symbol(a, Decl(awaitUnion_es5.ts, 0, 11))
+
+	let await_b = await b;
+>await_b : Symbol(await_b, Decl(awaitUnion_es5.ts, 7, 4))
+>b : Symbol(b, Decl(awaitUnion_es5.ts, 1, 11))
+
+	let await_c = await c;
+>await_c : Symbol(await_c, Decl(awaitUnion_es5.ts, 8, 4))
+>c : Symbol(c, Decl(awaitUnion_es5.ts, 2, 11))
+
+	let await_d = await d;
+>await_d : Symbol(await_d, Decl(awaitUnion_es5.ts, 9, 4))
+>d : Symbol(d, Decl(awaitUnion_es5.ts, 3, 11))
+
+	let await_e = await e;
+>await_e : Symbol(await_e, Decl(awaitUnion_es5.ts, 10, 4))
+>e : Symbol(e, Decl(awaitUnion_es5.ts, 4, 11))
+}
diff --git a/tests/baselines/reference/awaitUnion_es5.types b/tests/baselines/reference/awaitUnion_es5.types
new file mode 100644
index 00000000000..25c54d37ae8
--- /dev/null
+++ b/tests/baselines/reference/awaitUnion_es5.types
@@ -0,0 +1,49 @@
+=== tests/cases/conformance/async/es5/awaitUnion_es5.ts ===
+declare let a: number | string;
+>a : string | number
+
+declare let b: PromiseLike<number> | PromiseLike<string>;
+>b : PromiseLike<number> | PromiseLike<string>
+>PromiseLike : PromiseLike<T>
+>PromiseLike : PromiseLike<T>
+
+declare let c: PromiseLike<number | string>;
+>c : PromiseLike<string | number>
+>PromiseLike : PromiseLike<T>
+
+declare let d: number | PromiseLike<string>;
+>d : number | PromiseLike<string>
+>PromiseLike : PromiseLike<T>
+
+declare let e: number | PromiseLike<number | string>;
+>e : number | PromiseLike<string | number>
+>PromiseLike : PromiseLike<T>
+
+async function f() {
+>f : () => Promise<void>
+
+	let await_a = await a;
+>await_a : string | number
+>await a : string | number
+>a : string | number
+
+	let await_b = await b;
+>await_b : string | number
+>await b : string | number
+>b : PromiseLike<number> | PromiseLike<string>
+
+	let await_c = await c;
+>await_c : string | number
+>await c : string | number
+>c : PromiseLike<string | number>
+
+	let await_d = await d;
+>await_d : string | number
+>await d : string | number
+>d : number | PromiseLike<string>
+
+	let await_e = await e;
+>await_e : string | number
+>await e : string | number
+>e : number | PromiseLike<string | number>
+}
diff --git a/tests/baselines/reference/awaitUnion_es6.js b/tests/baselines/reference/awaitUnion_es6.js
index 9603454b969..628e488cb4f 100644
--- a/tests/baselines/reference/awaitUnion_es6.js
+++ b/tests/baselines/reference/awaitUnion_es6.js
@@ -9,7 +9,7 @@ async function f() {
 	let await_b = await b;
 	let await_c = await c;
 	let await_d = await d;
-	let await_e = await e; 
+	let await_e = await e;
 }
 
 //// [awaitUnion_es6.js]
diff --git a/tests/baselines/reference/awaitUnion_es6.symbols b/tests/baselines/reference/awaitUnion_es6.symbols
index 98a229c4148..c301f3c5b8d 100644
--- a/tests/baselines/reference/awaitUnion_es6.symbols
+++ b/tests/baselines/reference/awaitUnion_es6.symbols
@@ -38,7 +38,7 @@ async function f() {
 >await_d : Symbol(await_d, Decl(awaitUnion_es6.ts, 9, 4))
 >d : Symbol(d, Decl(awaitUnion_es6.ts, 3, 11))
 
-	let await_e = await e; 
+	let await_e = await e;
 >await_e : Symbol(await_e, Decl(awaitUnion_es6.ts, 10, 4))
 >e : Symbol(e, Decl(awaitUnion_es6.ts, 4, 11))
 }
diff --git a/tests/baselines/reference/awaitUnion_es6.types b/tests/baselines/reference/awaitUnion_es6.types
index eabcb56e59c..e15bf60fce2 100644
--- a/tests/baselines/reference/awaitUnion_es6.types
+++ b/tests/baselines/reference/awaitUnion_es6.types
@@ -42,7 +42,7 @@ async function f() {
 >await d : string | number
 >d : number | PromiseLike<string>
 
-	let await_e = await e; 
+	let await_e = await e;
 >await_e : string | number
 >await e : string | number
 >e : number | PromiseLike<string | number>
diff --git a/tests/baselines/reference/bind1.js b/tests/baselines/reference/bind1.js
index c658384db85..93eafedf81b 100644
--- a/tests/baselines/reference/bind1.js
+++ b/tests/baselines/reference/bind1.js
@@ -12,6 +12,6 @@ var M;
         function C() {
         }
         return C;
-    }());
-    M.C = C; // this should be an unresolved symbol I error
+    }()); // this should be an unresolved symbol I error
+    M.C = C;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
index 609d353fbc7..34c3fcc1961 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
@@ -10,7 +10,7 @@ declare function use(n: number): void;
 //// [blockScopedBindingsReassignedInLoop1.js]
 (function () {
     'use strict';
-    var _loop_1 = function(i) {
+    var _loop_1 = function (i) {
         (function () { return use(++i); })();
         out_i_1 = i;
     };
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
index 68bfd3cb676..08b869a4f99 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
@@ -42,7 +42,7 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
 }
 
 //// [blockScopedBindingsReassignedInLoop2.js]
-var _loop_1 = function(x, y) {
+var _loop_1 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_1 = x, out_y_1 = y, "break";
@@ -58,9 +58,10 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
     var state_1 = _loop_1(x, y);
     x = out_x_1;
     y = out_y_1;
-    if (state_1 === "break") break;
+    if (state_1 === "break")
+        break;
 }
-var _loop_2 = function(x, y) {
+var _loop_2 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_2 = x, out_y_2 = y, "continue";
@@ -77,7 +78,7 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
     x = out_x_2;
     y = out_y_2;
 }
-var _loop_3 = function(x, y) {
+var _loop_3 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_3 = x, out_y_3 = y, "break-loop";
@@ -90,14 +91,14 @@ var _loop_3 = function(x, y) {
 };
 var out_x_3, out_y_3;
 loop: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_3 = _loop_3(x, y);
+    var state_2 = _loop_3(x, y);
     x = out_x_3;
     y = out_y_3;
-    switch(state_3) {
+    switch (state_2) {
         case "break-loop": break loop;
     }
 }
-var _loop_4 = function(x, y) {
+var _loop_4 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_4 = x, out_y_4 = y, "continue-loop";
@@ -110,10 +111,10 @@ var _loop_4 = function(x, y) {
 };
 var out_x_4, out_y_4;
 loop: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_4 = _loop_4(x, y);
+    var state_3 = _loop_4(x, y);
     x = out_x_4;
     y = out_y_4;
-    switch(state_4) {
+    switch (state_3) {
         case "continue-loop": continue loop;
     }
 }
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
index 7e3bac4ff52..d299aaa8452 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
@@ -93,28 +93,29 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
 
 
 //// [blockScopedBindingsReassignedInLoop3.js]
-var _loop_1 = function(x, y) {
+var _loop_1 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_1 = x, out_y_1 = y, "break";
     }
     else {
-        var _loop_2 = function(a_1) {
+        var _loop_2 = function (a_1) {
             var f = function () { return a_1; };
             if (a_1) {
                 a_1 = x;
-                return out_a_1_1 = a_1, "break";
+                return out_a_1 = a_1, "break";
             }
             else {
                 y++;
             }
-            out_a_1_1 = a_1;
+            out_a_1 = a_1;
         };
-        var out_a_1_1;
+        var out_a_1;
         for (var a_1 = 1; a_1 < 5; --a_1) {
             var state_1 = _loop_2(a_1);
-            a_1 = out_a_1_1;
-            if (state_1 === "break") break;
+            a_1 = out_a_1;
+            if (state_1 === "break")
+                break;
         }
         y = 5;
     }
@@ -126,29 +127,30 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
     var state_2 = _loop_1(x, y);
     x = out_x_1;
     y = out_y_1;
-    if (state_2 === "break") break;
+    if (state_2 === "break")
+        break;
 }
-var _loop_3 = function(x, y) {
+var _loop_3 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_2 = x, out_y_2 = y, "continue";
     }
     else {
-        var _loop_4 = function(a_2) {
+        var _loop_4 = function (a_2) {
             var f = function () { return a_2; };
             if (a_2) {
                 a_2 = x;
-                return out_a_2_1 = a_2, "continue";
+                return out_a_2 = a_2, "continue";
             }
             else {
                 y++;
             }
-            out_a_2_1 = a_2;
+            out_a_2 = a_2;
         };
-        var out_a_2_1;
+        var out_a_2;
         for (var a_2 = 1; a_2 < 5; --a_2) {
             _loop_4(a_2);
-            a_2 = out_a_2_1;
+            a_2 = out_a_2;
         }
         y = 5;
     }
@@ -161,31 +163,31 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
     x = out_x_2;
     y = out_y_2;
 }
-var _loop_5 = function(x, y) {
+var _loop_5 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_3 = x, out_y_3 = y, "break-loop2";
     }
     else {
-        var _loop_6 = function(a_3) {
+        var _loop_6 = function (a_3) {
             var f = function () { return a_3; };
             if (a_3) {
                 a_3 = x;
-                return out_a_3_1 = a_3, "break-loop1";
+                return out_a_3 = a_3, "break-loop1";
             }
             else {
                 y++;
-                return out_a_3_1 = a_3, "break-loop2";
+                return out_a_3 = a_3, "break-loop2";
             }
-            out_a_3_1 = a_3;
+            out_a_3 = a_3;
         };
-        var out_a_3_1;
+        var out_a_3;
         loop1: for (var a_3 = 1; a_3 < 5; --a_3) {
-            var state_5 = _loop_6(a_3);
-            a_3 = out_a_3_1;
-            switch(state_5) {
+            var state_3 = _loop_6(a_3);
+            a_3 = out_a_3;
+            switch (state_3) {
                 case "break-loop1": break loop1;
-                case "break-loop2": return state_5;
+                case "break-loop2": return state_3;
             }
         }
         y = 5;
@@ -195,38 +197,38 @@ var _loop_5 = function(x, y) {
 };
 var out_x_3, out_y_3;
 loop2: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_6 = _loop_5(x, y);
+    var state_4 = _loop_5(x, y);
     x = out_x_3;
     y = out_y_3;
-    switch(state_6) {
+    switch (state_4) {
         case "break-loop2": break loop2;
     }
 }
-var _loop_7 = function(x, y) {
+var _loop_7 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1) {
         return out_x_4 = x, out_y_4 = y, "continue-loop2";
     }
     else {
-        var _loop_8 = function(a_4) {
+        var _loop_8 = function (a_4) {
             var f = function () { return a_4; };
             if (a_4) {
                 a_4 = x;
-                return out_a_4_1 = a_4, "continue-loop1";
+                return out_a_4 = a_4, "continue-loop1";
             }
             else {
                 y++;
-                return out_a_4_1 = a_4, "continue-loop2";
+                return out_a_4 = a_4, "continue-loop2";
             }
-            out_a_4_1 = a_4;
+            out_a_4 = a_4;
         };
-        var out_a_4_1;
+        var out_a_4;
         loop1: for (var a_4 = 1; a_4 < 5; --a_4) {
-            var state_7 = _loop_8(a_4);
-            a_4 = out_a_4_1;
-            switch(state_7) {
+            var state_5 = _loop_8(a_4);
+            a_4 = out_a_4;
+            switch (state_5) {
                 case "continue-loop1": continue loop1;
-                case "continue-loop2": return state_7;
+                case "continue-loop2": return state_5;
             }
         }
         y = 5;
@@ -236,10 +238,10 @@ var _loop_7 = function(x, y) {
 };
 var out_x_4, out_y_4;
 loop2: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_8 = _loop_7(x, y);
+    var state_6 = _loop_7(x, y);
     x = out_x_4;
     y = out_y_4;
-    switch(state_8) {
+    switch (state_6) {
         case "continue-loop2": continue loop2;
     }
 }
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
index 8bff867dc95..e3b99991904 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
@@ -13,7 +13,7 @@ function f1() {
 
 //// [blockScopedBindingsReassignedInLoop4.js]
 function f1() {
-    var _loop_1 = function(x, y) {
+    var _loop_1 = function (x, y) {
         var a = function () { return x++ + y++; };
         if (x == 1) {
             return { value: 1 };
@@ -29,6 +29,7 @@ function f1() {
         var state_1 = _loop_1(x, y);
         x = out_x_1;
         y = out_y_1;
-        if (typeof state_1 === "object") return state_1.value;
+        if (typeof state_1 === "object")
+            return state_1.value;
     }
 }
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
index a891147317d..1ea3f23897a 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
@@ -9,7 +9,7 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
 
 
 //// [blockScopedBindingsReassignedInLoop5.js]
-var _loop_1 = function(x, y) {
+var _loop_1 = function (x, y) {
     var a = function () { return x++ + y++; };
     if (x == 1)
         return out_x_1 = x, out_y_1 = y, "break";
@@ -23,5 +23,6 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
     var state_1 = _loop_1(x, y);
     x = out_x_1;
     y = out_y_1;
-    if (state_1 === "break") break;
+    if (state_1 === "break")
+        break;
 }
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
index a2a074ed4df..584d8b21100 100644
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
@@ -31,7 +31,7 @@ function f2() {
 
 //// [blockScopedBindingsReassignedInLoop6.js]
 function f1() {
-    var _loop_1 = function(x, y) {
+    var _loop_1 = function (x, y) {
         var a = function () { return x++ + y++; };
         if (x == 1)
             return out_x_1 = x, out_y_1 = y, "break";
@@ -47,12 +47,14 @@ function f1() {
         var state_1 = _loop_1(x, y);
         x = out_x_1;
         y = out_y_1;
-        if (typeof state_1 === "object") return state_1.value;
-        if (state_1 === "break") break;
+        if (typeof state_1 === "object")
+            return state_1.value;
+        if (state_1 === "break")
+            break;
     }
 }
 function f2() {
-    var _loop_2 = function(x, y) {
+    var _loop_2 = function (x, y) {
         var a = function () { return x++ + y++; };
         if (x == 1)
             return out_x_2 = x, out_y_2 = y, "break";
@@ -68,7 +70,9 @@ function f2() {
         var state_2 = _loop_2(x, y);
         x = out_x_2;
         y = out_y_2;
-        if (typeof state_2 === "object") return state_2.value;
-        if (state_2 === "break") break;
+        if (typeof state_2 === "object")
+            return state_2.value;
+        if (state_2 === "break")
+            break;
     }
 }
diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
index 06eaa9916e3..0197d919fef 100644
--- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
+++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
@@ -163,31 +163,35 @@ function foo8() {
     var x;
 }
 function foo9() {
-    var y = (function () {
-        function class_3() {
-        }
-        class_3.a = x;
-        return class_3;
-    }());
+    var y = (_a = (function () {
+            function class_3() {
+            }
+            return class_3;
+        }()),
+        _a.a = x,
+        _a);
     var x;
+    var _a;
 }
 function foo10() {
     var A = (function () {
         function A() {
         }
-        A.a = x;
         return A;
     }());
+    A.a = x;
     var x;
 }
 function foo11() {
     function f() {
-        var y = (function () {
-            function class_4() {
-            }
-            class_4.a = x;
-            return class_4;
-        }());
+        var y = (_a = (function () {
+                function class_4() {
+                }
+                return class_4;
+            }()),
+            _a.a = x,
+            _a);
+        var _a;
     }
     var x;
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop1.js b/tests/baselines/reference/capturedLetConstInLoop1.js
index fe76bdd5c91..e526092d082 100644
--- a/tests/baselines/reference/capturedLetConstInLoop1.js
+++ b/tests/baselines/reference/capturedLetConstInLoop1.js
@@ -114,15 +114,15 @@ for (const y = 0; y < 1;) {
 }
 
 //// [capturedLetConstInLoop1.js]
-//==== let
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     (function () { return x; });
     (function () { return x; });
 };
+//==== let
 for (var x in {}) {
     _loop_1(x);
 }
-var _loop_2 = function(x) {
+var _loop_2 = function (x) {
     (function () { return x; });
     (function () { return x; });
 };
@@ -130,14 +130,14 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var x = _a[_i];
     _loop_2(x);
 }
-var _loop_3 = function(x) {
+var _loop_3 = function (x) {
     (function () { return x; });
     (function () { return x; });
 };
 for (var x = 0; x < 1; ++x) {
     _loop_3(x);
 }
-var _loop_4 = function() {
+var _loop_4 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -145,7 +145,7 @@ var _loop_4 = function() {
 while (1 === 1) {
     _loop_4();
 }
-var _loop_5 = function() {
+var _loop_5 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -153,7 +153,7 @@ var _loop_5 = function() {
 do {
     _loop_5();
 } while (1 === 1);
-var _loop_6 = function(y) {
+var _loop_6 = function (y) {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -161,14 +161,14 @@ var _loop_6 = function(y) {
 for (var y = 0; y < 1; ++y) {
     _loop_6(y);
 }
-var _loop_7 = function(x, y) {
+var _loop_7 = function (x, y) {
     (function () { return x + y; });
     (function () { return x + y; });
 };
 for (var x = 0, y = 1; x < 1; ++x) {
     _loop_7(x, y);
 }
-var _loop_8 = function() {
+var _loop_8 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -176,7 +176,7 @@ var _loop_8 = function() {
 while (1 === 1) {
     _loop_8();
 }
-var _loop_9 = function() {
+var _loop_9 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -184,7 +184,7 @@ var _loop_9 = function() {
 do {
     _loop_9();
 } while (1 === 1);
-var _loop_10 = function(y) {
+var _loop_10 = function (y) {
     var x = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -192,15 +192,15 @@ var _loop_10 = function(y) {
 for (var y = 0; y < 1; ++y) {
     _loop_10(y);
 }
-//=========const
-var _loop_11 = function(x) {
+var _loop_11 = function (x) {
     (function () { return x; });
     (function () { return x; });
 };
+//=========const
 for (var x in {}) {
     _loop_11(x);
 }
-var _loop_12 = function(x) {
+var _loop_12 = function (x) {
     (function () { return x; });
     (function () { return x; });
 };
@@ -208,14 +208,14 @@ for (var _b = 0, _c = []; _b < _c.length; _b++) {
     var x = _c[_b];
     _loop_12(x);
 }
-var _loop_13 = function(x) {
+var _loop_13 = function (x) {
     (function () { return x; });
     (function () { return x; });
 };
 for (var x = 0; x < 1;) {
     _loop_13(x);
 }
-var _loop_14 = function() {
+var _loop_14 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -223,7 +223,7 @@ var _loop_14 = function() {
 while (1 === 1) {
     _loop_14();
 }
-var _loop_15 = function() {
+var _loop_15 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -231,7 +231,7 @@ var _loop_15 = function() {
 do {
     _loop_15();
 } while (1 === 1);
-var _loop_16 = function(y) {
+var _loop_16 = function (y) {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -239,14 +239,14 @@ var _loop_16 = function(y) {
 for (var y = 0; y < 1;) {
     _loop_16(y);
 }
-var _loop_17 = function(x, y) {
+var _loop_17 = function (x, y) {
     (function () { return x + y; });
     (function () { return x + y; });
 };
 for (var x = 0, y = 1; x < 1;) {
     _loop_17(x, y);
 }
-var _loop_18 = function() {
+var _loop_18 = function () {
     var x = 1, y = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -254,7 +254,7 @@ var _loop_18 = function() {
 while (1 === 1) {
     _loop_18();
 }
-var _loop_19 = function() {
+var _loop_19 = function () {
     var x = 1, y = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -262,7 +262,7 @@ var _loop_19 = function() {
 do {
     _loop_19();
 } while (1 === 1);
-var _loop_20 = function(y) {
+var _loop_20 = function (y) {
     var x = 1;
     (function () { return x + y; });
     (function () { return x + y; });
diff --git a/tests/baselines/reference/capturedLetConstInLoop10.js b/tests/baselines/reference/capturedLetConstInLoop10.js
index b493dcbd288..63c114ba6e4 100644
--- a/tests/baselines/reference/capturedLetConstInLoop10.js
+++ b/tests/baselines/reference/capturedLetConstInLoop10.js
@@ -50,7 +50,7 @@ var A = (function () {
     function A() {
     }
     A.prototype.foo = function () {
-        var _loop_1 = function(x) {
+        var _loop_1 = function (x) {
             var f = function () { return x; };
             this_1.bar(f());
         };
@@ -63,9 +63,9 @@ var A = (function () {
     A.prototype.bar = function (a) {
     };
     A.prototype.baz = function () {
-        var _loop_2 = function(x) {
+        var _loop_2 = function (x) {
             var a = function () { return x; };
-            var _loop_3 = function(y) {
+            var _loop_3 = function (y) {
                 var b = function () { return y; };
                 this_2.bar(b());
             };
@@ -76,16 +76,16 @@ var A = (function () {
             this_2.bar(a());
         };
         var this_2 = this;
-        for (var _b = 0, _c = [1]; _b < _c.length; _b++) {
-            var x = _c[_b];
+        for (var _i = 0, _a = [1]; _i < _a.length; _i++) {
+            var x = _a[_i];
             _loop_2(x);
         }
     };
     A.prototype.baz2 = function () {
-        var _loop_4 = function(x) {
+        var _loop_4 = function (x) {
             var a = function () { return x; };
             this_3.bar(a());
-            var _loop_5 = function(y) {
+            var _loop_5 = function (y) {
                 var b = function () { return y; };
                 this_3.bar(b());
             };
@@ -95,8 +95,8 @@ var A = (function () {
             }
         };
         var this_3 = this;
-        for (var _b = 0, _c = [1]; _b < _c.length; _b++) {
-            var x = _c[_b];
+        for (var _i = 0, _a = [1]; _i < _a.length; _i++) {
+            var x = _a[_i];
             _loop_4(x);
         }
     };
@@ -108,7 +108,7 @@ var B = (function () {
     B.prototype.foo = function () {
         var _this = this;
         var a = function () {
-            var _loop_6 = function(x) {
+            var _loop_6 = function (x) {
                 var f = function () { return x; };
                 _this.bar(f());
             };
diff --git a/tests/baselines/reference/capturedLetConstInLoop11.js b/tests/baselines/reference/capturedLetConstInLoop11.js
index 9190dd3ec02..8e9ca71580e 100644
--- a/tests/baselines/reference/capturedLetConstInLoop11.js
+++ b/tests/baselines/reference/capturedLetConstInLoop11.js
@@ -14,7 +14,7 @@ function foo() {
 }
 
 //// [capturedLetConstInLoop11.js]
-var _loop_1 = function() {
+var _loop_1 = function () {
     var x = 1;
     (function () { return x; });
 };
@@ -22,14 +22,15 @@ for (;;) {
     _loop_1();
 }
 function foo() {
-    var _loop_2 = function() {
+    var _loop_2 = function () {
         var a = 0;
         switch (a) {
             case 0: return { value: function () { return a; } };
         }
     };
     for (;;) {
-        var state_2 = _loop_2();
-        if (typeof state_2 === "object") return state_2.value;
+        var state_1 = _loop_2();
+        if (typeof state_1 === "object")
+            return state_1.value;
     }
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop11_ES6.js b/tests/baselines/reference/capturedLetConstInLoop11_ES6.js
index 49f6e9f5214..df288953f1e 100644
--- a/tests/baselines/reference/capturedLetConstInLoop11_ES6.js
+++ b/tests/baselines/reference/capturedLetConstInLoop11_ES6.js
@@ -16,7 +16,7 @@ function foo() {
 //// [capturedLetConstInLoop11_ES6.js]
 for (;;) {
     let x = 1;
-    (() => x);
+    () => x;
 }
 function foo() {
     for (;;) {
diff --git a/tests/baselines/reference/capturedLetConstInLoop12.js b/tests/baselines/reference/capturedLetConstInLoop12.js
index 7235c959a59..1bb691bb72a 100644
--- a/tests/baselines/reference/capturedLetConstInLoop12.js
+++ b/tests/baselines/reference/capturedLetConstInLoop12.js
@@ -18,8 +18,11 @@
 //// [capturedLetConstInLoop12.js]
 (function () {
     "use strict";
-    var _loop_1 = function(i) {
-        (function () { return (_a = [i + 1], i = _a[0], _a); var _a; })();
+    var _loop_1 = function (i) {
+        (function () {
+            return _a = [i + 1], i = _a[0], _a;
+            var _a;
+        })();
         out_i_1 = i;
     };
     var out_i_1;
@@ -30,8 +33,11 @@
 })();
 (function () {
     "use strict";
-    var _loop_2 = function(i) {
-        (function () { return (_a = { a: i + 1 }, i = _a.a, _a); var _a; })();
+    var _loop_2 = function (i) {
+        (function () {
+            return (_a = { a: i + 1 }, i = _a.a, _a);
+            var _a;
+        })();
         out_i_2 = i;
     };
     var out_i_2;
diff --git a/tests/baselines/reference/capturedLetConstInLoop2.js b/tests/baselines/reference/capturedLetConstInLoop2.js
index b41dd380a24..e4461760af3 100644
--- a/tests/baselines/reference/capturedLetConstInLoop2.js
+++ b/tests/baselines/reference/capturedLetConstInLoop2.js
@@ -179,7 +179,7 @@ function foo8_c(x) {
 //// [capturedLetConstInLoop2.js]
 // ========let
 function foo0(x) {
-    var _loop_1 = function(x_1) {
+    var _loop_1 = function (x_1) {
         var a = arguments_1.length;
         (function () { return x_1 + a; });
         (function () { return x_1 + a; });
@@ -191,7 +191,7 @@ function foo0(x) {
     }
 }
 function foo0_1(x) {
-    var _loop_2 = function(x_2) {
+    var _loop_2 = function (x_2) {
         var a = arguments_2.length;
         (function () { return x_2 + a; });
         (function () { return x_2 + a; });
@@ -202,7 +202,7 @@ function foo0_1(x) {
     }
 }
 function foo1(x) {
-    var _loop_3 = function(x_3) {
+    var _loop_3 = function (x_3) {
         var a = arguments_3.length;
         (function () { return x_3 + a; });
         (function () { return x_3 + a; });
@@ -213,7 +213,7 @@ function foo1(x) {
     }
 }
 function foo2(x) {
-    var _loop_4 = function() {
+    var _loop_4 = function () {
         var a = arguments_4.length;
         (function () { return x + a; });
         (function () { return x + a; });
@@ -224,7 +224,7 @@ function foo2(x) {
     }
 }
 function foo3(x) {
-    var _loop_5 = function() {
+    var _loop_5 = function () {
         var x_4;
         var a = arguments_5.length;
         (function () { return x_4 + a; });
@@ -236,7 +236,7 @@ function foo3(x) {
     } while (1 === 1);
 }
 function foo4(x) {
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
         var a = arguments_6.length;
         var x_5 = 1;
         (function () { return x_5 + a; });
@@ -248,7 +248,7 @@ function foo4(x) {
     }
 }
 function foo5(x) {
-    var _loop_7 = function(x_6, y) {
+    var _loop_7 = function (x_6, y) {
         var a = arguments_7.length;
         (function () { return x_6 + y + a; });
         (function () { return x_6 + y + a; });
@@ -259,7 +259,7 @@ function foo5(x) {
     }
 }
 function foo6(x) {
-    var _loop_8 = function() {
+    var _loop_8 = function () {
         var x_7, y;
         var a = arguments_8.length;
         (function () { return x_7 + y + a; });
@@ -271,7 +271,7 @@ function foo6(x) {
     }
 }
 function foo7(x) {
-    var _loop_9 = function() {
+    var _loop_9 = function () {
         var x_8, y;
         var a = arguments_9.length;
         (function () { return x_8 + y + a; });
@@ -283,7 +283,7 @@ function foo7(x) {
     } while (1 === 1);
 }
 function foo8(x) {
-    var _loop_10 = function(y) {
+    var _loop_10 = function (y) {
         var x_9 = 1;
         var a = arguments_10.length;
         (function () { return x_9 + y + a; });
@@ -296,7 +296,7 @@ function foo8(x) {
 }
 ///=======const
 function foo0_c(x) {
-    var _loop_11 = function(x_10) {
+    var _loop_11 = function (x_10) {
         var a = arguments_11.length;
         (function () { return x_10 + a; });
         (function () { return x_10 + a; });
@@ -308,7 +308,7 @@ function foo0_c(x) {
     }
 }
 function foo0_1_c(x) {
-    var _loop_12 = function(x_11) {
+    var _loop_12 = function (x_11) {
         var a = arguments_12.length;
         (function () { return x_11 + a; });
         (function () { return x_11 + a; });
@@ -319,7 +319,7 @@ function foo0_1_c(x) {
     }
 }
 function foo1_c(x) {
-    var _loop_13 = function(x_12) {
+    var _loop_13 = function (x_12) {
         var a = arguments_13.length;
         (function () { return x_12 + a; });
         (function () { return x_12 + a; });
@@ -330,7 +330,7 @@ function foo1_c(x) {
     }
 }
 function foo2_c(x) {
-    var _loop_14 = function() {
+    var _loop_14 = function () {
         var a = arguments_14.length;
         (function () { return x + a; });
         (function () { return x + a; });
@@ -341,7 +341,7 @@ function foo2_c(x) {
     }
 }
 function foo3_c(x) {
-    var _loop_15 = function() {
+    var _loop_15 = function () {
         var x_13 = 1;
         var a = arguments_15.length;
         (function () { return x_13 + a; });
@@ -353,7 +353,7 @@ function foo3_c(x) {
     } while (1 === 1);
 }
 function foo4_c(x) {
-    var _loop_16 = function(y) {
+    var _loop_16 = function (y) {
         var a = arguments_16.length;
         var x_14 = 1;
         (function () { return x_14 + a; });
@@ -365,7 +365,7 @@ function foo4_c(x) {
     }
 }
 function foo5_c(x) {
-    var _loop_17 = function(x_15, y) {
+    var _loop_17 = function (x_15, y) {
         var a = arguments_17.length;
         (function () { return x_15 + y + a; });
         (function () { return x_15 + y + a; });
@@ -376,7 +376,7 @@ function foo5_c(x) {
     }
 }
 function foo6_c(x) {
-    var _loop_18 = function() {
+    var _loop_18 = function () {
         var x_16 = 1, y = 1;
         var a = arguments_18.length;
         (function () { return x_16 + y + a; });
@@ -388,7 +388,7 @@ function foo6_c(x) {
     }
 }
 function foo7_c(x) {
-    var _loop_19 = function() {
+    var _loop_19 = function () {
         var x_17 = 1, y = 1;
         var a = arguments_19.length;
         (function () { return x_17 + y + a; });
@@ -400,7 +400,7 @@ function foo7_c(x) {
     } while (1 === 1);
 }
 function foo8_c(x) {
-    var _loop_20 = function(y) {
+    var _loop_20 = function (y) {
         var x_18 = 1;
         var a = arguments_20.length;
         (function () { return x_18 + y + a; });
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.js b/tests/baselines/reference/capturedLetConstInLoop3.js
index 233dfe9206c..f3bae712c5b 100644
--- a/tests/baselines/reference/capturedLetConstInLoop3.js
+++ b/tests/baselines/reference/capturedLetConstInLoop3.js
@@ -219,7 +219,7 @@ function foo8_c(x) {
 
 //// [capturedLetConstInLoop3.js]
 function foo0(x) {
-    var _loop_1 = function(x_1) {
+    var _loop_1 = function (x_1) {
         v = x_1;
         (function () { return x_1 + v; });
         (function () { return x_1 + v; });
@@ -232,7 +232,7 @@ function foo0(x) {
     use(v);
 }
 function foo0_1(x) {
-    var _loop_2 = function(x_2) {
+    var _loop_2 = function (x_2) {
         v = x_2;
         (function () { return x_2 + v; });
         (function () { return x_2 + v; });
@@ -244,7 +244,7 @@ function foo0_1(x) {
     use(v);
 }
 function foo1(x) {
-    var _loop_3 = function(x_3) {
+    var _loop_3 = function (x_3) {
         v = x_3;
         (function () { return x_3 + v; });
         (function () { return x_3 + v; });
@@ -256,7 +256,7 @@ function foo1(x) {
     use(v);
 }
 function foo2(x) {
-    var _loop_4 = function() {
+    var _loop_4 = function () {
         var x_4 = 1;
         v = x_4;
         (function () { return x_4 + v; });
@@ -269,7 +269,7 @@ function foo2(x) {
     use(v);
 }
 function foo3(x) {
-    var _loop_5 = function() {
+    var _loop_5 = function () {
         var x_5;
         (function () { return x_5 + v; });
         (function () { return x_5 + v; });
@@ -281,7 +281,7 @@ function foo3(x) {
     use(v);
 }
 function foo4(x) {
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
         v = y;
         var x_6 = 1;
         (function () { return x_6 + v; });
@@ -294,7 +294,7 @@ function foo4(x) {
     use(v);
 }
 function foo5(x) {
-    var _loop_7 = function(x_7, y) {
+    var _loop_7 = function (x_7, y) {
         v = x_7;
         (function () { return x_7 + y + v; });
         (function () { return x_7 + y + v; });
@@ -306,7 +306,7 @@ function foo5(x) {
     use(v);
 }
 function foo6(x) {
-    var _loop_8 = function() {
+    var _loop_8 = function () {
         var x_8, y;
         v = x_8;
         (function () { return x_8 + y + v; });
@@ -319,7 +319,7 @@ function foo6(x) {
     use(v);
 }
 function foo7(x) {
-    var _loop_9 = function() {
+    var _loop_9 = function () {
         var x_9, y;
         v = x_9;
         (function () { return x_9 + y + v; });
@@ -332,7 +332,7 @@ function foo7(x) {
     use(v);
 }
 function foo8(x) {
-    var _loop_10 = function(y) {
+    var _loop_10 = function (y) {
         var x_10 = 1;
         v = x_10;
         (function () { return x_10 + y + v; });
@@ -346,7 +346,7 @@ function foo8(x) {
 }
 //===const
 function foo0_c(x) {
-    var _loop_11 = function(x_11) {
+    var _loop_11 = function (x_11) {
         v = x_11;
         (function () { return x_11 + v; });
         (function () { return x_11 + v; });
@@ -359,7 +359,7 @@ function foo0_c(x) {
     use(v);
 }
 function foo0_1_c(x) {
-    var _loop_12 = function(x_12) {
+    var _loop_12 = function (x_12) {
         v = x_12;
         (function () { return x_12 + v; });
         (function () { return x_12 + v; });
@@ -371,7 +371,7 @@ function foo0_1_c(x) {
     use(v);
 }
 function foo1_c(x) {
-    var _loop_13 = function(x_13) {
+    var _loop_13 = function (x_13) {
         v = x_13;
         (function () { return x_13 + v; });
         (function () { return x_13 + v; });
@@ -383,7 +383,7 @@ function foo1_c(x) {
     use(v);
 }
 function foo2_c(x) {
-    var _loop_14 = function() {
+    var _loop_14 = function () {
         var x_14 = 1;
         v = x_14;
         (function () { return x_14 + v; });
@@ -396,7 +396,7 @@ function foo2_c(x) {
     use(v);
 }
 function foo3_c(x) {
-    var _loop_15 = function() {
+    var _loop_15 = function () {
         var x_15 = 1;
         (function () { return x_15 + v; });
         (function () { return x_15 + v; });
@@ -408,7 +408,7 @@ function foo3_c(x) {
     use(v);
 }
 function foo4_c(x) {
-    var _loop_16 = function(y) {
+    var _loop_16 = function (y) {
         v = y;
         var x_16 = 1;
         (function () { return x_16 + v; });
@@ -421,7 +421,7 @@ function foo4_c(x) {
     use(v);
 }
 function foo5_c(x) {
-    var _loop_17 = function(x_17, y) {
+    var _loop_17 = function (x_17, y) {
         v = x_17;
         (function () { return x_17 + y + v; });
         (function () { return x_17 + y + v; });
@@ -433,7 +433,7 @@ function foo5_c(x) {
     use(v);
 }
 function foo6_c(x) {
-    var _loop_18 = function() {
+    var _loop_18 = function () {
         var x_18 = 1, y = 1;
         v = x_18;
         (function () { return x_18 + y + v; });
@@ -446,7 +446,7 @@ function foo6_c(x) {
     use(v);
 }
 function foo7_c(x) {
-    var _loop_19 = function() {
+    var _loop_19 = function () {
         var x_19 = 1, y = 1;
         v = x_19;
         (function () { return x_19 + y + v; });
@@ -459,7 +459,7 @@ function foo7_c(x) {
     use(v);
 }
 function foo8_c(x) {
-    var _loop_20 = function(y) {
+    var _loop_20 = function (y) {
         var x_20 = 1;
         v = x_20;
         (function () { return x_20 + y + v; });
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.js b/tests/baselines/reference/capturedLetConstInLoop4.js
index 04f514b01e8..e3587ad64c6 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4.js
+++ b/tests/baselines/reference/capturedLetConstInLoop4.js
@@ -144,24 +144,24 @@ for (const y = 0; y < 1;) {
 
 
 //// [capturedLetConstInLoop4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c;
     //======let
     function exportedFoo() {
         return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
     }
-    exports_1("exportedFoo", exportedFoo);
     //======const
     function exportedFoo2() {
         return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
     }
+    var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c;
+    exports_1("exportedFoo", exportedFoo);
     exports_1("exportedFoo2", exportedFoo2);
     return {
-        setters:[],
-        execute: function() {
-            var _loop_1 = function(x) {
+        setters: [],
+        execute: function () {
+            var _loop_1 = function (x) {
                 v0 = x;
                 (function () { return x + v0; });
                 (function () { return x; });
@@ -170,7 +170,7 @@ System.register([], function(exports_1, context_1) {
                 var x = _a[_i];
                 _loop_1(x);
             }
-            var _loop_2 = function(x) {
+            var _loop_2 = function (x) {
                 v00 = x;
                 (function () { return x + v00; });
                 (function () { return x; });
@@ -178,7 +178,7 @@ System.register([], function(exports_1, context_1) {
             for (var x in []) {
                 _loop_2(x);
             }
-            var _loop_3 = function(x) {
+            var _loop_3 = function (x) {
                 v1 = x;
                 (function () { return x + v1; });
                 (function () { return x; });
@@ -186,7 +186,7 @@ System.register([], function(exports_1, context_1) {
             for (var x = 0; x < 1; ++x) {
                 _loop_3(x);
             }
-            var _loop_4 = function() {
+            var _loop_4 = function () {
                 var x;
                 v2 = x;
                 (function () { return x + v2; });
@@ -195,7 +195,7 @@ System.register([], function(exports_1, context_1) {
             while (1 === 1) {
                 _loop_4();
             }
-            var _loop_5 = function() {
+            var _loop_5 = function () {
                 var x;
                 v3 = x;
                 (function () { return x + v3; });
@@ -204,7 +204,7 @@ System.register([], function(exports_1, context_1) {
             do {
                 _loop_5();
             } while (1 === 1);
-            var _loop_6 = function(y) {
+            var _loop_6 = function (y) {
                 var x = 1;
                 v4 = x;
                 (function () { return x + v4; });
@@ -213,7 +213,7 @@ System.register([], function(exports_1, context_1) {
             for (var y = 0; y < 1; ++y) {
                 _loop_6(y);
             }
-            var _loop_7 = function(x, y) {
+            var _loop_7 = function (x, y) {
                 v5 = x;
                 (function () { return x + y + v5; });
                 (function () { return x + y; });
@@ -221,7 +221,7 @@ System.register([], function(exports_1, context_1) {
             for (var x = 0, y = 1; x < 1; ++x) {
                 _loop_7(x, y);
             }
-            var _loop_8 = function() {
+            var _loop_8 = function () {
                 var x, y;
                 v6 = x;
                 (function () { return x + y + v6; });
@@ -230,7 +230,7 @@ System.register([], function(exports_1, context_1) {
             while (1 === 1) {
                 _loop_8();
             }
-            var _loop_9 = function() {
+            var _loop_9 = function () {
                 var x, y;
                 v7 = x;
                 (function () { return x + y + v7; });
@@ -239,7 +239,7 @@ System.register([], function(exports_1, context_1) {
             do {
                 _loop_9();
             } while (1 === 1);
-            var _loop_10 = function(y) {
+            var _loop_10 = function (y) {
                 var x = 1;
                 v8 = x;
                 (function () { return x + y + v8; });
@@ -248,7 +248,7 @@ System.register([], function(exports_1, context_1) {
             for (var y = 0; y < 1; ++y) {
                 _loop_10(y);
             }
-            var _loop_11 = function(x) {
+            var _loop_11 = function (x) {
                 v0_c = x;
                 (function () { return x + v0_c; });
                 (function () { return x; });
@@ -257,7 +257,7 @@ System.register([], function(exports_1, context_1) {
                 var x = _c[_b];
                 _loop_11(x);
             }
-            var _loop_12 = function(x) {
+            var _loop_12 = function (x) {
                 v00_c = x;
                 (function () { return x + v00; });
                 (function () { return x; });
@@ -265,7 +265,7 @@ System.register([], function(exports_1, context_1) {
             for (var x in []) {
                 _loop_12(x);
             }
-            var _loop_13 = function(x) {
+            var _loop_13 = function (x) {
                 v1_c = x;
                 (function () { return x + v1_c; });
                 (function () { return x; });
@@ -273,7 +273,7 @@ System.register([], function(exports_1, context_1) {
             for (var x = 0; x < 1;) {
                 _loop_13(x);
             }
-            var _loop_14 = function() {
+            var _loop_14 = function () {
                 var x = 1;
                 v2_c = x;
                 (function () { return x + v2_c; });
@@ -282,7 +282,7 @@ System.register([], function(exports_1, context_1) {
             while (1 === 1) {
                 _loop_14();
             }
-            var _loop_15 = function() {
+            var _loop_15 = function () {
                 var x = 1;
                 v3_c = x;
                 (function () { return x + v3_c; });
@@ -291,7 +291,7 @@ System.register([], function(exports_1, context_1) {
             do {
                 _loop_15();
             } while (1 === 1);
-            var _loop_16 = function(y) {
+            var _loop_16 = function (y) {
                 var x = 1;
                 v4_c = x;
                 (function () { return x + v4_c; });
@@ -300,7 +300,7 @@ System.register([], function(exports_1, context_1) {
             for (var y = 0; y < 1;) {
                 _loop_16(y);
             }
-            var _loop_17 = function(x, y) {
+            var _loop_17 = function (x, y) {
                 v5_c = x;
                 (function () { return x + y + v5_c; });
                 (function () { return x + y; });
@@ -308,7 +308,7 @@ System.register([], function(exports_1, context_1) {
             for (var x = 0, y = 1; x < 1;) {
                 _loop_17(x, y);
             }
-            var _loop_18 = function() {
+            var _loop_18 = function () {
                 var x = 1, y = 1;
                 v6_c = x;
                 (function () { return x + y + v6_c; });
@@ -317,7 +317,7 @@ System.register([], function(exports_1, context_1) {
             while (1 === 1) {
                 _loop_18();
             }
-            var _loop_19 = function() {
+            var _loop_19 = function () {
                 var x = 1, y = 1;
                 v7_c = x;
                 (function () { return x + y + v7_c; });
@@ -326,7 +326,7 @@ System.register([], function(exports_1, context_1) {
             do {
                 _loop_19();
             } while (1 === 1);
-            var _loop_20 = function(y) {
+            var _loop_20 = function (y) {
                 var x = 1;
                 v8_c = x;
                 (function () { return x + y + v8_c; });
@@ -336,5 +336,5 @@ System.register([], function(exports_1, context_1) {
                 _loop_20(y);
             }
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/capturedLetConstInLoop5.js b/tests/baselines/reference/capturedLetConstInLoop5.js
index a1a4d4b0a8f..4ea4c85c0d7 100644
--- a/tests/baselines/reference/capturedLetConstInLoop5.js
+++ b/tests/baselines/reference/capturedLetConstInLoop5.js
@@ -282,7 +282,7 @@ function foo8_c(x) {
 //// [capturedLetConstInLoop5.js]
 //====let
 function foo0(x) {
-    var _loop_1 = function(x_1) {
+    var _loop_1 = function (x_1) {
         v = x_1;
         (function () { return x_1 + v; });
         (function () { return x_1 + v; });
@@ -294,12 +294,13 @@ function foo0(x) {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
         var x_1 = _a[_i];
         var state_1 = _loop_1(x_1);
-        if (typeof state_1 === "object") return state_1.value;
+        if (typeof state_1 === "object")
+            return state_1.value;
     }
     use(v);
 }
 function foo00(x) {
-    var _loop_2 = function(x_2) {
+    var _loop_2 = function (x_2) {
         v = x_2;
         (function () { return x_2 + v; });
         (function () { return x_2 + v; });
@@ -310,12 +311,13 @@ function foo00(x) {
     var v;
     for (var x_2 in []) {
         var state_2 = _loop_2(x_2);
-        if (typeof state_2 === "object") return state_2.value;
+        if (typeof state_2 === "object")
+            return state_2.value;
     }
     use(v);
 }
 function foo1(x) {
-    var _loop_3 = function(x_3) {
+    var _loop_3 = function (x_3) {
         v = x_3;
         (function () { return x_3 + v; });
         (function () { return x_3 + v; });
@@ -326,12 +328,13 @@ function foo1(x) {
     var v;
     for (var x_3 = 0; x_3 < 1; ++x_3) {
         var state_3 = _loop_3(x_3);
-        if (typeof state_3 === "object") return state_3.value;
+        if (typeof state_3 === "object")
+            return state_3.value;
     }
     use(v);
 }
 function foo2(x) {
-    var _loop_4 = function() {
+    var _loop_4 = function () {
         var x_4 = 1;
         v = x_4;
         (function () { return x_4 + v; });
@@ -343,12 +346,13 @@ function foo2(x) {
     var v;
     while (1 === 1) {
         var state_4 = _loop_4();
-        if (typeof state_4 === "object") return state_4.value;
+        if (typeof state_4 === "object")
+            return state_4.value;
     }
     use(v);
 }
 function foo3(x) {
-    var _loop_5 = function() {
+    var _loop_5 = function () {
         var x_5;
         (function () { return x_5 + v; });
         (function () { return x_5 + v; });
@@ -359,12 +363,13 @@ function foo3(x) {
     var v;
     do {
         var state_5 = _loop_5();
-        if (typeof state_5 === "object") return state_5.value;
+        if (typeof state_5 === "object")
+            return state_5.value;
     } while (1 === 1);
     use(v);
 }
 function foo4(x) {
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
         v = y;
         var x_6 = 1;
         (function () { return x_6 + v; });
@@ -376,12 +381,13 @@ function foo4(x) {
     var v;
     for (var y = 0; y < 1; ++y) {
         var state_6 = _loop_6(y);
-        if (typeof state_6 === "object") return state_6.value;
+        if (typeof state_6 === "object")
+            return state_6.value;
     }
     use(v);
 }
 function foo5(x) {
-    var _loop_7 = function(x_7, y) {
+    var _loop_7 = function (x_7, y) {
         v = x_7;
         (function () { return x_7 + y + v; });
         (function () { return x_7 + y + v; });
@@ -392,12 +398,13 @@ function foo5(x) {
     var v;
     for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) {
         var state_7 = _loop_7(x_7, y);
-        if (typeof state_7 === "object") return state_7.value;
+        if (typeof state_7 === "object")
+            return state_7.value;
     }
     use(v);
 }
 function foo6(x) {
-    var _loop_8 = function() {
+    var _loop_8 = function () {
         var x_8, y;
         v = x_8;
         (function () { return x_8 + y + v; });
@@ -409,13 +416,14 @@ function foo6(x) {
     var v;
     while (1 === 1) {
         var state_8 = _loop_8();
-        if (typeof state_8 === "object") return state_8.value;
+        if (typeof state_8 === "object")
+            return state_8.value;
     }
     ;
     use(v);
 }
 function foo7(x) {
-    var _loop_9 = function() {
+    var _loop_9 = function () {
         var x_9, y;
         v = x_9;
         (function () { return x_9 + y + v; });
@@ -427,12 +435,13 @@ function foo7(x) {
     var v;
     do {
         var state_9 = _loop_9();
-        if (typeof state_9 === "object") return state_9.value;
+        if (typeof state_9 === "object")
+            return state_9.value;
     } while (1 === 1);
     use(v);
 }
 function foo8(x) {
-    var _loop_10 = function(y) {
+    var _loop_10 = function (y) {
         var x_10 = 1;
         v = x_10;
         (function () { return x_10 + y + v; });
@@ -444,13 +453,14 @@ function foo8(x) {
     var v;
     for (var y = 0; y < 1; ++y) {
         var state_10 = _loop_10(y);
-        if (typeof state_10 === "object") return state_10.value;
+        if (typeof state_10 === "object")
+            return state_10.value;
     }
     use(v);
 }
 //====const
 function foo0_c(x) {
-    var _loop_11 = function(x_11) {
+    var _loop_11 = function (x_11) {
         v = x_11;
         (function () { return x_11 + v; });
         (function () { return x_11 + v; });
@@ -462,12 +472,13 @@ function foo0_c(x) {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
         var x_11 = _a[_i];
         var state_11 = _loop_11(x_11);
-        if (typeof state_11 === "object") return state_11.value;
+        if (typeof state_11 === "object")
+            return state_11.value;
     }
     use(v);
 }
 function foo00_c(x) {
-    var _loop_12 = function(x_12) {
+    var _loop_12 = function (x_12) {
         v = x_12;
         (function () { return x_12 + v; });
         (function () { return x_12 + v; });
@@ -478,12 +489,13 @@ function foo00_c(x) {
     var v;
     for (var x_12 in []) {
         var state_12 = _loop_12(x_12);
-        if (typeof state_12 === "object") return state_12.value;
+        if (typeof state_12 === "object")
+            return state_12.value;
     }
     use(v);
 }
 function foo1_c(x) {
-    var _loop_13 = function(x_13) {
+    var _loop_13 = function (x_13) {
         v = x_13;
         (function () { return x_13 + v; });
         (function () { return x_13 + v; });
@@ -494,12 +506,13 @@ function foo1_c(x) {
     var v;
     for (var x_13 = 0; x_13 < 1;) {
         var state_13 = _loop_13(x_13);
-        if (typeof state_13 === "object") return state_13.value;
+        if (typeof state_13 === "object")
+            return state_13.value;
     }
     use(v);
 }
 function foo2_c(x) {
-    var _loop_14 = function() {
+    var _loop_14 = function () {
         var x_14 = 1;
         v = x_14;
         (function () { return x_14 + v; });
@@ -511,12 +524,13 @@ function foo2_c(x) {
     var v;
     while (1 === 1) {
         var state_14 = _loop_14();
-        if (typeof state_14 === "object") return state_14.value;
+        if (typeof state_14 === "object")
+            return state_14.value;
     }
     use(v);
 }
 function foo3_c(x) {
-    var _loop_15 = function() {
+    var _loop_15 = function () {
         var x_15 = 1;
         (function () { return x_15 + v; });
         (function () { return x_15 + v; });
@@ -527,12 +541,13 @@ function foo3_c(x) {
     var v;
     do {
         var state_15 = _loop_15();
-        if (typeof state_15 === "object") return state_15.value;
+        if (typeof state_15 === "object")
+            return state_15.value;
     } while (1 === 1);
     use(v);
 }
 function foo4_c(x) {
-    var _loop_16 = function(y) {
+    var _loop_16 = function (y) {
         v = y;
         var x_16 = 1;
         (function () { return x_16 + v; });
@@ -544,12 +559,13 @@ function foo4_c(x) {
     var v;
     for (var y = 0; y < 1;) {
         var state_16 = _loop_16(y);
-        if (typeof state_16 === "object") return state_16.value;
+        if (typeof state_16 === "object")
+            return state_16.value;
     }
     use(v);
 }
 function foo5_c(x) {
-    var _loop_17 = function(x_17, y) {
+    var _loop_17 = function (x_17, y) {
         v = x_17;
         (function () { return x_17 + y + v; });
         (function () { return x_17 + y + v; });
@@ -560,12 +576,13 @@ function foo5_c(x) {
     var v;
     for (var x_17 = 0, y = 1; x_17 < 1;) {
         var state_17 = _loop_17(x_17, y);
-        if (typeof state_17 === "object") return state_17.value;
+        if (typeof state_17 === "object")
+            return state_17.value;
     }
     use(v);
 }
 function foo6_c(x) {
-    var _loop_18 = function() {
+    var _loop_18 = function () {
         var x_18 = 1, y = 1;
         v = x_18;
         (function () { return x_18 + y + v; });
@@ -577,12 +594,13 @@ function foo6_c(x) {
     var v;
     while (1 === 1) {
         var state_18 = _loop_18();
-        if (typeof state_18 === "object") return state_18.value;
+        if (typeof state_18 === "object")
+            return state_18.value;
     }
     use(v);
 }
 function foo7_c(x) {
-    var _loop_19 = function() {
+    var _loop_19 = function () {
         var x_19 = 1, y = 1;
         v = x_19;
         (function () { return x_19 + y + v; });
@@ -594,12 +612,13 @@ function foo7_c(x) {
     var v;
     do {
         var state_19 = _loop_19();
-        if (typeof state_19 === "object") return state_19.value;
+        if (typeof state_19 === "object")
+            return state_19.value;
     } while (1 === 1);
     use(v);
 }
 function foo8_c(x) {
-    var _loop_20 = function(y) {
+    var _loop_20 = function (y) {
         var x_20 = 1;
         v = x_20;
         (function () { return x_20 + y + v; });
@@ -611,7 +630,8 @@ function foo8_c(x) {
     var v;
     for (var y = 0; y < 1;) {
         var state_20 = _loop_20(y);
-        if (typeof state_20 === "object") return state_20.value;
+        if (typeof state_20 === "object")
+            return state_20.value;
     }
     use(v);
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop6.js b/tests/baselines/reference/capturedLetConstInLoop6.js
index 6a2b4c9a335..cf813da44e1 100644
--- a/tests/baselines/reference/capturedLetConstInLoop6.js
+++ b/tests/baselines/reference/capturedLetConstInLoop6.js
@@ -239,8 +239,7 @@ for (const y = 0; y < 1;) {
 
 
 //// [capturedLetConstInLoop6.js]
-// ====let
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -250,12 +249,14 @@ var _loop_1 = function(x) {
         return "continue";
     }
 };
+// ====let
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var x = _a[_i];
     var state_1 = _loop_1(x);
-    if (state_1 === "break") break;
+    if (state_1 === "break")
+        break;
 }
-var _loop_2 = function(x) {
+var _loop_2 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == "1") {
@@ -267,9 +268,10 @@ var _loop_2 = function(x) {
 };
 for (var x in []) {
     var state_2 = _loop_2(x);
-    if (state_2 === "break") break;
+    if (state_2 === "break")
+        break;
 }
-var _loop_3 = function(x) {
+var _loop_3 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -281,9 +283,10 @@ var _loop_3 = function(x) {
 };
 for (var x = 0; x < 1; ++x) {
     var state_3 = _loop_3(x);
-    if (state_3 === "break") break;
+    if (state_3 === "break")
+        break;
 }
-var _loop_4 = function() {
+var _loop_4 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -296,9 +299,10 @@ var _loop_4 = function() {
 };
 while (1 === 1) {
     var state_4 = _loop_4();
-    if (state_4 === "break") break;
+    if (state_4 === "break")
+        break;
 }
-var _loop_5 = function() {
+var _loop_5 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -311,9 +315,10 @@ var _loop_5 = function() {
 };
 do {
     var state_5 = _loop_5();
-    if (state_5 === "break") break;
+    if (state_5 === "break")
+        break;
 } while (1 === 1);
-var _loop_6 = function(y) {
+var _loop_6 = function (y) {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -326,9 +331,10 @@ var _loop_6 = function(y) {
 };
 for (var y = 0; y < 1; ++y) {
     var state_6 = _loop_6(y);
-    if (state_6 === "break") break;
+    if (state_6 === "break")
+        break;
 }
-var _loop_7 = function(x, y) {
+var _loop_7 = function (x, y) {
     (function () { return x + y; });
     (function () { return x + y; });
     if (x == 1) {
@@ -340,9 +346,10 @@ var _loop_7 = function(x, y) {
 };
 for (var x = 0, y = 1; x < 1; ++x) {
     var state_7 = _loop_7(x, y);
-    if (state_7 === "break") break;
+    if (state_7 === "break")
+        break;
 }
-var _loop_8 = function() {
+var _loop_8 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -355,9 +362,10 @@ var _loop_8 = function() {
 };
 while (1 === 1) {
     var state_8 = _loop_8();
-    if (state_8 === "break") break;
+    if (state_8 === "break")
+        break;
 }
-var _loop_9 = function() {
+var _loop_9 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -370,9 +378,10 @@ var _loop_9 = function() {
 };
 do {
     var state_9 = _loop_9();
-    if (state_9 === "break") break;
+    if (state_9 === "break")
+        break;
 } while (1 === 1);
-var _loop_10 = function(y) {
+var _loop_10 = function (y) {
     var x = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -385,10 +394,10 @@ var _loop_10 = function(y) {
 };
 for (var y = 0; y < 1; ++y) {
     var state_10 = _loop_10(y);
-    if (state_10 === "break") break;
+    if (state_10 === "break")
+        break;
 }
-// ====const
-var _loop_11 = function(x) {
+var _loop_11 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -398,12 +407,14 @@ var _loop_11 = function(x) {
         return "continue";
     }
 };
+// ====const
 for (var _b = 0, _c = []; _b < _c.length; _b++) {
     var x = _c[_b];
     var state_11 = _loop_11(x);
-    if (state_11 === "break") break;
+    if (state_11 === "break")
+        break;
 }
-var _loop_12 = function(x) {
+var _loop_12 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == "1") {
@@ -415,9 +426,10 @@ var _loop_12 = function(x) {
 };
 for (var x in []) {
     var state_12 = _loop_12(x);
-    if (state_12 === "break") break;
+    if (state_12 === "break")
+        break;
 }
-var _loop_13 = function(x) {
+var _loop_13 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -429,9 +441,10 @@ var _loop_13 = function(x) {
 };
 for (var x = 0; x < 1;) {
     var state_13 = _loop_13(x);
-    if (state_13 === "break") break;
+    if (state_13 === "break")
+        break;
 }
-var _loop_14 = function() {
+var _loop_14 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -444,9 +457,10 @@ var _loop_14 = function() {
 };
 while (1 === 1) {
     var state_14 = _loop_14();
-    if (state_14 === "break") break;
+    if (state_14 === "break")
+        break;
 }
-var _loop_15 = function() {
+var _loop_15 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -459,9 +473,10 @@ var _loop_15 = function() {
 };
 do {
     var state_15 = _loop_15();
-    if (state_15 === "break") break;
+    if (state_15 === "break")
+        break;
 } while (1 === 1);
-var _loop_16 = function(y) {
+var _loop_16 = function (y) {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -474,9 +489,10 @@ var _loop_16 = function(y) {
 };
 for (var y = 0; y < 1;) {
     var state_16 = _loop_16(y);
-    if (state_16 === "break") break;
+    if (state_16 === "break")
+        break;
 }
-var _loop_17 = function(x, y) {
+var _loop_17 = function (x, y) {
     (function () { return x + y; });
     (function () { return x + y; });
     if (x == 1) {
@@ -488,9 +504,10 @@ var _loop_17 = function(x, y) {
 };
 for (var x = 0, y = 1; x < 1;) {
     var state_17 = _loop_17(x, y);
-    if (state_17 === "break") break;
+    if (state_17 === "break")
+        break;
 }
-var _loop_18 = function() {
+var _loop_18 = function () {
     var x = 1, y = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -503,9 +520,10 @@ var _loop_18 = function() {
 };
 while (1 === 1) {
     var state_18 = _loop_18();
-    if (state_18 === "break") break;
+    if (state_18 === "break")
+        break;
 }
-var _loop_19 = function() {
+var _loop_19 = function () {
     var x = 1, y = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -518,9 +536,10 @@ var _loop_19 = function() {
 };
 do {
     var state_19 = _loop_19();
-    if (state_19 === "break") break;
+    if (state_19 === "break")
+        break;
 } while (1 === 1);
-var _loop_20 = function(y) {
+var _loop_20 = function (y) {
     var x = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -533,5 +552,6 @@ var _loop_20 = function(y) {
 };
 for (var y = 0; y < 1;) {
     var state_20 = _loop_20(y);
-    if (state_20 === "break") break;
+    if (state_20 === "break")
+        break;
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop7.js b/tests/baselines/reference/capturedLetConstInLoop7.js
index 56b84e7802d..c4bd9b2d2b9 100644
--- a/tests/baselines/reference/capturedLetConstInLoop7.js
+++ b/tests/baselines/reference/capturedLetConstInLoop7.js
@@ -376,8 +376,7 @@ for (const y = 0; y < 1;) {
 }
 
 //// [capturedLetConstInLoop7.js]
-//===let
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -393,16 +392,18 @@ var _loop_1 = function(x) {
         return "continue-l0";
     }
 };
+//===let
 l0: for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var x = _a[_i];
     var state_1 = _loop_1(x);
-    if (state_1 === "break") break;
-    switch(state_1) {
+    if (state_1 === "break")
+        break;
+    switch (state_1) {
         case "break-l0": break l0;
         case "continue-l0": continue l0;
     }
 }
-var _loop_2 = function(x) {
+var _loop_2 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == "1") {
@@ -420,13 +421,14 @@ var _loop_2 = function(x) {
 };
 l00: for (var x in []) {
     var state_2 = _loop_2(x);
-    if (state_2 === "break") break;
-    switch(state_2) {
+    if (state_2 === "break")
+        break;
+    switch (state_2) {
         case "break-l00": break l00;
         case "continue-l00": continue l00;
     }
 }
-var _loop_3 = function(x) {
+var _loop_3 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -444,13 +446,14 @@ var _loop_3 = function(x) {
 };
 l1: for (var x = 0; x < 1; ++x) {
     var state_3 = _loop_3(x);
-    if (state_3 === "break") break;
-    switch(state_3) {
+    if (state_3 === "break")
+        break;
+    switch (state_3) {
         case "break-l1": break l1;
         case "continue-l1": continue l1;
     }
 }
-var _loop_4 = function() {
+var _loop_4 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -469,13 +472,14 @@ var _loop_4 = function() {
 };
 l2: while (1 === 1) {
     var state_4 = _loop_4();
-    if (state_4 === "break") break;
-    switch(state_4) {
+    if (state_4 === "break")
+        break;
+    switch (state_4) {
         case "break-l2": break l2;
         case "continue-l2": continue l2;
     }
 }
-var _loop_5 = function() {
+var _loop_5 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -494,13 +498,14 @@ var _loop_5 = function() {
 };
 l3: do {
     var state_5 = _loop_5();
-    if (state_5 === "break") break;
-    switch(state_5) {
+    if (state_5 === "break")
+        break;
+    switch (state_5) {
         case "break-l3": break l3;
         case "continue-l3": continue l3;
     }
 } while (1 === 1);
-var _loop_6 = function(y) {
+var _loop_6 = function (y) {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -519,13 +524,14 @@ var _loop_6 = function(y) {
 };
 l4: for (var y = 0; y < 1; ++y) {
     var state_6 = _loop_6(y);
-    if (state_6 === "break") break;
-    switch(state_6) {
+    if (state_6 === "break")
+        break;
+    switch (state_6) {
         case "break-l4": break l4;
         case "continue-l4": continue l4;
     }
 }
-var _loop_7 = function(x, y) {
+var _loop_7 = function (x, y) {
     (function () { return x + y; });
     (function () { return x + y; });
     if (x == 1) {
@@ -543,13 +549,14 @@ var _loop_7 = function(x, y) {
 };
 l5: for (var x = 0, y = 1; x < 1; ++x) {
     var state_7 = _loop_7(x, y);
-    if (state_7 === "break") break;
-    switch(state_7) {
+    if (state_7 === "break")
+        break;
+    switch (state_7) {
         case "break-l5": break l5;
         case "continue-l5": continue l5;
     }
 }
-var _loop_8 = function() {
+var _loop_8 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -568,13 +575,14 @@ var _loop_8 = function() {
 };
 l6: while (1 === 1) {
     var state_8 = _loop_8();
-    if (state_8 === "break") break;
-    switch(state_8) {
+    if (state_8 === "break")
+        break;
+    switch (state_8) {
         case "break-l6": break l6;
         case "continue-l6": continue l6;
     }
 }
-var _loop_9 = function() {
+var _loop_9 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -593,13 +601,14 @@ var _loop_9 = function() {
 };
 l7: do {
     var state_9 = _loop_9();
-    if (state_9 === "break") break;
-    switch(state_9) {
+    if (state_9 === "break")
+        break;
+    switch (state_9) {
         case "break-l7": break l7;
         case "continue-l7": continue l7;
     }
 } while (1 === 1);
-var _loop_10 = function(y) {
+var _loop_10 = function (y) {
     var x = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -618,14 +627,14 @@ var _loop_10 = function(y) {
 };
 l8: for (var y = 0; y < 1; ++y) {
     var state_10 = _loop_10(y);
-    if (state_10 === "break") break;
-    switch(state_10) {
+    if (state_10 === "break")
+        break;
+    switch (state_10) {
         case "break-l8": break l8;
         case "continue-l8": continue l8;
     }
 }
-//===const
-var _loop_11 = function(x) {
+var _loop_11 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -641,16 +650,18 @@ var _loop_11 = function(x) {
         return "continue-l0_c";
     }
 };
+//===const
 l0_c: for (var _b = 0, _c = []; _b < _c.length; _b++) {
     var x = _c[_b];
     var state_11 = _loop_11(x);
-    if (state_11 === "break") break;
-    switch(state_11) {
+    if (state_11 === "break")
+        break;
+    switch (state_11) {
         case "break-l0_c": break l0_c;
         case "continue-l0_c": continue l0_c;
     }
 }
-var _loop_12 = function(x) {
+var _loop_12 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == "1") {
@@ -668,13 +679,14 @@ var _loop_12 = function(x) {
 };
 l00_c: for (var x in []) {
     var state_12 = _loop_12(x);
-    if (state_12 === "break") break;
-    switch(state_12) {
+    if (state_12 === "break")
+        break;
+    switch (state_12) {
         case "break-l00_c": break l00_c;
         case "continue-l00_c": continue l00_c;
     }
 }
-var _loop_13 = function(x) {
+var _loop_13 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -692,13 +704,14 @@ var _loop_13 = function(x) {
 };
 l1_c: for (var x = 0; x < 1;) {
     var state_13 = _loop_13(x);
-    if (state_13 === "break") break;
-    switch(state_13) {
+    if (state_13 === "break")
+        break;
+    switch (state_13) {
         case "break-l1_c": break l1_c;
         case "continue-l1_c": continue l1_c;
     }
 }
-var _loop_14 = function() {
+var _loop_14 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -717,13 +730,14 @@ var _loop_14 = function() {
 };
 l2_c: while (1 === 1) {
     var state_14 = _loop_14();
-    if (state_14 === "break") break;
-    switch(state_14) {
+    if (state_14 === "break")
+        break;
+    switch (state_14) {
         case "break-l2_c": break l2_c;
         case "continue-l2_c": continue l2_c;
     }
 }
-var _loop_15 = function() {
+var _loop_15 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -742,13 +756,14 @@ var _loop_15 = function() {
 };
 l3_c: do {
     var state_15 = _loop_15();
-    if (state_15 === "break") break;
-    switch(state_15) {
+    if (state_15 === "break")
+        break;
+    switch (state_15) {
         case "break-l3_c": break l3_c;
         case "continue-l3_c": continue l3_c;
     }
 } while (1 === 1);
-var _loop_16 = function(y) {
+var _loop_16 = function (y) {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -767,13 +782,14 @@ var _loop_16 = function(y) {
 };
 l4_c: for (var y = 0; y < 1;) {
     var state_16 = _loop_16(y);
-    if (state_16 === "break") break;
-    switch(state_16) {
+    if (state_16 === "break")
+        break;
+    switch (state_16) {
         case "break-l4_c": break l4_c;
         case "continue-l4_c": continue l4_c;
     }
 }
-var _loop_17 = function(x, y) {
+var _loop_17 = function (x, y) {
     (function () { return x + y; });
     (function () { return x + y; });
     if (x == 1) {
@@ -791,13 +807,14 @@ var _loop_17 = function(x, y) {
 };
 l5_c: for (var x = 0, y = 1; x < 1;) {
     var state_17 = _loop_17(x, y);
-    if (state_17 === "break") break;
-    switch(state_17) {
+    if (state_17 === "break")
+        break;
+    switch (state_17) {
         case "break-l5_c": break l5_c;
         case "continue-l5_c": continue l5_c;
     }
 }
-var _loop_18 = function() {
+var _loop_18 = function () {
     var x = 1, y = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -816,13 +833,14 @@ var _loop_18 = function() {
 };
 l6_c: while (1 === 1) {
     var state_18 = _loop_18();
-    if (state_18 === "break") break;
-    switch(state_18) {
+    if (state_18 === "break")
+        break;
+    switch (state_18) {
         case "break-l6_c": break l6_c;
         case "continue-l6_c": continue l6_c;
     }
 }
-var _loop_19 = function() {
+var _loop_19 = function () {
     var x = 1, y = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -841,13 +859,14 @@ var _loop_19 = function() {
 };
 l7_c: do {
     var state_19 = _loop_19();
-    if (state_19 === "break") break;
-    switch(state_19) {
+    if (state_19 === "break")
+        break;
+    switch (state_19) {
         case "break-l7_c": break l7_c;
         case "continue-l7_c": continue l7_c;
     }
 } while (1 === 1);
-var _loop_20 = function(y) {
+var _loop_20 = function (y) {
     var x = 1;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -866,8 +885,9 @@ var _loop_20 = function(y) {
 };
 l8_c: for (var y = 0; y < 1;) {
     var state_20 = _loop_20(y);
-    if (state_20 === "break") break;
-    switch(state_20) {
+    if (state_20 === "break")
+        break;
+    switch (state_20) {
         case "break-l8_c": break l8_c;
         case "continue-l8_c": continue l8_c;
     }
diff --git a/tests/baselines/reference/capturedLetConstInLoop8.js b/tests/baselines/reference/capturedLetConstInLoop8.js
index 122bdb96e36..92087b5efbb 100644
--- a/tests/baselines/reference/capturedLetConstInLoop8.js
+++ b/tests/baselines/reference/capturedLetConstInLoop8.js
@@ -129,8 +129,8 @@ function foo_c() {
 //// [capturedLetConstInLoop8.js]
 function foo() {
     l0: for (var z = 0; z < 1; ++z) {
-        var _loop_1 = function(x) {
-            var _loop_2 = function(y) {
+        var _loop_1 = function (x) {
+            var _loop_2 = function (y) {
                 (function () { return x + y; });
                 (function () { return x + y; });
                 if (y == 1) {
@@ -163,9 +163,11 @@ function foo() {
             };
             ll1: for (var y = 0; y < 1; ++y) {
                 var state_1 = _loop_2(y);
-                if (typeof state_1 === "object") return state_1;
-                if (state_1 === "break") break;
-                switch(state_1) {
+                if (typeof state_1 === "object")
+                    return state_1;
+                if (state_1 === "break")
+                    break;
+                switch (state_1) {
                     case "break-l1": return state_1;
                     case "break-ll1": break ll1;
                     case "continue-l0": return state_1;
@@ -197,9 +199,11 @@ function foo() {
         };
         l1: for (var x = 0; x < 1; ++x) {
             var state_2 = _loop_1(x);
-            if (typeof state_2 === "object") return state_2.value;
-            if (state_2 === "break") break;
-            switch(state_2) {
+            if (typeof state_2 === "object")
+                return state_2.value;
+            if (state_2 === "break")
+                break;
+            switch (state_2) {
                 case "break-l1": break l1;
                 case "continue-l0": continue l0;
                 case "continue-l1": continue l1;
@@ -209,8 +213,8 @@ function foo() {
 }
 function foo_c() {
     l0: for (var z = 0; z < 1;) {
-        var _loop_3 = function(x) {
-            var _loop_4 = function(y) {
+        var _loop_3 = function (x) {
+            var _loop_4 = function (y) {
                 (function () { return x + y; });
                 (function () { return x + y; });
                 if (y == 1) {
@@ -243,9 +247,11 @@ function foo_c() {
             };
             ll1: for (var y = 0; y < 1;) {
                 var state_3 = _loop_4(y);
-                if (typeof state_3 === "object") return state_3;
-                if (state_3 === "break") break;
-                switch(state_3) {
+                if (typeof state_3 === "object")
+                    return state_3;
+                if (state_3 === "break")
+                    break;
+                switch (state_3) {
                     case "break-l1": return state_3;
                     case "break-ll1": break ll1;
                     case "continue-l0": return state_3;
@@ -277,9 +283,11 @@ function foo_c() {
         };
         l1: for (var x = 0; x < 1;) {
             var state_4 = _loop_3(x);
-            if (typeof state_4 === "object") return state_4.value;
-            if (state_4 === "break") break;
-            switch(state_4) {
+            if (typeof state_4 === "object")
+                return state_4.value;
+            if (state_4 === "break")
+                break;
+            switch (state_4) {
                 case "break-l1": break l1;
                 case "continue-l0": continue l0;
                 case "continue-l1": continue l1;
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js
index 1f79b1694cb..84f9a021054 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9.js
+++ b/tests/baselines/reference/capturedLetConstInLoop9.js
@@ -139,7 +139,7 @@ function foo3 () {
 }
 
 //// [capturedLetConstInLoop9.js]
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     var x_1;
     (function () { return x_1; });
     {
@@ -157,7 +157,7 @@ var _loop_1 = function(x) {
             (function () { return x_4; });
             break;
     }
-    var _loop_2 = function() {
+    var _loop_2 = function () {
         var x_5;
         (function () { return x_5; });
     };
@@ -177,7 +177,7 @@ for (var x = 0; x < 1; ++x) {
     _loop_1(x);
 }
 function foo() {
-    var _loop_3 = function(a) {
+    var _loop_3 = function (a) {
         if (a === 1) {
             return "break";
         }
@@ -198,8 +198,8 @@ function foo() {
             }
             return { value: 50 };
         }
-        var _loop_4 = function(b) {
-            _c = [{ x1: 1, y: arguments_1.length }][0], x1 = _c.x1, z1 = _c.y;
+        var _loop_4 = function (b) {
+            _a = [{ x1: 1, y: arguments_1.length }][0], x1 = _a.x1, z1 = _a.y;
             if (b === 1) {
                 return "break";
             }
@@ -209,25 +209,28 @@ function foo() {
             (function () { return b; });
             return { value: 100 };
         };
-        for (var _d = 0, _e = []; _d < _e.length; _d++) {
-            var b = _e[_d];
-            var state_3 = _loop_4(b);
-            if (typeof state_3 === "object") return state_3;
-            if (state_3 === "break") break;
-            switch(state_3) {
-                case "break-l0": return state_3;
+        for (var _c = 0, _d = []; _c < _d.length; _c++) {
+            var b = _d[_c];
+            var state_1 = _loop_4(b);
+            if (typeof state_1 === "object")
+                return state_1;
+            if (state_1 === "break")
+                break;
+            switch (state_1) {
+                case "break-l0": return state_1;
             }
         }
         (function () { return a; });
     };
-    var arguments_1 = arguments;
-    var x, z, x1, z1;
-    l0: for (var _f = 0, _g = []; _f < _g.length; _f++) {
-        var a = _g[_f];
-        var state_4 = _loop_3(a);
-        if (typeof state_4 === "object") return state_4.value;
-        if (state_4 === "break") break;
-        switch(state_4) {
+    var arguments_1 = arguments, x, z, x1, z1;
+    l0: for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var a = _a[_i];
+        var state_2 = _loop_3(a);
+        if (typeof state_2 === "object")
+            return state_2.value;
+        if (state_2 === "break")
+            break;
+        switch (state_2) {
             case "break-l0": break l0;
         }
     }
@@ -235,6 +238,7 @@ function foo() {
     use(z);
     use(x1);
     use(z1);
+    var _b, _a;
 }
 function foo2() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
@@ -272,7 +276,7 @@ var C = (function () {
     }
     C.prototype.foo = function () {
         var _this = this;
-        var _loop_5 = function(i) {
+        var _loop_5 = function (i) {
             var f = function () { return _this.N * i; };
         };
         for (var i = 0; i < 100; i++) {
@@ -283,7 +287,7 @@ var C = (function () {
 }());
 function foo3() {
     var x = arguments.length;
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
         var z = arguments_2.length;
         (function () { return y + z + arguments.length; });
     };
diff --git a/tests/baselines/reference/capturedLetConstInLoop9_ES6.js b/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
index 0c9d8ea6a68..a06d9c6f747 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
@@ -196,10 +196,10 @@ function foo() {
             if (b === 2) {
                 break l0;
             }
-            (() => b);
+            () => b;
             return 100;
         }
-        (() => a);
+        () => a;
     }
     use(x);
     use(z);
diff --git a/tests/baselines/reference/capturedParametersInInitializers2.js b/tests/baselines/reference/capturedParametersInInitializers2.js
index 8d2cd4d58cd..e2b492a012f 100644
--- a/tests/baselines/reference/capturedParametersInInitializers2.js
+++ b/tests/baselines/reference/capturedParametersInInitializers2.js
@@ -7,14 +7,16 @@ function foo2(y = class {[x] = x}, x = 1) {
 
 //// [capturedParametersInInitializers2.js]
 function foo(y, x) {
-    if (y === void 0) { y = (function () {
-        function class_1() {
-        }
-        class_1.c = x;
-        return class_1;
-    }()); }
+    if (y === void 0) { y = (_a = (function () {
+            function class_1() {
+            }
+            return class_1;
+        }()),
+        _a.c = x,
+        _a); }
     if (x === void 0) { x = 1; }
     y.c;
+    var _a;
 }
 function foo2(y, x) {
     if (y === void 0) { y = (function () {
diff --git a/tests/baselines/reference/castExpressionParentheses.js b/tests/baselines/reference/castExpressionParentheses.js
index b4754d0ad41..94d5daafb0a 100644
--- a/tests/baselines/reference/castExpressionParentheses.js
+++ b/tests/baselines/reference/castExpressionParentheses.js
@@ -53,7 +53,7 @@ new (<any>A());
 //// [castExpressionParentheses.js]
 // parentheses should be omitted
 // literals
-{ a: 0 };
+({ a: 0 });
 [1, 3,];
 "string";
 23.0;
diff --git a/tests/baselines/reference/castOfYield.js b/tests/baselines/reference/castOfYield.js
index 652cf28e9e1..633f780a6a1 100644
--- a/tests/baselines/reference/castOfYield.js
+++ b/tests/baselines/reference/castOfYield.js
@@ -7,7 +7,7 @@ function* f() {
 
 
 //// [castOfYield.js]
-function f() {
+function* f() {
     (yield 0);
     // Unlike await, yield is not allowed to appear in a simple unary expression.
     ;
diff --git a/tests/baselines/reference/castParentheses.js b/tests/baselines/reference/castParentheses.js
index 936b2e7af07..feeced645e2 100644
--- a/tests/baselines/reference/castParentheses.js
+++ b/tests/baselines/reference/castParentheses.js
@@ -21,6 +21,6 @@ var b = a;
 var b = a.b;
 var b = a.b.c;
 var b = a.b().c;
-var b = (new a);
-var b = (new a.b);
+var b = new a;
+var b = new a.b;
 var b = (new a).b;
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index 2b1111f3096..a6113d5f241 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -20,6 +20,6 @@ var m;
 })(m = exports.m || (exports.m = {}));
 //// [chainedImportAlias_file1.js]
 "use strict";
-var x = require('./chainedImportAlias_file0');
+var x = require("./chainedImportAlias_file0");
 var y = x;
 y.m.foo();
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index 52fe5f3ef54..193b3e1da07 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/tests/baselines/reference/circularReference.js
@@ -35,7 +35,7 @@ export module M1 {
 
 //// [foo1.js]
 "use strict";
-var foo2 = require('./foo2');
+var foo2 = require("./foo2");
 var M1;
 (function (M1) {
     var C1 = (function () {
@@ -50,7 +50,7 @@ var M1;
 })(M1 = exports.M1 || (exports.M1 = {}));
 //// [foo2.js]
 "use strict";
-var foo1 = require('./foo1');
+var foo1 = require("./foo1");
 var M1;
 (function (M1) {
     var C1 = (function () {
diff --git a/tests/baselines/reference/class2.js b/tests/baselines/reference/class2.js
index 6ef78ed46ee..91ac89da109 100644
--- a/tests/baselines/reference/class2.js
+++ b/tests/baselines/reference/class2.js
@@ -5,6 +5,6 @@ class foo { constructor() { static f = 3; } }
 var foo = (function () {
     function foo() {
     }
-    foo.f = 3;
     return foo;
 }());
+foo.f = 3;
diff --git a/tests/baselines/reference/classExpressionES61.js b/tests/baselines/reference/classExpressionES61.js
index afef0909039..eaf013acbaf 100644
--- a/tests/baselines/reference/classExpressionES61.js
+++ b/tests/baselines/reference/classExpressionES61.js
@@ -3,5 +3,4 @@ var v = class C {};
 
 //// [classExpressionES61.js]
 var v = class C {
-}
-;
+};
diff --git a/tests/baselines/reference/classExpressionES62.js b/tests/baselines/reference/classExpressionES62.js
index 79cede7300d..620d86c6de2 100644
--- a/tests/baselines/reference/classExpressionES62.js
+++ b/tests/baselines/reference/classExpressionES62.js
@@ -6,5 +6,4 @@ var v = class C extends D {};
 class D {
 }
 var v = class C extends D {
-}
-;
+};
diff --git a/tests/baselines/reference/classExpressionES63.js b/tests/baselines/reference/classExpressionES63.js
index 5a72e173475..66d5bc4de4c 100644
--- a/tests/baselines/reference/classExpressionES63.js
+++ b/tests/baselines/reference/classExpressionES63.js
@@ -11,20 +11,17 @@ let C = class extends class extends class {
     constructor() {
         this.a = 1;
     }
-}
- {
+} {
     constructor() {
         super(...arguments);
         this.b = 2;
     }
-}
- {
+} {
     constructor() {
         super(...arguments);
         this.c = 3;
     }
-}
-;
+};
 let c = new C();
 c.a;
 c.b;
diff --git a/tests/baselines/reference/classExpressionWithDecorator1.js b/tests/baselines/reference/classExpressionWithDecorator1.js
index e051e05251b..9b52891b559 100644
--- a/tests/baselines/reference/classExpressionWithDecorator1.js
+++ b/tests/baselines/reference/classExpressionWithDecorator1.js
@@ -12,10 +12,10 @@ var v = ;
 var C = (function () {
     function C() {
     }
-    C.p = 1;
-    C = __decorate([
-        decorate
-    ], C);
     return C;
 }());
+C.p = 1;
+C = __decorate([
+    decorate
+], C);
 ;
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties1.js b/tests/baselines/reference/classExpressionWithStaticProperties1.js
index cfe85d97a71..205f59367cc 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties1.js
+++ b/tests/baselines/reference/classExpressionWithStaticProperties1.js
@@ -1,11 +1,18 @@
 //// [classExpressionWithStaticProperties1.ts]
-var v = class C { static a = 1; static b = 2 };
+var v = class C {
+    static a = 1;
+    static b = 2;
+    static c = C.a + C.b;
+};
 
 //// [classExpressionWithStaticProperties1.js]
-var v = (function () {
-    function C() {
-    }
-    C.a = 1;
-    C.b = 2;
-    return C;
-}());
+var v = (_a = (function () {
+        function C() {
+        }
+        return C;
+    }()),
+    _a.a = 1,
+    _a.b = 2,
+    _a.c = _a.a + _a.b,
+    _a);
+var _a;
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties1.symbols b/tests/baselines/reference/classExpressionWithStaticProperties1.symbols
index d4c811daebe..f8b3c270ea9 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties1.symbols
+++ b/tests/baselines/reference/classExpressionWithStaticProperties1.symbols
@@ -1,7 +1,21 @@
 === tests/cases/compiler/classExpressionWithStaticProperties1.ts ===
-var v = class C { static a = 1; static b = 2 };
+var v = class C {
 >v : Symbol(v, Decl(classExpressionWithStaticProperties1.ts, 0, 3))
 >C : Symbol(C, Decl(classExpressionWithStaticProperties1.ts, 0, 7))
->a : Symbol(C.a, Decl(classExpressionWithStaticProperties1.ts, 0, 17))
->b : Symbol(C.b, Decl(classExpressionWithStaticProperties1.ts, 0, 31))
 
+    static a = 1;
+>a : Symbol(C.a, Decl(classExpressionWithStaticProperties1.ts, 0, 17))
+
+    static b = 2;
+>b : Symbol(C.b, Decl(classExpressionWithStaticProperties1.ts, 1, 17))
+
+    static c = C.a + C.b;
+>c : Symbol(C.c, Decl(classExpressionWithStaticProperties1.ts, 2, 17))
+>C.a : Symbol(C.a, Decl(classExpressionWithStaticProperties1.ts, 0, 17))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties1.ts, 0, 7))
+>a : Symbol(C.a, Decl(classExpressionWithStaticProperties1.ts, 0, 17))
+>C.b : Symbol(C.b, Decl(classExpressionWithStaticProperties1.ts, 1, 17))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties1.ts, 0, 7))
+>b : Symbol(C.b, Decl(classExpressionWithStaticProperties1.ts, 1, 17))
+
+};
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties1.types b/tests/baselines/reference/classExpressionWithStaticProperties1.types
index b014f78abf7..168bb028474 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties1.types
+++ b/tests/baselines/reference/classExpressionWithStaticProperties1.types
@@ -1,10 +1,25 @@
 === tests/cases/compiler/classExpressionWithStaticProperties1.ts ===
-var v = class C { static a = 1; static b = 2 };
+var v = class C {
 >v : typeof C
->class C { static a = 1; static b = 2 } : typeof C
+>class C {    static a = 1;    static b = 2;    static c = C.a + C.b;} : typeof C
 >C : typeof C
+
+    static a = 1;
 >a : number
 >1 : number
+
+    static b = 2;
 >b : number
 >2 : number
 
+    static c = C.a + C.b;
+>c : number
+>C.a + C.b : number
+>C.a : number
+>C : typeof C
+>a : number
+>C.b : number
+>C : typeof C
+>b : number
+
+};
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties2.js b/tests/baselines/reference/classExpressionWithStaticProperties2.js
index 134441e0ad9..eb1c2da2e21 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties2.js
+++ b/tests/baselines/reference/classExpressionWithStaticProperties2.js
@@ -1,10 +1,23 @@
 //// [classExpressionWithStaticProperties2.ts]
-var v = class C { static a = 1; static b };
+var v = class C {
+    static a = 1;
+    static b
+    static c = {
+        x: "hi"
+    }
+    static d = C.c.x + " world";
+ };
 
 //// [classExpressionWithStaticProperties2.js]
-var v = (function () {
-    function C() {
-    }
-    C.a = 1;
-    return C;
-}());
+var v = (_a = (function () {
+        function C() {
+        }
+        return C;
+    }()),
+    _a.a = 1,
+    _a.c = {
+        x: "hi"
+    },
+    _a.d = _a.c.x + " world",
+    _a);
+var _a;
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties2.symbols b/tests/baselines/reference/classExpressionWithStaticProperties2.symbols
index 480123a1c3b..981e1e258c7 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties2.symbols
+++ b/tests/baselines/reference/classExpressionWithStaticProperties2.symbols
@@ -1,7 +1,26 @@
 === tests/cases/compiler/classExpressionWithStaticProperties2.ts ===
-var v = class C { static a = 1; static b };
+var v = class C {
 >v : Symbol(v, Decl(classExpressionWithStaticProperties2.ts, 0, 3))
 >C : Symbol(C, Decl(classExpressionWithStaticProperties2.ts, 0, 7))
->a : Symbol(C.a, Decl(classExpressionWithStaticProperties2.ts, 0, 17))
->b : Symbol(C.b, Decl(classExpressionWithStaticProperties2.ts, 0, 31))
 
+    static a = 1;
+>a : Symbol(C.a, Decl(classExpressionWithStaticProperties2.ts, 0, 17))
+
+    static b
+>b : Symbol(C.b, Decl(classExpressionWithStaticProperties2.ts, 1, 17))
+
+    static c = {
+>c : Symbol(C.c, Decl(classExpressionWithStaticProperties2.ts, 2, 12))
+
+        x: "hi"
+>x : Symbol(x, Decl(classExpressionWithStaticProperties2.ts, 3, 16))
+    }
+    static d = C.c.x + " world";
+>d : Symbol(C.d, Decl(classExpressionWithStaticProperties2.ts, 5, 5))
+>C.c.x : Symbol(x, Decl(classExpressionWithStaticProperties2.ts, 3, 16))
+>C.c : Symbol(C.c, Decl(classExpressionWithStaticProperties2.ts, 2, 12))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties2.ts, 0, 7))
+>c : Symbol(C.c, Decl(classExpressionWithStaticProperties2.ts, 2, 12))
+>x : Symbol(x, Decl(classExpressionWithStaticProperties2.ts, 3, 16))
+
+ };
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties2.types b/tests/baselines/reference/classExpressionWithStaticProperties2.types
index 9bfd6732350..221b4794111 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties2.types
+++ b/tests/baselines/reference/classExpressionWithStaticProperties2.types
@@ -1,9 +1,32 @@
 === tests/cases/compiler/classExpressionWithStaticProperties2.ts ===
-var v = class C { static a = 1; static b };
+var v = class C {
 >v : typeof C
->class C { static a = 1; static b } : typeof C
+>class C {    static a = 1;    static b    static c = {        x: "hi"    }    static d = C.c.x + " world"; } : typeof C
 >C : typeof C
+
+    static a = 1;
 >a : number
 >1 : number
+
+    static b
 >b : any
 
+    static c = {
+>c : { x: string; }
+>{        x: "hi"    } : { x: string; }
+
+        x: "hi"
+>x : string
+>"hi" : string
+    }
+    static d = C.c.x + " world";
+>d : string
+>C.c.x + " world" : string
+>C.c.x : string
+>C.c : { x: string; }
+>C : typeof C
+>c : { x: string; }
+>x : string
+>" world" : string
+
+ };
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties3.js b/tests/baselines/reference/classExpressionWithStaticProperties3.js
new file mode 100644
index 00000000000..7bec5fca167
--- /dev/null
+++ b/tests/baselines/reference/classExpressionWithStaticProperties3.js
@@ -0,0 +1,29 @@
+//// [classExpressionWithStaticProperties3.ts]
+
+declare var console: any;
+const arr: {y(): number}[] = [];
+for (let i = 0; i < 3; i++) {
+    arr.push(class C {
+        static x = i;
+        static y = () => C.x * 2;
+    });
+}
+arr.forEach(C => console.log(C.y()));
+
+//// [classExpressionWithStaticProperties3.js]
+var arr = [];
+var _loop_1 = function (i) {
+    arr.push((_a = (function () {
+            function C() {
+            }
+            return C;
+        }()),
+        _a.x = i,
+        _a.y = function () { return _a.x * 2; },
+        _a));
+};
+for (var i = 0; i < 3; i++) {
+    _loop_1(i);
+}
+arr.forEach(function (C) { return console.log(C.y()); });
+var _a;
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties3.symbols b/tests/baselines/reference/classExpressionWithStaticProperties3.symbols
new file mode 100644
index 00000000000..ff9b7b0d311
--- /dev/null
+++ b/tests/baselines/reference/classExpressionWithStaticProperties3.symbols
@@ -0,0 +1,42 @@
+=== tests/cases/compiler/classExpressionWithStaticProperties3.ts ===
+
+declare var console: any;
+>console : Symbol(console, Decl(classExpressionWithStaticProperties3.ts, 1, 11))
+
+const arr: {y(): number}[] = [];
+>arr : Symbol(arr, Decl(classExpressionWithStaticProperties3.ts, 2, 5))
+>y : Symbol(y, Decl(classExpressionWithStaticProperties3.ts, 2, 12))
+
+for (let i = 0; i < 3; i++) {
+>i : Symbol(i, Decl(classExpressionWithStaticProperties3.ts, 3, 8))
+>i : Symbol(i, Decl(classExpressionWithStaticProperties3.ts, 3, 8))
+>i : Symbol(i, Decl(classExpressionWithStaticProperties3.ts, 3, 8))
+
+    arr.push(class C {
+>arr.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>arr : Symbol(arr, Decl(classExpressionWithStaticProperties3.ts, 2, 5))
+>push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties3.ts, 4, 13))
+
+        static x = i;
+>x : Symbol(C.x, Decl(classExpressionWithStaticProperties3.ts, 4, 22))
+>i : Symbol(i, Decl(classExpressionWithStaticProperties3.ts, 3, 8))
+
+        static y = () => C.x * 2;
+>y : Symbol(C.y, Decl(classExpressionWithStaticProperties3.ts, 5, 21))
+>C.x : Symbol(C.x, Decl(classExpressionWithStaticProperties3.ts, 4, 22))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties3.ts, 4, 13))
+>x : Symbol(C.x, Decl(classExpressionWithStaticProperties3.ts, 4, 22))
+
+    });
+}
+arr.forEach(C => console.log(C.y()));
+>arr.forEach : Symbol(Array.forEach, Decl(lib.d.ts, --, --))
+>arr : Symbol(arr, Decl(classExpressionWithStaticProperties3.ts, 2, 5))
+>forEach : Symbol(Array.forEach, Decl(lib.d.ts, --, --))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties3.ts, 9, 12))
+>console : Symbol(console, Decl(classExpressionWithStaticProperties3.ts, 1, 11))
+>C.y : Symbol(y, Decl(classExpressionWithStaticProperties3.ts, 2, 12))
+>C : Symbol(C, Decl(classExpressionWithStaticProperties3.ts, 9, 12))
+>y : Symbol(y, Decl(classExpressionWithStaticProperties3.ts, 2, 12))
+
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties3.types b/tests/baselines/reference/classExpressionWithStaticProperties3.types
new file mode 100644
index 00000000000..c6ff6d1b56b
--- /dev/null
+++ b/tests/baselines/reference/classExpressionWithStaticProperties3.types
@@ -0,0 +1,58 @@
+=== tests/cases/compiler/classExpressionWithStaticProperties3.ts ===
+
+declare var console: any;
+>console : any
+
+const arr: {y(): number}[] = [];
+>arr : { y(): number; }[]
+>y : () => number
+>[] : undefined[]
+
+for (let i = 0; i < 3; i++) {
+>i : number
+>0 : number
+>i < 3 : boolean
+>i : number
+>3 : number
+>i++ : number
+>i : number
+
+    arr.push(class C {
+>arr.push(class C {        static x = i;        static y = () => C.x * 2;    }) : number
+>arr.push : (...items: { y(): number; }[]) => number
+>arr : { y(): number; }[]
+>push : (...items: { y(): number; }[]) => number
+>class C {        static x = i;        static y = () => C.x * 2;    } : typeof C
+>C : typeof C
+
+        static x = i;
+>x : number
+>i : number
+
+        static y = () => C.x * 2;
+>y : () => number
+>() => C.x * 2 : () => number
+>C.x * 2 : number
+>C.x : number
+>C : typeof C
+>x : number
+>2 : number
+
+    });
+}
+arr.forEach(C => console.log(C.y()));
+>arr.forEach(C => console.log(C.y())) : void
+>arr.forEach : (callbackfn: (value: { y(): number; }, index: number, array: { y(): number; }[]) => void, thisArg?: any) => void
+>arr : { y(): number; }[]
+>forEach : (callbackfn: (value: { y(): number; }, index: number, array: { y(): number; }[]) => void, thisArg?: any) => void
+>C => console.log(C.y()) : (C: { y(): number; }) => any
+>C : { y(): number; }
+>console.log(C.y()) : any
+>console.log : any
+>console : any
+>log : any
+>C.y() : number
+>C.y : () => number
+>C : { y(): number; }
+>y : () => number
+
diff --git a/tests/baselines/reference/classExpressionWithStaticPropertiesES61.js b/tests/baselines/reference/classExpressionWithStaticPropertiesES61.js
index 7ddacb70405..d3a210df7e2 100644
--- a/tests/baselines/reference/classExpressionWithStaticPropertiesES61.js
+++ b/tests/baselines/reference/classExpressionWithStaticPropertiesES61.js
@@ -6,10 +6,10 @@ var v = class C {
 };
 
 //// [classExpressionWithStaticPropertiesES61.js]
-var v = (C_1 = class C {
+var v = (_a = class C {
     },
-    C_1.a = 1,
-    C_1.b = 2,
-    C_1.c = C_1.a + 3,
-    C_1);
-var C_1;
+    _a.a = 1,
+    _a.b = 2,
+    _a.c = _a.a + 3,
+    _a);
+var _a;
diff --git a/tests/baselines/reference/classExpressionWithStaticPropertiesES62.js b/tests/baselines/reference/classExpressionWithStaticPropertiesES62.js
index 0a4b7645ecc..d0f56131d54 100644
--- a/tests/baselines/reference/classExpressionWithStaticPropertiesES62.js
+++ b/tests/baselines/reference/classExpressionWithStaticPropertiesES62.js
@@ -9,12 +9,12 @@ var v = class C {
  };
 
 //// [classExpressionWithStaticPropertiesES62.js]
-var v = (C_1 = class C {
+var v = (_a = class C {
     },
-    C_1.a = 1,
-    C_1.c = {
+    _a.a = 1,
+    _a.c = {
         x: "hi"
     },
-    C_1.d = C_1.c.x + " world",
-    C_1);
-var C_1;
+    _a.d = _a.c.x + " world",
+    _a);
+var _a;
diff --git a/tests/baselines/reference/classExpressionWithStaticPropertiesES63.js b/tests/baselines/reference/classExpressionWithStaticPropertiesES63.js
index 53955735762..3993f18c0c7 100644
--- a/tests/baselines/reference/classExpressionWithStaticPropertiesES63.js
+++ b/tests/baselines/reference/classExpressionWithStaticPropertiesES63.js
@@ -13,11 +13,11 @@ arr.forEach(C => console.log(C.y()));
 //// [classExpressionWithStaticPropertiesES63.js]
 const arr = [];
 for (let i = 0; i < 3; i++) {
-    arr.push((C_1 = class C {
+    arr.push((_a = class C {
         },
-        C_1.x = i,
-        C_1.y = () => C_1.x * 2,
-        C_1));
+        _a.x = i,
+        _a.y = () => _a.x * 2,
+        _a));
 }
 arr.forEach(C => console.log(C.y()));
-var C_1;
+var _a;
diff --git a/tests/baselines/reference/classExpressionWithStaticPropertiesES64.js b/tests/baselines/reference/classExpressionWithStaticPropertiesES64.js
index ac09415bc0e..d2a62d62ce9 100644
--- a/tests/baselines/reference/classExpressionWithStaticPropertiesES64.js
+++ b/tests/baselines/reference/classExpressionWithStaticPropertiesES64.js
@@ -3,8 +3,8 @@
 
 
 //// [classExpressionWithStaticPropertiesES64.js]
-((classExpression_1 = class {
+(_a = class {
     },
-    classExpression_1.x = 0,
-    classExpression_1));
-var classExpression_1;
+    _a.x = 0,
+    _a);
+var _a;
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index b533b880036..0805389f268 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var a_1 = require('./a');
+var a_1 = require("./a");
 exports.b = {
     f: function () {
         var A = (function () {
@@ -51,7 +51,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var b_1 = require('./b');
+var b_1 = require("./b");
 exports.a = {
     f: function () {
         var A = (function () {
diff --git a/tests/baselines/reference/classMemberInitializerScoping.js b/tests/baselines/reference/classMemberInitializerScoping.js
index 8f78cfb9ac6..52bbaee8945 100644
--- a/tests/baselines/reference/classMemberInitializerScoping.js
+++ b/tests/baselines/reference/classMemberInitializerScoping.js
@@ -27,9 +27,9 @@ var CCC = (function () {
         this.y = aaa;
         this.y = ''; // was: error, cannot assign string to number
     }
-    CCC.staticY = aaa; // This shouldnt be error
     return CCC;
 }());
+CCC.staticY = aaa; // This shouldnt be error
 // above is equivalent to this:
 var aaaa = 1;
 var CCCC = (function () {
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js
index 752220a4cbc..c5b661831a2 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js
@@ -40,12 +40,12 @@ var Test = (function () {
             console.log(field); // Using field here shouldnt be error
         };
     }
-    Test.staticMessageHandler = function () {
-        var field = Test.field;
-        console.log(field); // Using field here shouldnt be error
-    };
     return Test;
 }());
+Test.staticMessageHandler = function () {
+    var field = Test.field;
+    console.log(field); // Using field here shouldnt be error
+};
 var field1;
 var Test1 = (function () {
     function Test1(field1) {
@@ -56,8 +56,8 @@ var Test1 = (function () {
             // it would resolve to private field1 and thats not what user intended here. 
         };
     }
-    Test1.staticMessageHandler = function () {
-        console.log(field1); // This shouldnt be error as its a static property
-    };
     return Test1;
 }());
+Test1.staticMessageHandler = function () {
+    console.log(field1); // This shouldnt be error as its a static property
+};
diff --git a/tests/baselines/reference/classWithPrivateProperty.js b/tests/baselines/reference/classWithPrivateProperty.js
index 6e75797523f..c94f1d8ed80 100644
--- a/tests/baselines/reference/classWithPrivateProperty.js
+++ b/tests/baselines/reference/classWithPrivateProperty.js
@@ -32,9 +32,9 @@ var C = (function () {
     }
     C.prototype.c = function () { return ''; };
     C.f = function () { return ''; };
-    C.g = function () { return ''; };
     return C;
 }());
+C.g = function () { return ''; };
 var c = new C();
 var r1 = c.x;
 var r2 = c.a;
diff --git a/tests/baselines/reference/classWithProtectedProperty.js b/tests/baselines/reference/classWithProtectedProperty.js
index 75eadaf4010..2b2e01e59df 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -42,9 +42,9 @@ var C = (function () {
     }
     C.prototype.c = function () { return ''; };
     C.f = function () { return ''; };
-    C.g = function () { return ''; };
     return C;
 }());
+C.g = function () { return ''; };
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
diff --git a/tests/baselines/reference/classWithPublicProperty.js b/tests/baselines/reference/classWithPublicProperty.js
index 054713264bd..47708b7aff3 100644
--- a/tests/baselines/reference/classWithPublicProperty.js
+++ b/tests/baselines/reference/classWithPublicProperty.js
@@ -30,9 +30,9 @@ var C = (function () {
     }
     C.prototype.c = function () { return ''; };
     C.f = function () { return ''; };
-    C.g = function () { return ''; };
     return C;
 }());
+C.g = function () { return ''; };
 // all of these are valid
 var c = new C();
 var r1 = c.x;
diff --git a/tests/baselines/reference/cloduleStaticMembers.js b/tests/baselines/reference/cloduleStaticMembers.js
index 6095442b629..868b9305bdf 100644
--- a/tests/baselines/reference/cloduleStaticMembers.js
+++ b/tests/baselines/reference/cloduleStaticMembers.js
@@ -16,10 +16,10 @@ module Clod {
 var Clod = (function () {
     function Clod() {
     }
-    Clod.x = 10;
-    Clod.y = 10;
     return Clod;
 }());
+Clod.x = 10;
+Clod.y = 10;
 var Clod;
 (function (Clod) {
     var p = Clod.x;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index cbf9633b314..d7785dc73cf 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js
@@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) {
     exports.bar2 = bar2;
 });
 //// [collisionExportsRequireAndAlias_file2.js]
-define(["require", "exports", 'collisionExportsRequireAndAlias_file1', 'collisionExportsRequireAndAlias_file3333'], function (require, exports, require, exports) {
+define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
     "use strict";
     function foo() {
         require.bar();
diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js
index 0ffb2714108..d9e9ccd15ea 100644
--- a/tests/baselines/reference/commentsFunction.js
+++ b/tests/baselines/reference/commentsFunction.js
@@ -84,7 +84,7 @@ function blah(a /* multiline trailing comment
 function blah2(a /* single line multiple trailing comments */ /* second */) {
 }
 function blah3(a // trailing commen single line
-    ) {
+) {
 }
 lambdaFoo = function (a, b) { return a * b; }; // This is trailing comment
 /*leading comment*/ (function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
new file mode 100644
index 00000000000..9cfd75c0211
--- /dev/null
+++ b/tests/baselines/reference/commentsOnRequireStatement.js
@@ -0,0 +1,36 @@
+//// [tests/cases/compiler/commentsOnRequireStatement.ts] ////
+
+//// [0.ts]
+
+export var subject = 10;
+
+//// [1.ts]
+export var subject1 = 10;
+
+//// [2.ts]
+/* blah0 */
+// blah 
+// blah 
+// blah 
+export {subject} from './0';
+/* blah1 */
+export {subject1} from './1';
+
+
+//// [0.js]
+"use strict";
+exports.subject = 10;
+//// [1.js]
+"use strict";
+exports.subject1 = 10;
+//// [2.js]
+"use strict";
+/* blah0 */
+// blah 
+// blah 
+// blah 
+var _0_1 = require("./0");
+exports.subject = _0_1.subject;
+/* blah1 */
+var _1_1 = require("./1");
+exports.subject1 = _1_1.subject1;
diff --git a/tests/baselines/reference/commentsOnRequireStatement.symbols b/tests/baselines/reference/commentsOnRequireStatement.symbols
new file mode 100644
index 00000000000..2e491b33234
--- /dev/null
+++ b/tests/baselines/reference/commentsOnRequireStatement.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/0.ts ===
+
+export var subject = 10;
+>subject : Symbol(subject, Decl(0.ts, 1, 10))
+
+=== tests/cases/compiler/1.ts ===
+export var subject1 = 10;
+>subject1 : Symbol(subject1, Decl(1.ts, 0, 10))
+
+=== tests/cases/compiler/2.ts ===
+/* blah0 */
+// blah 
+// blah 
+// blah 
+export {subject} from './0';
+>subject : Symbol(subject, Decl(2.ts, 4, 8))
+
+/* blah1 */
+export {subject1} from './1';
+>subject1 : Symbol(subject1, Decl(2.ts, 6, 8))
+
diff --git a/tests/baselines/reference/commentsOnRequireStatement.types b/tests/baselines/reference/commentsOnRequireStatement.types
new file mode 100644
index 00000000000..2cc6154ed60
--- /dev/null
+++ b/tests/baselines/reference/commentsOnRequireStatement.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/0.ts ===
+
+export var subject = 10;
+>subject : number
+>10 : number
+
+=== tests/cases/compiler/1.ts ===
+export var subject1 = 10;
+>subject1 : number
+>10 : number
+
+=== tests/cases/compiler/2.ts ===
+/* blah0 */
+// blah 
+// blah 
+// blah 
+export {subject} from './0';
+>subject : number
+
+/* blah1 */
+export {subject1} from './1';
+>subject1 : number
+
diff --git a/tests/baselines/reference/commentsOnStaticMembers.js b/tests/baselines/reference/commentsOnStaticMembers.js
index 51ed906841d..851f9025be3 100644
--- a/tests/baselines/reference/commentsOnStaticMembers.js
+++ b/tests/baselines/reference/commentsOnStaticMembers.js
@@ -24,13 +24,13 @@ class test {
 var test = (function () {
     function test() {
     }
-    /**
-     * p1 comment appears in output
-     */
-    test.p1 = "";
-    /**
-     * p3 comment appears in output
-     */
-    test.p3 = "";
     return test;
 }());
+/**
+ * p1 comment appears in output
+ */
+test.p1 = "";
+/**
+ * p3 comment appears in output
+ */
+test.p3 = "";
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index 3f49588c103..d22b5b2855b 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -19,10 +19,10 @@ var C1 = (function () {
     function C1() {
         this.m1 = 42;
     }
-    C1.s1 = true;
     return C1;
 }());
 exports.C1 = C1;
+C1.s1 = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0");
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 720554f7e32..e7496f3445f 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -37,10 +37,10 @@ var C1 = (function () {
     function C1() {
         this.m1 = 42;
     }
-    C1.s1 = true;
     return C1;
 }());
 exports.C1 = C1;
+C1.s1 = true;
 (function (E1) {
     E1[E1["A"] = 0] = "A";
     E1[E1["B"] = 1] = "B";
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index dd5acba597c..93439a418f6 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/tests/baselines/reference/commonjsSafeImport.js
@@ -16,7 +16,7 @@ function Foo() { }
 exports.Foo = Foo;
 //// [main.js]
 "use strict";
-var _10_lib_1 = require('./10_lib');
+var _10_lib_1 = require("./10_lib");
 _10_lib_1.Foo();
 
 
diff --git a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
index f9bcca268ec..a088006d145 100644
--- a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
+++ b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
@@ -1,8 +1,8 @@
 EmitSkipped: true
 Diagnostics:
-  Cannot write file 'tests/cases/fourslash/b.js' because it would overwrite input file.
+  Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/a.js
+FileName : /tests/cases/fourslash/a.js
 function foo2() { return 30; } // no error - should emit a.js
 
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsReference.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsReference.js
index f41962cf9e1..dfee41fad81 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsReference.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsReference.js
@@ -36,8 +36,8 @@ function fn1(x2) {
 }
 // property accesses
 var x3;
-(_a = x3, _a.a = Math.pow(_a.a, value));
-(_b = x3, _b['a'] = Math.pow(_b['a'], value));
+(_a = x3).a = Math.pow(_a.a, value);
+(_b = x3)[_c = 'a'] = Math.pow(_b[_c], value);
 // parentheses, the contained expression is reference
 (x1) = Math.pow((x1), value);
 function fn2(x4) {
@@ -45,4 +45,4 @@ function fn2(x4) {
 }
 (x3.a) = Math.pow((x3.a), value);
 (x3['a']) = Math.pow((x3['a']), value);
-var _a, _b;
+var _a, _b, _c;
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
index 70ebca89005..16500b823b8 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -134,21 +134,21 @@ false = Math.pow(false, value);
 }
 value;
 // array literals
-['', ''] = Math.pow(['', ''], value);
+_a = Math.pow(['', ''], value), '' = _a[0], '' = _a[1];
 // super
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.call(this);
-        (_a = _super.prototype, _a. = Math.pow(_a., value));
+        (_a = _super.prototype). = Math.pow(_a., value);
         var _a;
     }
     Derived.prototype.foo = function () {
-        (_a = _super.prototype, _a. = Math.pow(_a., value));
+        (_a = _super.prototype). = Math.pow(_a., value);
         var _a;
     };
     Derived.sfoo = function () {
-        (_a = _super, _a. = Math.pow(_a., value));
+        (_a = _super). = Math.pow(_a., value);
         var _a;
     };
     return Derived;
@@ -175,3 +175,4 @@ foo() = Math.pow(foo(), value);
 ([]) = Math.pow(([]), value);
 (function baz1() { }) = Math.pow((function baz1() { }), value);
 (foo()) = Math.pow((foo()), value);
+var _a;
diff --git a/tests/baselines/reference/computedPropertyNames10_ES5.js b/tests/baselines/reference/computedPropertyNames10_ES5.js
index 14d9235b12b..302f9355be8 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames10_ES5.js
@@ -32,6 +32,5 @@ var v = (_a = {},
     _a[true] = function () { },
     _a["hello bye"] = function () { },
     _a["hello " + a + " bye"] = function () { },
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.js b/tests/baselines/reference/computedPropertyNames11_ES5.js
index 64c0b0bd67e..568cce441e1 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames11_ES5.js
@@ -76,6 +76,5 @@ var v = (_a = {},
         enumerable: true,
         configurable: true
     }),
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames12_ES5.js b/tests/baselines/reference/computedPropertyNames12_ES5.js
index 2aec8856286..10427b5dc13 100644
--- a/tests/baselines/reference/computedPropertyNames12_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames12_ES5.js
@@ -26,6 +26,6 @@ var C = (function () {
         this[s + n] = 2;
         this["hello bye"] = 0;
     }
-    C["hello " + a + " bye"] = 0;
     return C;
 }());
+C["hello " + a + " bye"] = 0;
diff --git a/tests/baselines/reference/computedPropertyNames18_ES5.js b/tests/baselines/reference/computedPropertyNames18_ES5.js
index b65c7fd4f7d..a62af506531 100644
--- a/tests/baselines/reference/computedPropertyNames18_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames18_ES5.js
@@ -9,7 +9,6 @@ function foo() {
 function foo() {
     var obj = (_a = {},
         _a[this.bar] = 0,
-        _a
-    );
+        _a);
     var _a;
 }
diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.js b/tests/baselines/reference/computedPropertyNames19_ES5.js
index 36f3e66c7c2..bda3e01bbed 100644
--- a/tests/baselines/reference/computedPropertyNames19_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames19_ES5.js
@@ -10,7 +10,6 @@ var M;
 (function (M) {
     var obj = (_a = {},
         _a[this.bar] = 0,
-        _a
-    );
+        _a);
     var _a;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/computedPropertyNames1_ES5.js b/tests/baselines/reference/computedPropertyNames1_ES5.js
index 4fdec28c7aa..75bbe909927 100644
--- a/tests/baselines/reference/computedPropertyNames1_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames1_ES5.js
@@ -17,6 +17,5 @@ var v = (_a = {},
         enumerable: true,
         configurable: true
     }),
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames20_ES5.js b/tests/baselines/reference/computedPropertyNames20_ES5.js
index 65acd7fa08f..1eec0a7bcdb 100644
--- a/tests/baselines/reference/computedPropertyNames20_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames20_ES5.js
@@ -6,6 +6,5 @@ var obj = {
 //// [computedPropertyNames20_ES5.js]
 var obj = (_a = {},
     _a[this.bar] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames22_ES5.js b/tests/baselines/reference/computedPropertyNames22_ES5.js
index 5448f4dcf8d..721418ee930 100644
--- a/tests/baselines/reference/computedPropertyNames22_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames22_ES5.js
@@ -15,8 +15,7 @@ var C = (function () {
     C.prototype.bar = function () {
         var obj = (_a = {},
             _a[this.bar()] = function () { },
-            _a
-        );
+            _a);
         return 0;
         var _a;
     };
diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.js b/tests/baselines/reference/computedPropertyNames25_ES5.js
index f38ac0b2e0d..b03dd285ced 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -35,8 +35,7 @@ var C = (function (_super) {
     C.prototype.foo = function () {
         var obj = (_a = {},
             _a[_super.prototype.bar.call(this)] = function () { },
-            _a
-        );
+            _a);
         return 0;
         var _a;
     };
diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.js b/tests/baselines/reference/computedPropertyNames28_ES5.js
index b5b1fdf77aa..ed15bbf0145 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -27,8 +27,7 @@ var C = (function (_super) {
         _super.call(this);
         var obj = (_a = {},
             _a[(_super.call(this), "prop")] = function () { },
-            _a
-        );
+            _a);
         var _a;
     }
     return C;
diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.js b/tests/baselines/reference/computedPropertyNames29_ES5.js
index 46ba529d7a5..966081ae035 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames29_ES5.js
@@ -18,9 +18,9 @@ var C = (function () {
         var _this = this;
         (function () {
             var obj = (_a = {},
-                _a[_this.bar()] = function () { },
-                _a
-            );
+                _a[_this.bar()] = function () { } // needs capture
+            ,
+                _a);
             var _a;
         });
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames29_ES6.js b/tests/baselines/reference/computedPropertyNames29_ES6.js
index 1aa479555d4..4ba5dd20dbe 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames29_ES6.js
@@ -13,11 +13,11 @@ class C {
 //// [computedPropertyNames29_ES6.js]
 class C {
     bar() {
-        (() => {
+        () => {
             var obj = {
                 [this.bar()]() { } // needs capture
             };
-        });
+        };
         return 0;
     }
 }
diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.js b/tests/baselines/reference/computedPropertyNames30_ES5.js
index e787689d393..a900fd44c67 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -36,8 +36,7 @@ var C = (function (_super) {
                 // illegal, and not capturing this is consistent with
                 //treatment of other similar violations.
                 _a[(_super.call(this), "prop")] = function () { },
-                _a
-            );
+                _a);
             var _a;
         });
     }
diff --git a/tests/baselines/reference/computedPropertyNames30_ES6.js b/tests/baselines/reference/computedPropertyNames30_ES6.js
index 44a475fed92..0f993eab2ab 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES6.js
@@ -21,13 +21,13 @@ class Base {
 class C extends Base {
     constructor() {
         super();
-        (() => {
+        () => {
             var obj = {
                 // Ideally, we would capture this. But the reference is
                 // illegal, and not capturing this is consistent with
                 //treatment of other similar violations.
                 [(super(), "prop")]() { }
             };
-        });
+        };
     }
 }
diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.js b/tests/baselines/reference/computedPropertyNames31_ES5.js
index 8417f103fb7..2e38e2a131f 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -38,9 +38,9 @@ var C = (function (_super) {
         var _this = this;
         (function () {
             var obj = (_a = {},
-                _a[_super.prototype.bar.call(_this)] = function () { },
-                _a
-            );
+                _a[_super.prototype.bar.call(_this)] = function () { } // needs capture
+            ,
+                _a);
             var _a;
         });
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames31_ES6.js b/tests/baselines/reference/computedPropertyNames31_ES6.js
index d17423223e3..e1ef58670c9 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES6.js
@@ -23,11 +23,11 @@ class Base {
 }
 class C extends Base {
     foo() {
-        (() => {
+        () => {
             var obj = {
                 [super.bar()]() { } // needs capture
             };
-        });
+        };
         return 0;
     }
 }
diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.js b/tests/baselines/reference/computedPropertyNames33_ES5.js
index 8db62818e22..e6d46b03c10 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames33_ES5.js
@@ -17,8 +17,7 @@ var C = (function () {
     C.prototype.bar = function () {
         var obj = (_a = {},
             _a[foo()] = function () { },
-            _a
-        );
+            _a);
         return 0;
         var _a;
     };
diff --git a/tests/baselines/reference/computedPropertyNames34_ES5.js b/tests/baselines/reference/computedPropertyNames34_ES5.js
index fa0af2897f7..3109c400422 100644
--- a/tests/baselines/reference/computedPropertyNames34_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames34_ES5.js
@@ -17,8 +17,7 @@ var C = (function () {
     C.bar = function () {
         var obj = (_a = {},
             _a[foo()] = function () { },
-            _a
-        );
+            _a);
         return 0;
         var _a;
     };
diff --git a/tests/baselines/reference/computedPropertyNames46_ES5.js b/tests/baselines/reference/computedPropertyNames46_ES5.js
index 307dadcbe91..815f5769f3b 100644
--- a/tests/baselines/reference/computedPropertyNames46_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames46_ES5.js
@@ -6,6 +6,5 @@ var o = {
 //// [computedPropertyNames46_ES5.js]
 var o = (_a = {},
     _a["" || 0] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames47_ES5.js b/tests/baselines/reference/computedPropertyNames47_ES5.js
index d03b614b29b..a2fff2110b4 100644
--- a/tests/baselines/reference/computedPropertyNames47_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames47_ES5.js
@@ -16,6 +16,5 @@ var E2;
 })(E2 || (E2 = {}));
 var o = (_a = {},
     _a[E1.x || E2.x] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.js b/tests/baselines/reference/computedPropertyNames48_ES5.js
index 15123a98f30..55b08ef8301 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames48_ES5.js
@@ -25,14 +25,11 @@ var E;
 var a;
 extractIndexer((_a = {},
     _a[a] = "",
-    _a
-)); // Should return string
+    _a)); // Should return string
 extractIndexer((_b = {},
     _b[E.x] = "",
-    _b
-)); // Should return string
+    _b)); // Should return string
 extractIndexer((_c = {},
     _c["" || 0] = "",
-    _c
-)); // Should return any (widened form of undefined)
+    _c)); // Should return any (widened form of undefined)
 var _a, _b, _c;
diff --git a/tests/baselines/reference/computedPropertyNames49_ES5.js b/tests/baselines/reference/computedPropertyNames49_ES5.js
index 3427ea665a0..d4eb26a08a5 100644
--- a/tests/baselines/reference/computedPropertyNames49_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames49_ES5.js
@@ -60,8 +60,6 @@ var x = (_a = {
         enumerable: true,
         configurable: true
     }),
-    ,
     _a.p2 = 20,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames4_ES5.js b/tests/baselines/reference/computedPropertyNames4_ES5.js
index f91476c79c1..ac0fa8ec937 100644
--- a/tests/baselines/reference/computedPropertyNames4_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames4_ES5.js
@@ -32,6 +32,5 @@ var v = (_a = {},
     _a[true] = 0,
     _a["hello bye"] = 0,
     _a["hello " + a + " bye"] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames50_ES5.js b/tests/baselines/reference/computedPropertyNames50_ES5.js
index a74561295be..0c6f1798c93 100644
--- a/tests/baselines/reference/computedPropertyNames50_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames50_ES5.js
@@ -56,8 +56,6 @@ var x = (_a = {
         enumerable: true,
         configurable: true
     }),
-    ,
     _a.p2 = 20,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames5_ES5.js b/tests/baselines/reference/computedPropertyNames5_ES5.js
index 58c5af2efa3..3367faa2c20 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames5_ES5.js
@@ -18,6 +18,5 @@ var v = (_a = {},
     _a[{}] = 0,
     _a[undefined] = undefined,
     _a[null] = null,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames6_ES5.js b/tests/baselines/reference/computedPropertyNames6_ES5.js
index 7e9c6202940..29d035bfcbf 100644
--- a/tests/baselines/reference/computedPropertyNames6_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames6_ES5.js
@@ -16,6 +16,5 @@ var v = (_a = {},
     _a[p1] = 0,
     _a[p2] = 1,
     _a[p3] = 2,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames7_ES5.js b/tests/baselines/reference/computedPropertyNames7_ES5.js
index 3311ec7e092..01cf2efc030 100644
--- a/tests/baselines/reference/computedPropertyNames7_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames7_ES5.js
@@ -13,6 +13,5 @@ var E;
 })(E || (E = {}));
 var v = (_a = {},
     _a[E.member] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.js b/tests/baselines/reference/computedPropertyNames8_ES5.js
index 6eceee81adb..82d262c7e4e 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.js
@@ -15,7 +15,6 @@ function f() {
     var v = (_a = {},
         _a[t] = 0,
         _a[u] = 1,
-        _a
-    );
+        _a);
     var _a;
 }
diff --git a/tests/baselines/reference/computedPropertyNames9_ES5.js b/tests/baselines/reference/computedPropertyNames9_ES5.js
index 6c1d7bcb4d0..b1ac6c9e3b6 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames9_ES5.js
@@ -16,6 +16,5 @@ var v = (_a = {},
     _a[f("")] = 0,
     _a[f(0)] = 0,
     _a[f(true)] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.js
index 1f7a3ae123e..d8a33951d4a 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.js
@@ -12,6 +12,5 @@ var o: I = {
 var o = (_a = {},
     _a[+"foo"] = "",
     _a[+"bar"] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js
index c4bfde03531..1ee88351154 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js
@@ -13,6 +13,5 @@ var o: I = {
 var o = (_a = {},
     _a["" + 0] = function (y) { return y.length; },
     _a["" + 1] = function (y) { return y.length; },
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js
index 945475f8533..6be09e4bef3 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js
@@ -13,6 +13,5 @@ var o: I = {
 var o = (_a = {},
     _a[+"foo"] = function (y) { return y.length; },
     _a[+"bar"] = function (y) { return y.length; },
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js
index 98042f201e3..b510cda2916 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js
@@ -12,6 +12,5 @@ var o: I = {
 var o = (_a = {},
     _a[+"foo"] = function (y) { return y.length; },
     _a[+"bar"] = function (y) { return y.length; },
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.js
index b17f91be38b..0c319a526f4 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.js
@@ -13,6 +13,5 @@ var o: I = {
 var o = (_a = {},
     _a["" + "foo"] = "",
     _a["" + "bar"] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.js
index c7a728e5ef8..51d78be59d4 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.js
@@ -13,6 +13,5 @@ var o: I = {
 var o = (_a = {},
     _a[+"foo"] = "",
     _a[+"bar"] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js
index c97b7c5b1f8..c6ef45d7fab 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.js
@@ -21,6 +21,5 @@ foo((_a = {
     _a["hi" + "bye"] = true,
     _a[0 + 1] = 0,
     _a[+"hi"] = [0],
-    _a
-));
+    _a));
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js
index bc8966520f6..14165302d3b 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js
@@ -26,7 +26,6 @@ foo((_a = {
     _a["hi" + "bye"] = true,
     _a[0 + 1] = 0,
     _a[+"hi"] = [0],
-    _a
-));
+    _a));
 g({ p: "" });
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.js
index 419ea906550..24f6218864c 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.js
@@ -13,6 +13,5 @@ var o: I = {
 var o = (_a = {},
     _a["" + "foo"] = "",
     _a["" + "bar"] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.js
index d3beb8b8deb..340802da2af 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.js
@@ -13,6 +13,5 @@ var o: I = {
 var o = (_a = {},
     _a[+"foo"] = "",
     _a[+"bar"] = 0,
-    _a
-);
+    _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
index f04ea61379d..bf589768b72 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
@@ -20,8 +20,7 @@ var v = (_a = {},
         enumerable: true,
         configurable: true
     }),
-    _a
-);
+    _a);
 var _a;
 
 
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map
index e94da4e3f80..114df45af46 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map
@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap1_ES5.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap1_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES5.ts"],"names":[],"mappings":"AAAA;IAAA;IAOA,CAAC;IANG,YAAC,OAAO,CAAC,GAAT;QACI,QAAQ,CAAC;IACb,CAAC;IACD,sBAAI,aAAC,SAAU;aAAf;YACF,MAAM,CAAC,CAAC,CAAC;QACP,CAAC;;;OAAA;IACL,QAAC;AAAD,CAAC,AAPD,IAOC"}
\ No newline at end of file
+{"version":3,"file":"computedPropertyNamesSourceMap1_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES5.ts"],"names":[],"mappings":"AAAA;IAAA;IAOA,CAAC;IANG,YAAC,OAAO,CAAC,GAAT;QACI,QAAQ,CAAC;IACb,CAAC;IACD,sBAAI,sBAAW;aAAf;YACF,MAAM,CAAC,CAAC,CAAC;QACP,CAAC;;;OAAA;IACL,QAAC;AAAD,CAAC,AAPD,IAOC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt
index 41484b97c66..fc571a3140e 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt
@@ -78,17 +78,14 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
 >>>    Object.defineProperty(C.prototype, "goodbye", {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^^^^^^^^^^
-4 >                                       ^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^^^^^^^^^
 1->
   >    
 2 >    get 
-3 >                          [
-4 >                                       "goodbye"]
+3 >                          ["goodbye"]
 1->Emitted(7, 5) Source(5, 5) + SourceIndex(0)
 2 >Emitted(7, 27) Source(5, 9) + SourceIndex(0)
-3 >Emitted(7, 40) Source(5, 10) + SourceIndex(0)
-4 >Emitted(7, 49) Source(5, 20) + SourceIndex(0)
+3 >Emitted(7, 49) Source(5, 20) + SourceIndex(0)
 ---
 >>>        get: function () {
 1 >^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map
index 0c9a609211f..64c3283f702 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map
@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap1_ES6.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap1_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES6.ts"],"names":[],"mappings":"AAAA;IACI,CAAC,OAAO,CAAC;QACL,QAAQ,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,SAAS,CAAC;QACd,MAAM,CAAC,CAAC,CAAC;IACV,CAAC;AACF,CAAC;AAAA"}
\ No newline at end of file
+{"version":3,"file":"computedPropertyNamesSourceMap1_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES6.ts"],"names":[],"mappings":"AAAA;IACI,CAAC,OAAO,CAAC;QACL,QAAQ,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,SAAS,CAAC;QACd,MAAM,CAAC,CAAC,CAAC;IACV,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt
index 87f6e0f46ce..2463a24e085 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt
@@ -98,17 +98,10 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts
 2 >Emitted(7, 6) Source(7, 3) + SourceIndex(0)
 ---
 >>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >
-2 >}
-1 >Emitted(8, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(8, 2) Source(8, 2) + SourceIndex(0)
+  >}
+1 >Emitted(8, 2) Source(8, 2) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=computedPropertyNamesSourceMap1_ES6.js.map1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-1->Emitted(9, 1) Source(8, 2) + SourceIndex(0)
----
\ No newline at end of file
+>>>//# sourceMappingURL=computedPropertyNamesSourceMap1_ES6.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js
index 62285665bd0..d214a1ef99d 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js
@@ -20,7 +20,6 @@ var v = (_a = {},
         enumerable: true,
         configurable: true
     }),
-    _a
-);
+    _a);
 var _a;
 //# sourceMappingURL=computedPropertyNamesSourceMap2_ES5.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map
index 74c3e241086..36259a4c7cb 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map
@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap2_ES5.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG;IACJ,GAAC,OAAO,CAAC,GAAT;QACI,QAAQ,CAAC;IAChB,CAAC;IACE,0BAAK,SAAU;aAAf;YACF,MAAM,CAAC,CAAC,CAAC;QACV,CAAC;;;MAAA;;CACD,CAAA"}
\ No newline at end of file
+{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;IACD,GAAC,OAAO,IAAR;QACI,QAAQ,CAAC;IAChB,CAAC;0BACM,aAAW;aAAf;YACF,MAAM,CAAC,CAAC,CAAC;QACV,CAAC;;;;OACD,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt
index 280cd68b0cd..aa20d1d7960 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt
@@ -12,34 +12,28 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts
 1 >
 2 >^^^^
 3 >    ^
-4 >     ^^^
-5 >        ^^^^^^^^^^^^^^^^^^^^^^^^->
+4 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >var 
 3 >    v
-4 >      = 
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
-4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0)
 ---
 >>>    _a["hello"] = function () {
 1->^^^^
 2 >    ^^^
 3 >       ^^^^^^^
-4 >              ^
-5 >               ^^^
-1->{
+4 >              ^^^^
+1-> = {
   >    
 2 >    [
 3 >       "hello"
-4 >              ]
-5 >               
+4 >              
 1->Emitted(2, 5) Source(2, 5) + SourceIndex(0)
 2 >Emitted(2, 8) Source(2, 6) + SourceIndex(0)
 3 >Emitted(2, 15) Source(2, 13) + SourceIndex(0)
-4 >Emitted(2, 16) Source(2, 14) + SourceIndex(0)
-5 >Emitted(2, 19) Source(2, 5) + SourceIndex(0)
+4 >Emitted(2, 19) Source(2, 5) + SourceIndex(0)
 ---
 >>>        debugger;
 1 >^^^^^^^^
@@ -64,16 +58,13 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts
 2 >Emitted(4, 6) Source(4, 3) + SourceIndex(0)
 ---
 >>>    Object.defineProperty(_a, "goodbye", {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                              ^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                          ^^^^^^^^^^^^^
 1->,
-  >    
-2 >    get [
-3 >                              "goodbye"]
-1->Emitted(5, 5) Source(5, 5) + SourceIndex(0)
-2 >Emitted(5, 31) Source(5, 10) + SourceIndex(0)
-3 >Emitted(5, 40) Source(5, 20) + SourceIndex(0)
+  >    get 
+2 >                          ["goodbye"]
+1->Emitted(5, 27) Source(5, 9) + SourceIndex(0)
+2 >Emitted(5, 40) Source(5, 20) + SourceIndex(0)
 ---
 >>>        get: function () {
 1 >^^^^^^^^^^^^^
@@ -112,21 +103,14 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts
 >>>        enumerable: true,
 >>>        configurable: true
 >>>    }),
-1->^^^^^^
-2 >      ^->
-1->
-1->Emitted(11, 7) Source(7, 3) + SourceIndex(0)
----
->>>    _a
->>>);
-1->^
-2 > ^
-3 >  ^^^^^^->
+>>>    _a);
+1->^^^^^^^
+2 >       ^
 1->
   >}
-2 > 
-1->Emitted(13, 2) Source(8, 2) + SourceIndex(0)
-2 >Emitted(13, 3) Source(8, 2) + SourceIndex(0)
+2 >       
+1->Emitted(12, 8) Source(8, 2) + SourceIndex(0)
+2 >Emitted(12, 9) Source(8, 2) + SourceIndex(0)
 ---
 >>>var _a;
 >>>//# sourceMappingURL=computedPropertyNamesSourceMap2_ES5.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 8ebd1716005..1da0cf40fcd 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -54,7 +54,7 @@ define(["require", "exports"], function (require, exports) {
     exports.x = 0;
 });
 //// [constDeclarations_access_2.js]
-define(["require", "exports", 'constDeclarations_access_1'], function (require, exports, m) {
+define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
     "use strict";
     // Errors
     m.x = 1;
diff --git a/tests/baselines/reference/constEnumToStringNoComments.js b/tests/baselines/reference/constEnumToStringNoComments.js
index a23be26033e..31b0549b99f 100644
--- a/tests/baselines/reference/constEnumToStringNoComments.js
+++ b/tests/baselines/reference/constEnumToStringNoComments.js
@@ -23,15 +23,15 @@ let c1 = Foo["C"].toString();
 
 
 //// [constEnumToStringNoComments.js]
-var x0 = 100 .toString();
-var x1 = 100 .toString();
+var x0 = 100..toString();
+var x1 = 100..toString();
 var y0 = 0.5.toString();
 var y1 = 0.5.toString();
-var z0 = 2 .toString();
-var z1 = 2 .toString();
-var a0 = -1 .toString();
-var a1 = -1 .toString();
+var z0 = 2..toString();
+var z1 = 2..toString();
+var a0 = -1..toString();
+var a1 = -1..toString();
 var b0 = -1.5.toString();
 var b1 = -1.5.toString();
-var c0 = -1 .toString();
-var c1 = -1 .toString();
+var c0 = -1..toString();
+var c1 = -1..toString();
diff --git a/tests/baselines/reference/constEnumToStringWithComments.js b/tests/baselines/reference/constEnumToStringWithComments.js
index e70833c9b89..c01e75cb923 100644
--- a/tests/baselines/reference/constEnumToStringWithComments.js
+++ b/tests/baselines/reference/constEnumToStringWithComments.js
@@ -23,15 +23,15 @@ let c1 = Foo["C"].toString();
 
 
 //// [constEnumToStringWithComments.js]
-var x0 = 100 /* X */ .toString();
-var x1 = 100 /* "X" */ .toString();
+var x0 = 100 /* X */..toString();
+var x1 = 100 /* "X" */..toString();
 var y0 = 0.5 /* Y */.toString();
 var y1 = 0.5 /* "Y" */.toString();
-var z0 = 2 /* Z */ .toString();
-var z1 = 2 /* "Z" */ .toString();
-var a0 = -1 /* A */ .toString();
-var a1 = -1 /* "A" */ .toString();
+var z0 = 2 /* Z */..toString();
+var z1 = 2 /* "Z" */..toString();
+var a0 = -1 /* A */..toString();
+var a1 = -1 /* "A" */..toString();
 var b0 = -1.5 /* B */.toString();
 var b1 = -1.5 /* "B" */.toString();
-var c0 = -1 /* C */ .toString();
-var c1 = -1 /* "C" */ .toString();
+var c0 = -1 /* C */..toString();
+var c1 = -1 /* "C" */..toString();
diff --git a/tests/baselines/reference/constructableDecoratorOnClass01.js b/tests/baselines/reference/constructableDecoratorOnClass01.js
index 26c5bf4a1c4..290c36bb830 100644
--- a/tests/baselines/reference/constructableDecoratorOnClass01.js
+++ b/tests/baselines/reference/constructableDecoratorOnClass01.js
@@ -23,8 +23,8 @@ var CtorDtor = (function () {
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        CtorDtor
-    ], C);
     return C;
 }());
+C = __decorate([
+    CtorDtor
+], C);
diff --git a/tests/baselines/reference/constructorArgsErrors1.js b/tests/baselines/reference/constructorArgsErrors1.js
index bb0725ab8b9..15c5e64952b 100644
--- a/tests/baselines/reference/constructorArgsErrors1.js
+++ b/tests/baselines/reference/constructorArgsErrors1.js
@@ -6,7 +6,7 @@ class foo {
 
 //// [constructorArgsErrors1.js]
 var foo = (function () {
-    function foo(a) {
+    function foo(static a) {
     }
     return foo;
 }());
diff --git a/tests/baselines/reference/constructorArgsErrors5.js b/tests/baselines/reference/constructorArgsErrors5.js
index c481d6f323c..6ba68cb88b4 100644
--- a/tests/baselines/reference/constructorArgsErrors5.js
+++ b/tests/baselines/reference/constructorArgsErrors5.js
@@ -7,7 +7,7 @@ class foo {
 
 //// [constructorArgsErrors5.js]
 var foo = (function () {
-    function foo(a) {
+    function foo(export a) {
     }
     return foo;
 }());
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js
index e29d4720cbc..bbe190f65b9 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.js
@@ -45,6 +45,6 @@ var x = function (a) { return a.toString(); };
 var x2 = function (a) { return a.toString(); }; // Like iWithCallSignatures
 var x2 = function (a) { return a; }; // Like iWithCallSignatures2
 // With call signatures of mismatching parameter type
-var x3 = function (a) { return a.toString(); };
+var x3 = function (a) { /*here a should be any*/ return a.toString(); };
 // With call signature count mismatch
-var x4 = function (a) { return a.toString(); };
+var x4 = function (a) { /*here a should be any*/ return a.toString(); };
diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map
index 247469aeb2d..24a38dc407d 100644
--- a/tests/baselines/reference/contextualTyping.js.map
+++ b/tests/baselines/reference/contextualTyping.js.map
@@ -1,2 +1,2 @@
 //// [contextualTyping.js.map]
-{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACE,QAAG,GAAqC,UAAS,CAAC;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IAET,QAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,cAAc,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAI,MAAM,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACf,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEX,MAAM,CAAC,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
\ No newline at end of file
+{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI;IACI,QAAG,GAAqC,UAAS,CAAC;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI;IAEP,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,cAAc,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,MAAM,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAI,MAAM,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACf,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEX,MAAM,CAAC,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index 3557299d96a..fa7352f47c6 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -160,19 +160,13 @@ sourceFile:contextualTyping.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
-4 >               ^^
-5 >                 ^
-6 >                  ^^^^^^^^^^^^->
+4 >               ^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C2T5
-4 >                
-5 >                 {
 1->Emitted(12, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(12, 12) Source(21, 8) + SourceIndex(0)
 3 >Emitted(12, 16) Source(21, 12) + SourceIndex(0)
-4 >Emitted(12, 18) Source(21, 13) + SourceIndex(0)
-5 >Emitted(12, 19) Source(21, 14) + SourceIndex(0)
 ---
 >>>    C2T5.foo = function (i) {
 1->^^^^
@@ -180,7 +174,7 @@ sourceFile:contextualTyping.ts
 3 >            ^^^
 4 >               ^^^^^^^^^^
 5 >                         ^
-1->
+1-> {
   >    export var 
 2 >    foo
 3 >            : (i: number, s: string) => number = 
@@ -1100,44 +1094,41 @@ sourceFile:contextualTyping.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
-4 >               ^^
-5 >                 ^
-6 >                  ^^^^^^^^^^^^^^^->
+4 >               ^^^^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C5T5
-4 >                
-5 >                 {
 1->Emitted(51, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(51, 12) Source(66, 8) + SourceIndex(0)
 3 >Emitted(51, 16) Source(66, 12) + SourceIndex(0)
-4 >Emitted(51, 18) Source(66, 13) + SourceIndex(0)
-5 >Emitted(51, 19) Source(66, 14) + SourceIndex(0)
 ---
 >>>    C5T5.foo = function (i, s) {
 1->^^^^
-2 >    ^^^^^^^^
-3 >            ^^^
-4 >               ^^^^^^^^^^
-5 >                         ^
-6 >                          ^^
-7 >                            ^
-1->
+2 >    ^^^^^
+3 >         ^^^
+4 >            ^^^
+5 >               ^^^^^^^^^^
+6 >                         ^
+7 >                          ^^
+8 >                            ^
+1-> {
   >    export var foo: (i: number, s: string) => string;
   >    
-2 >    foo
-3 >             = 
-4 >               function(
-5 >                         i
-6 >                          , 
-7 >                            s
+2 >    
+3 >         foo
+4 >             = 
+5 >               function(
+6 >                         i
+7 >                          , 
+8 >                            s
 1->Emitted(52, 5) Source(68, 5) + SourceIndex(0)
-2 >Emitted(52, 13) Source(68, 8) + SourceIndex(0)
-3 >Emitted(52, 16) Source(68, 11) + SourceIndex(0)
-4 >Emitted(52, 26) Source(68, 20) + SourceIndex(0)
-5 >Emitted(52, 27) Source(68, 21) + SourceIndex(0)
-6 >Emitted(52, 29) Source(68, 23) + SourceIndex(0)
-7 >Emitted(52, 30) Source(68, 24) + SourceIndex(0)
+2 >Emitted(52, 10) Source(68, 5) + SourceIndex(0)
+3 >Emitted(52, 13) Source(68, 8) + SourceIndex(0)
+4 >Emitted(52, 16) Source(68, 11) + SourceIndex(0)
+5 >Emitted(52, 26) Source(68, 20) + SourceIndex(0)
+6 >Emitted(52, 27) Source(68, 21) + SourceIndex(0)
+7 >Emitted(52, 29) Source(68, 23) + SourceIndex(0)
+8 >Emitted(52, 30) Source(68, 24) + SourceIndex(0)
 ---
 >>>        return s;
 1 >^^^^^^^^
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
index 11081be4fb3..a6eaa048093 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
@@ -61,28 +61,32 @@ function getFoo1() {
     }());
 }
 function getFoo2() {
-    return (function () {
-        function class_2() {
-        }
-        class_2.method1 = function (arg) {
+    return _a = (function () {
+            function class_2() {
+            }
+            return class_2;
+        }()),
+        _a.method1 = function (arg) {
             arg.numProp = 10;
-        };
-        class_2.method2 = function (arg) {
+        },
+        _a.method2 = function (arg) {
             arg.strProp = "hello";
-        };
-        return class_2;
-    }());
+        },
+        _a;
+    var _a;
 }
 function getFoo3() {
-    return (function () {
-        function class_3() {
-        }
-        class_3.method1 = function (arg) {
+    return _a = (function () {
+            function class_3() {
+            }
+            return class_3;
+        }()),
+        _a.method1 = function (arg) {
             arg.numProp = 10;
-        };
-        class_3.method2 = function (arg) {
+        },
+        _a.method2 = function (arg) {
             arg.strProp = "hello";
-        };
-        return class_3;
-    }());
+        },
+        _a;
+    var _a;
 }
diff --git a/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js
index 431bdee6c88..774869310ab 100644
--- a/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js
+++ b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js
@@ -14,7 +14,7 @@ function foo() {
 
 //// [continueInLoopsWithCapturedBlockScopedBindings1.js]
 function foo() {
-    var _loop_1 = function(i) {
+    var _loop_1 = function (i) {
         if (i === 0) {
             return "continue";
         }
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 266e030128e..6870e16f941 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -16,7 +16,7 @@ var z = b.x;
 //// [declFileForExportedImport_1.js]
 "use strict";
 ///<reference path='declFileForExportedImport_0.ts'/>
-exports.a = require('./declFileForExportedImport_0');
+exports.a = require("./declFileForExportedImport_0");
 var y = exports.a.x;
 exports.b = exports.a;
 var z = exports.b.x;
diff --git a/tests/baselines/reference/declFilePrivateStatic.js b/tests/baselines/reference/declFilePrivateStatic.js
index 30cd85444cf..fb24bea7660 100644
--- a/tests/baselines/reference/declFilePrivateStatic.js
+++ b/tests/baselines/reference/declFilePrivateStatic.js
@@ -40,10 +40,10 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    C.x = 1;
-    C.y = 1;
     return C;
 }());
+C.x = 1;
+C.y = 1;
 
 
 //// [declFilePrivateStatic.d.ts]
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js
index a0c8ab59b97..643f9a8c889 100644
--- a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js
@@ -2,15 +2,15 @@
 export default 3.14159;
 
 //// [pi.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
-            exports_1("default",3.14159);
+        setters: [],
+        execute: function () {
+            exports_1("default", 3.14159);
         }
-    }
+    };
 });
 
 
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
index adb081dc2a3..35bdf2f9ecc 100644
--- a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
@@ -3,15 +3,15 @@
 export default 3.14159;
 
 //// [app.js]
-System.register("pi", [], function(exports_1, context_1) {
+System.register("pi", [], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
-            exports_1("default",3.14159);
+        setters: [],
+        execute: function () {
+            exports_1("default", 3.14159);
         }
-    }
+    };
 });
 
 
diff --git a/tests/baselines/reference/declarationEmitDestructuring4.js b/tests/baselines/reference/declarationEmitDestructuring4.js
index 16e6b49a4cf..2639aff0430 100644
--- a/tests/baselines/reference/declarationEmitDestructuring4.js
+++ b/tests/baselines/reference/declarationEmitDestructuring4.js
@@ -17,14 +17,14 @@ function baz4({} = { x: 10 }) { }
 // the similar binding pattern users' have written
 function baz(_a) { }
 function baz1(_a) {
-    var _a = [1, 2, 3];
+    _a = [1, 2, 3];
 }
 function baz2(_a) {
     var _b = (_a === void 0 ? [[1, 2, 3]] : _a)[0];
 }
 function baz3(_a) { }
 function baz4(_a) {
-    var _a = { x: 10 };
+    _a = { x: 10 };
 }
 
 
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
index 16756fe0afe..22868b0ae00 100644
--- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
@@ -20,21 +20,18 @@ class C3 {
 var C1 = (function () {
     function C1(_a) {
         var x = _a[0], y = _a[1], z = _a[2];
-        this.[x, y, z] = [x, y, z];
     }
     return C1;
 }());
 var C2 = (function () {
     function C2(_a) {
         var x = _a[0], y = _a[1], z = _a[2];
-        this.[x, y, z] = [x, y, z];
     }
     return C2;
 }());
 var C3 = (function () {
     function C3(_a) {
         var x = _a.x, y = _a.y, z = _a.z;
-        this.{ x, y, z } = { x, y, z };
     }
     return C3;
 }());
diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.js b/tests/baselines/reference/declarationEmit_bindingPatterns.js
index c2063ead215..8cc52af53b8 100644
--- a/tests/baselines/reference/declarationEmit_bindingPatterns.js
+++ b/tests/baselines/reference/declarationEmit_bindingPatterns.js
@@ -12,8 +12,8 @@ var k = function (_a) {
 };
 var a;
 function f(_a, _b, _c) {
-    var _a = a;
-    var _b = a;
+    _a = a;
+    _b = a;
     var _d = (_c === void 0 ? a : _c).p, _e = _d === void 0 ? a : _d;
 }
 
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js
index ee80738a269..4fa998f86b8 100644
--- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js
@@ -10,6 +10,7 @@ export default {
 //// [declarationEmit_inferedDefaultExportType.js]
 "use strict";
 exports.__esModule = true;
+// test.ts
 exports["default"] = {
     foo: [],
     bar: undefined,
diff --git a/tests/baselines/reference/declarationEmit_invalidExport.js b/tests/baselines/reference/declarationEmit_invalidExport.js
index 61682ca5642..74b5bfd8019 100644
--- a/tests/baselines/reference/declarationEmit_invalidExport.js
+++ b/tests/baselines/reference/declarationEmit_invalidExport.js
@@ -10,5 +10,5 @@ export type MyClass = typeof myClass;
 //// [declarationEmit_invalidExport.js]
 "use strict";
 if (false) {
-    exports.myClass = 0;
+    export var myClass = 0;
 }
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js
index 5004ded4837..957a0da472a 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.js
@@ -63,7 +63,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 "use strict";
-var im = require('./declarationEmit_nameConflicts_1');
+var im = require("./declarationEmit_nameConflicts_1");
 var M;
 (function (M) {
     function f() { }
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index 4a04d724f0c..9674d7853d5 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -20,9 +20,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 let Testing123_1 = class Testing123 {
 };
 let Testing123 = Testing123_1;
-Testing123.prop1 = Testing123.prop0;
+Testing123.prop1 = Testing123_1.prop0;
 Testing123 = Testing123_1 = __decorate([
-    Something({ v: () => Testing123 }), 
-    __metadata('design:paramtypes', [])
+    Something({ v: () => Testing123_1 }),
+    __metadata("design:paramtypes", [])
 ], Testing123);
 exports.Testing123 = Testing123;
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index c5e8eb9aa29..3ca6fa2d70e 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -20,7 +20,7 @@ let Testing123_1 = class Testing123 {
 };
 let Testing123 = Testing123_1;
 Testing123 = Testing123_1 = __decorate([
-    Something({ v: () => Testing123 }), 
-    __metadata('design:paramtypes', [])
+    Something({ v: () => Testing123_1 }),
+    __metadata("design:paramtypes", [])
 ], Testing123);
 exports.Testing123 = Testing123;
diff --git a/tests/baselines/reference/decoratedClassExportsSystem1.js b/tests/baselines/reference/decoratedClassExportsSystem1.js
index 1730ba4460f..43a4421642e 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem1.js
+++ b/tests/baselines/reference/decoratedClassExportsSystem1.js
@@ -9,9 +9,8 @@ export class Testing123 {
 }
 
 //// [a.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
-    var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
         if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -21,19 +20,20 @@ System.register([], function(exports_1, context_1) {
     var __metadata = (this && this.__metadata) || function (k, v) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
     };
-    var Testing123;
+    var __moduleName = context_1 && context_1.id;
+    var Testing123_1, Testing123;
     return {
-        setters:[],
-        execute: function() {
-            let Testing123_1 = class Testing123 {
+        setters: [],
+        execute: function () {
+            Testing123_1 = class Testing123 {
             };
-            let Testing123 = Testing123_1;
-            Testing123.prop1 = Testing123.prop0;
+            Testing123 = Testing123_1;
+            Testing123.prop1 = Testing123_1.prop0;
             Testing123 = Testing123_1 = __decorate([
-                Something({ v: () => Testing123 }), 
-                __metadata('design:paramtypes', [])
+                Something({ v: () => Testing123_1 }),
+                __metadata("design:paramtypes", [])
             ], Testing123);
             exports_1("Testing123", Testing123);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/decoratedClassExportsSystem2.js b/tests/baselines/reference/decoratedClassExportsSystem2.js
index b4d34de2958..cbb592539cf 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem2.js
+++ b/tests/baselines/reference/decoratedClassExportsSystem2.js
@@ -6,9 +6,8 @@ declare var Something: any;
 export class Testing123 { }
 
 //// [a.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
-    var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
         if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -18,18 +17,19 @@ System.register([], function(exports_1, context_1) {
     var __metadata = (this && this.__metadata) || function (k, v) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
     };
-    var Testing123;
+    var __moduleName = context_1 && context_1.id;
+    var Testing123_1, Testing123;
     return {
-        setters:[],
-        execute: function() {
-            let Testing123_1 = class Testing123 {
+        setters: [],
+        execute: function () {
+            Testing123_1 = class Testing123 {
             };
-            let Testing123 = Testing123_1;
+            Testing123 = Testing123_1;
             Testing123 = Testing123_1 = __decorate([
-                Something({ v: () => Testing123 }), 
-                __metadata('design:paramtypes', [])
+                Something({ v: () => Testing123_1 }),
+                __metadata("design:paramtypes", [])
             ], Testing123);
             exports_1("Testing123", Testing123);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
index d5cd115edc0..4628fc5e81c 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
@@ -13,19 +13,19 @@ var decorator: ClassDecorator;
 export default class {}
 
 //// [a.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
-    var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
         if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
+    var __moduleName = context_1 && context_1.id;
     var decorator, Foo;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             Foo = class Foo {
             };
             Foo = __decorate([
@@ -33,22 +33,22 @@ System.register([], function(exports_1, context_1) {
             ], Foo);
             exports_1("default", Foo);
         }
-    }
+    };
 });
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
-    var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
         if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
+    var __moduleName = context_1 && context_1.id;
     var decorator, default_1;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             default_1 = class {
             };
             default_1 = __decorate([
@@ -56,5 +56,5 @@ System.register([], function(exports_1, context_1) {
             ], default_1);
             exports_1("default", default_1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index c7b59d01469..c32e18ec008 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -20,14 +20,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var decorator;
     let Foo = class Foo {
@@ -45,14 +45,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var decorator;
     let default_1 = class {
diff --git a/tests/baselines/reference/decoratorCallGeneric.js b/tests/baselines/reference/decoratorCallGeneric.js
index acc9c48297d..a1d470b7063 100644
--- a/tests/baselines/reference/decoratorCallGeneric.js
+++ b/tests/baselines/reference/decoratorCallGeneric.js
@@ -24,8 +24,8 @@ var C = (function () {
     function C() {
     }
     C.m = function () { };
-    C = __decorate([
-        dec
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec
+], C);
diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.js b/tests/baselines/reference/decoratorChecksFunctionBodies.js
index d70c4a33460..68dbe6bd1ef 100644
--- a/tests/baselines/reference/decoratorChecksFunctionBodies.js
+++ b/tests/baselines/reference/decoratorChecksFunctionBodies.js
@@ -30,12 +30,12 @@ var A = (function () {
     }
     A.prototype.m = function () {
     };
-    __decorate([
-        (function (x, p) {
-            var a = 3;
-            func(a);
-            return x;
-        })
-    ], A.prototype, "m", null);
     return A;
 }());
+__decorate([
+    (function (x, p) {
+        var a = 3;
+        func(a);
+        return x;
+    })
+], A.prototype, "m", null);
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 92dcc1f836c..fc8dc1c5515 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -33,7 +33,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var a_1 = require('./a');
+var a_1 = require("./a");
 function filter(handler) {
     return function (target, propertyKey) {
         // ...
@@ -45,8 +45,8 @@ var Wat = (function () {
     Wat.whatever = function () {
         // ...
     };
-    __decorate([
-        filter(function () { return a_1.test == 'abc'; })
-    ], Wat, "whatever", null);
     return Wat;
 }());
+__decorate([
+    filter(function () { return a_1.test == 'abc'; })
+], Wat, "whatever", null);
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index 2f360df0618..cb253d43c16 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -45,15 +45,15 @@ var MyComponent = (function () {
     }
     MyComponent.prototype.method = function (x) {
     };
-    __decorate([
-        decorator, 
-        __metadata('design:type', Function), 
-        __metadata('design:paramtypes', [Object]), 
-        __metadata('design:returntype', void 0)
-    ], MyComponent.prototype, "method", null);
-    MyComponent = __decorate([
-        decorator, 
-        __metadata('design:paramtypes', [service_1.default])
-    ], MyComponent);
     return MyComponent;
 }());
+__decorate([
+    decorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], MyComponent.prototype, "method", null);
+MyComponent = __decorate([
+    decorator,
+    __metadata("design:paramtypes", [service_1.default])
+], MyComponent);
diff --git a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
index f5048ead631..970447efae0 100644
--- a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
+++ b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
@@ -20,11 +20,11 @@ var MyClass = (function () {
     }
     MyClass.prototype.doSomething = function () {
     };
-    __decorate([
-        decorator, 
-        __metadata('design:type', Function), 
-        __metadata('design:paramtypes', []), 
-        __metadata('design:returntype', void 0)
-    ], MyClass.prototype, "doSomething", null);
     return MyClass;
 }());
+__decorate([
+    decorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], MyClass.prototype, "doSomething", null);
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 5a39a6ce42c..0c63bcf49da 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -31,10 +31,10 @@ var B = (function () {
     function B() {
         this.x = new A();
     }
-    __decorate([
-        decorator, 
-        __metadata('design:type', Object)
-    ], B.prototype, "x", void 0);
     return B;
 }());
 exports.B = B;
+__decorate([
+    decorator,
+    __metadata("design:type", Object)
+], B.prototype, "x", void 0);
diff --git a/tests/baselines/reference/decoratorMetadataPromise.js b/tests/baselines/reference/decoratorMetadataPromise.js
index 3ed8942033d..56a66216dea 100644
--- a/tests/baselines/reference/decoratorMetadataPromise.js
+++ b/tests/baselines/reference/decoratorMetadataPromise.js
@@ -40,20 +40,20 @@ class A {
     baz(n) { return n; }
 }
 __decorate([
-    decorator, 
-    __metadata('design:type', Function), 
-    __metadata('design:paramtypes', []), 
-    __metadata('design:returntype', Promise)
+    decorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
 ], A.prototype, "foo", null);
 __decorate([
-    decorator, 
-    __metadata('design:type', Function), 
-    __metadata('design:paramtypes', []), 
-    __metadata('design:returntype', Promise)
+    decorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
 ], A.prototype, "bar", null);
 __decorate([
-    decorator, 
-    __metadata('design:type', Function), 
-    __metadata('design:paramtypes', [Promise]), 
-    __metadata('design:returntype', Promise)
+    decorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Promise]),
+    __metadata("design:returntype", Promise)
 ], A.prototype, "baz", null);
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 39e8d1811aa..49b72e39a09 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -31,10 +31,10 @@ var B = (function () {
     function B() {
         this.x = new A();
     }
-    __decorate([
-        decorator, 
-        __metadata('design:type', A)
-    ], B.prototype, "x", void 0);
     return B;
 }());
 exports.B = B;
+__decorate([
+    decorator,
+    __metadata("design:type", A)
+], B.prototype, "x", void 0);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index b549d28c7f1..258635a5f3a 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -35,7 +35,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
-var db_1 = require('./db');
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -44,10 +44,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [db_1.db])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.db])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index acd86e78d76..104e449bc0c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -35,7 +35,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
-var db_1 = require('./db');
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -44,10 +44,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [db_1.db])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.db])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 2acd829c107..2925cad6afe 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -35,7 +35,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
-var db = require('./db');
+var db = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -44,10 +44,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [db.db])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [db.db])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index a057b496b25..33eb93f380f 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -35,7 +35,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
-var db_1 = require('./db'); // error no default export
+var db_1 = require("./db"); // error no default export
 function someDecorator(target) {
     return target;
 }
@@ -44,11 +44,11 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof db_1.default !== 'undefined' && db_1.default.db) === 'function' && _a) || Object])
-    ], MyClass);
     return MyClass;
-    var _a;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [typeof (_a = (typeof db_1.default !== "undefined" && db_1.default).db) === "function" && _a || Object])
+], MyClass);
 exports.MyClass = MyClass;
+var _a;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index f1537e3b447..b99621fd7e2 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
 "use strict";
-var db_1 = require('./db');
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -45,10 +45,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [db_1.default])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.default])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 7ef2c288810..4970dca3201 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
 "use strict";
-var db_1 = require('./db');
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -45,10 +45,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [db_1.default])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.default])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index f8469cdd6a4..28d403044bb 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
 "use strict";
-var db_1 = require('./db');
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -45,10 +45,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [Object])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [Object])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index f1885ccfaec..dd5cee66f8b 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -35,7 +35,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
-var database = require('./db');
+var database = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -44,10 +44,10 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [database.db])
-    ], MyClass);
     return MyClass;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [database.db])
+], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js
index 7ea46b4698f..5cff4c2649c 100644
--- a/tests/baselines/reference/decoratorOnClass1.js
+++ b/tests/baselines/reference/decoratorOnClass1.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        dec
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec
+], C);
diff --git a/tests/baselines/reference/decoratorOnClass2.es6.js b/tests/baselines/reference/decoratorOnClass2.es6.js
index 872f241bc9c..d1258af98b9 100644
--- a/tests/baselines/reference/decoratorOnClass2.es6.js
+++ b/tests/baselines/reference/decoratorOnClass2.es6.js
@@ -14,9 +14,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-export let C = class C {
+let C = class C {
 };
 C = __decorate([
     dec
 ], C);
+export { C };
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 3f24c7ae55b..4d9c2007ad0 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -16,9 +16,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        dec
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec
+], C);
 exports.C = C;
diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js
index 5a3601fc1f3..fd09a6d8de5 100644
--- a/tests/baselines/reference/decoratorOnClass3.js
+++ b/tests/baselines/reference/decoratorOnClass3.js
@@ -16,8 +16,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        dec
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec
+], C);
diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js
index adbe30db662..daf19e20327 100644
--- a/tests/baselines/reference/decoratorOnClass4.js
+++ b/tests/baselines/reference/decoratorOnClass4.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        dec()
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec()
+], C);
diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js
index 6741b26373b..70fc5515140 100644
--- a/tests/baselines/reference/decoratorOnClass5.js
+++ b/tests/baselines/reference/decoratorOnClass5.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        dec()
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec()
+], C);
diff --git a/tests/baselines/reference/decoratorOnClass6.es6.js b/tests/baselines/reference/decoratorOnClass6.es6.js
index 0861774bfc0..fff39d85916 100644
--- a/tests/baselines/reference/decoratorOnClass6.es6.js
+++ b/tests/baselines/reference/decoratorOnClass6.es6.js
@@ -19,9 +19,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 let C_1 = class C {
     static x() { return C_1.y; }
 };
-export let C = C_1;
+let C = C_1;
 C.y = 1;
 C = C_1 = __decorate([
     dec
 ], C);
+export { C };
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass8.es6.js b/tests/baselines/reference/decoratorOnClass8.es6.js
index 7104098a5f5..88dd41e7b60 100644
--- a/tests/baselines/reference/decoratorOnClass8.es6.js
+++ b/tests/baselines/reference/decoratorOnClass8.es6.js
@@ -13,7 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let default_1 = class {
+let default_1 = class default_1 {
 };
 default_1.y = 1;
 default_1 = __decorate([
diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js
index e5cd8812ea7..ae50ab75ab8 100644
--- a/tests/baselines/reference/decoratorOnClass8.js
+++ b/tests/baselines/reference/decoratorOnClass8.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        dec()
-    ], C);
     return C;
 }());
+C = __decorate([
+    dec()
+], C);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js
index cf989705b79..27966350fae 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.js
@@ -20,8 +20,8 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    __decorate([
-        dec
-    ], C.prototype, "accessor", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "accessor", null);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js
index 9e9455b4380..57cb3b50461 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.js
@@ -20,8 +20,8 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    __decorate([
-        dec
-    ], C.prototype, "accessor", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "accessor", null);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.js b/tests/baselines/reference/decoratorOnClassAccessor3.js
index 8a27914e0c8..c02f984e70a 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.js
@@ -20,8 +20,8 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    __decorate([
-        dec
-    ], C.prototype, "accessor", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "accessor", null);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js
index 85b35e95cef..0e0af58f526 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.js
@@ -20,8 +20,8 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    __decorate([
-        dec
-    ], C.prototype, "accessor", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "accessor", null);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js
index 12ec7a08adc..c7d5d109cc0 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.js
@@ -20,8 +20,8 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    __decorate([
-        dec
-    ], C.prototype, "accessor", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "accessor", null);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.js b/tests/baselines/reference/decoratorOnClassAccessor6.js
index d5477deb5af..8ac40e72299 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.js
@@ -20,8 +20,8 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    __decorate([
-        dec
-    ], C.prototype, "accessor", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "accessor", null);
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt b/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt
new file mode 100644
index 00000000000..c4585b8301f
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/conformance/decorators/class/constructor/2.ts(1,20): error TS2691: An import path cannot end with a '.ts' extension. Consider importing './0' instead.
+tests/cases/conformance/decorators/class/constructor/2.ts(2,19): error TS2691: An import path cannot end with a '.ts' extension. Consider importing './0' instead.
+
+
+==== tests/cases/conformance/decorators/class/constructor/0.ts (0 errors) ====
+    
+    export class base { }
+    export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+    
+==== tests/cases/conformance/decorators/class/constructor/2.ts (2 errors) ====
+    import {base} from "./0.ts"
+                       ~~~~~~~~
+!!! error TS2691: An import path cannot end with a '.ts' extension. Consider importing './0' instead.
+    import {foo} from "./0.ts"
+                      ~~~~~~~~
+!!! error TS2691: An import path cannot end with a '.ts' extension. Consider importing './0' instead.
+    export class C  extends base{
+        constructor(@foo prop: any) {
+            super();
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
new file mode 100644
index 00000000000..5fc5501c329
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -0,0 +1,55 @@
+//// [tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts] ////
+
+//// [0.ts]
+
+export class base { }
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+
+//// [2.ts]
+import {base} from "./0.ts"
+import {foo} from "./0.ts"
+export class C  extends base{
+    constructor(@foo prop: any) {
+        super();
+    }
+}
+
+//// [0.js]
+"use strict";
+var base = (function () {
+    function base() {
+    }
+    return base;
+}());
+exports.base = base;
+function foo(target, propertyKey, parameterIndex) { }
+exports.foo = foo;
+//// [2.js]
+"use strict";
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var _0_ts_1 = require("./0.ts");
+var _0_ts_2 = require("./0.ts");
+var C = (function (_super) {
+    __extends(C, _super);
+    function C(prop) {
+        _super.call(this);
+    }
+    return C;
+}(_0_ts_1.base));
+C = __decorate([
+    __param(0, _0_ts_2.foo)
+], C);
+exports.C = C;
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.symbols b/tests/baselines/reference/decoratorOnClassConstructor2.symbols
new file mode 100644
index 00000000000..2135ddd866a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.symbols
@@ -0,0 +1,31 @@
+=== tests/cases/conformance/decorators/class/constructor/0.ts ===
+
+export class base { }
+>base : Symbol(base, Decl(0.ts, 0, 0))
+
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+>foo : Symbol(foo, Decl(0.ts, 1, 21))
+>target : Symbol(target, Decl(0.ts, 2, 20))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>propertyKey : Symbol(propertyKey, Decl(0.ts, 2, 35))
+>parameterIndex : Symbol(parameterIndex, Decl(0.ts, 2, 65))
+
+=== tests/cases/conformance/decorators/class/constructor/2.ts ===
+import {base} from "./0.ts"
+>base : Symbol(base, Decl(2.ts, 0, 8))
+
+import {foo} from "./0.ts"
+>foo : Symbol(foo, Decl(2.ts, 1, 8))
+
+export class C  extends base{
+>C : Symbol(C, Decl(2.ts, 1, 26))
+>base : Symbol(base, Decl(2.ts, 0, 8))
+
+    constructor(@foo prop: any) {
+>foo : Symbol(foo, Decl(2.ts, 1, 8))
+>prop : Symbol(prop, Decl(2.ts, 3, 16))
+
+        super();
+>super : Symbol(base, Decl(0.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.types b/tests/baselines/reference/decoratorOnClassConstructor2.types
new file mode 100644
index 00000000000..c2e7a08499a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.types
@@ -0,0 +1,32 @@
+=== tests/cases/conformance/decorators/class/constructor/0.ts ===
+
+export class base { }
+>base : base
+
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>target : Object
+>Object : Object
+>propertyKey : string | symbol
+>parameterIndex : number
+
+=== tests/cases/conformance/decorators/class/constructor/2.ts ===
+import {base} from "./0.ts"
+>base : typeof base
+
+import {foo} from "./0.ts"
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+
+export class C  extends base{
+>C : C
+>base : base
+
+    constructor(@foo prop: any) {
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>prop : any
+
+        super();
+>super() : void
+>super : typeof base
+    }
+}
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
new file mode 100644
index 00000000000..66946fab8bd
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -0,0 +1,58 @@
+//// [tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts] ////
+
+//// [0.ts]
+
+export class base { }
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+
+//// [2.ts]
+import {base} from "./0"
+import {foo} from "./0"
+
+/* Comment on the Class Declaration */
+export class C  extends base{
+    constructor(@foo prop: any) {
+        super();
+    }
+}
+
+//// [0.js]
+"use strict";
+var base = (function () {
+    function base() {
+    }
+    return base;
+}());
+exports.base = base;
+function foo(target, propertyKey, parameterIndex) { }
+exports.foo = foo;
+//// [2.js]
+"use strict";
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var _0_1 = require("./0");
+var _0_2 = require("./0");
+/* Comment on the Class Declaration */
+var C = (function (_super) {
+    __extends(C, _super);
+    function C(prop) {
+        _super.call(this);
+    }
+    return C;
+}(_0_1.base));
+C = __decorate([
+    __param(0, _0_2.foo)
+], C);
+exports.C = C;
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.symbols b/tests/baselines/reference/decoratorOnClassConstructor3.symbols
new file mode 100644
index 00000000000..12c20c9a8cc
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.symbols
@@ -0,0 +1,32 @@
+=== tests/cases/conformance/decorators/class/constructor/0.ts ===
+
+export class base { }
+>base : Symbol(base, Decl(0.ts, 0, 0))
+
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+>foo : Symbol(foo, Decl(0.ts, 1, 21))
+>target : Symbol(target, Decl(0.ts, 2, 20))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>propertyKey : Symbol(propertyKey, Decl(0.ts, 2, 35))
+>parameterIndex : Symbol(parameterIndex, Decl(0.ts, 2, 65))
+
+=== tests/cases/conformance/decorators/class/constructor/2.ts ===
+import {base} from "./0"
+>base : Symbol(base, Decl(2.ts, 0, 8))
+
+import {foo} from "./0"
+>foo : Symbol(foo, Decl(2.ts, 1, 8))
+
+/* Comment on the Class Declaration */
+export class C  extends base{
+>C : Symbol(C, Decl(2.ts, 1, 23))
+>base : Symbol(base, Decl(2.ts, 0, 8))
+
+    constructor(@foo prop: any) {
+>foo : Symbol(foo, Decl(2.ts, 1, 8))
+>prop : Symbol(prop, Decl(2.ts, 5, 16))
+
+        super();
+>super : Symbol(base, Decl(0.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.types b/tests/baselines/reference/decoratorOnClassConstructor3.types
new file mode 100644
index 00000000000..dc1e22c1688
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/decorators/class/constructor/0.ts ===
+
+export class base { }
+>base : base
+
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>target : Object
+>Object : Object
+>propertyKey : string | symbol
+>parameterIndex : number
+
+=== tests/cases/conformance/decorators/class/constructor/2.ts ===
+import {base} from "./0"
+>base : typeof base
+
+import {foo} from "./0"
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+
+/* Comment on the Class Declaration */
+export class C  extends base{
+>C : C
+>base : base
+
+    constructor(@foo prop: any) {
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>prop : any
+
+        super();
+>super() : void
+>super : typeof base
+    }
+}
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
index fe04f569e30..176e2309ae0 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
@@ -18,8 +18,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 var C = (function () {
     function C(p) {
     }
-    C = __decorate([
-        __param(0, dec)
-    ], C);
     return C;
 }());
+C = __decorate([
+    __param(0, dec)
+], C);
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
index 8d02bd467d6..e14f0358808 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
@@ -18,8 +18,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 var C = (function () {
     function C(public, p) {
     }
-    C = __decorate([
-        __param(1, dec)
-    ], C);
     return C;
 }());
+C = __decorate([
+    __param(1, dec)
+], C);
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js
index ef029b84543..b93d7f88771 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.js
+++ b/tests/baselines/reference/decoratorOnClassMethod1.js
@@ -16,8 +16,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js
index f90251d6196..bfa57f0aeb7 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.js
+++ b/tests/baselines/reference/decoratorOnClassMethod10.js
@@ -16,8 +16,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js
index f1589a39286..c703459b88d 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.js
+++ b/tests/baselines/reference/decoratorOnClassMethod11.js
@@ -22,9 +22,9 @@ var M;
         }
         C.prototype.decorator = function (target, key) { };
         C.prototype.method = function () { };
-        __decorate([
-            this.decorator
-        ], C.prototype, "method", null);
         return C;
     }());
+    __decorate([
+        this.decorator
+    ], C.prototype, "method", null);
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js
index 0650f1d00ee..6e9b9763a3a 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -35,9 +35,9 @@ var M;
             _super.apply(this, arguments);
         }
         C.prototype.method = function () { };
-        __decorate([
-            _super.decorator
-        ], C.prototype, "method", null);
         return C;
     }(S));
+    __decorate([
+        _super.decorator
+    ], C.prototype, "method", null);
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js
index 5db2922ed71..98ad8ad43ad 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.js
+++ b/tests/baselines/reference/decoratorOnClassMethod2.js
@@ -16,8 +16,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.js b/tests/baselines/reference/decoratorOnClassMethod3.js
index 30f527368f2..4a5943681d4 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.js
+++ b/tests/baselines/reference/decoratorOnClassMethod3.js
@@ -16,8 +16,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js
index bf8c06d9b90..c1ad826cab0 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.js
+++ b/tests/baselines/reference/decoratorOnClassMethod8.js
@@ -16,8 +16,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.js b/tests/baselines/reference/decoratorOnClassMethodOverload2.js
index eafa5da7110..db077dd7b51 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload2.js
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.js
@@ -18,8 +18,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
index efb1e4abff2..d5d8599d7a8 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
@@ -19,8 +19,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function (p) { };
-    __decorate([
-        __param(0, dec)
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    __param(0, dec)
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js
index 65a399332f1..6547e0bdb18 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.js
+++ b/tests/baselines/reference/decoratorOnClassProperty1.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js
index 9df40eaf83a..174f26a315a 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.js
+++ b/tests/baselines/reference/decoratorOnClassProperty10.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec()
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec()
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js
index 8b771caf8b5..c901637402d 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.js
+++ b/tests/baselines/reference/decoratorOnClassProperty11.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js
index 3ab2b515e3c..ceaf43caa59 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.js
+++ b/tests/baselines/reference/decoratorOnClassProperty2.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.js b/tests/baselines/reference/decoratorOnClassProperty3.js
index 9c0d3f90e42..8436be93968 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.js
+++ b/tests/baselines/reference/decoratorOnClassProperty3.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js
index 823a652af24..c7f5490c648 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.js
+++ b/tests/baselines/reference/decoratorOnClassProperty6.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js
index 134f35022e0..828d548ff6b 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.js
+++ b/tests/baselines/reference/decoratorOnClassProperty7.js
@@ -15,8 +15,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var C = (function () {
     function C() {
     }
-    __decorate([
-        dec
-    ], C.prototype, "prop", void 0);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "prop", void 0);
diff --git a/tests/baselines/reference/deduplicateImportsInSystem.js b/tests/baselines/reference/deduplicateImportsInSystem.js
index accc4954e65..f0ac7c83ed8 100644
--- a/tests/baselines/reference/deduplicateImportsInSystem.js
+++ b/tests/baselines/reference/deduplicateImportsInSystem.js
@@ -9,12 +9,12 @@ import {F} from 'f1';
 console.log(A + B + C + D + E + F)
 
 //// [deduplicateImportsInSystem.js]
-System.register(["f1", "f2", "f3"], function(exports_1, context_1) {
+System.register(["f1", "f2", "f3"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var f1_1, f2_1, f3_1, f2_2, f2_3, f1_2;
     return {
-        setters:[
+        setters: [
             function (f1_1_1) {
                 f1_1 = f1_1_1;
                 f1_2 = f1_1_1;
@@ -26,9 +26,10 @@ System.register(["f1", "f2", "f3"], function(exports_1, context_1) {
             },
             function (f3_1_1) {
                 f3_1 = f3_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             console.log(f1_1.A + f2_1.B + f3_1.C + f2_2.D + f2_3.E + f1_2.F);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index afd4dfa7a56..b57b6237d7a 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -13,14 +13,14 @@ import x from './a';
 
 
 //// [a.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     const x = new Promise((resolve, reject) => { resolve({}); });
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -35,16 +35,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments)).next());
     });
 };
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports", './a'], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports", "./a"], function (require, exports) {
     "use strict";
-    const a_1 = require('./a');
+    const a_1 = require("./a");
     (function () {
         return __awaiter(this, void 0, void 0, function* () {
             const value = yield a_1.default;
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index 70a9ce6c2d3..db2150c66f1 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -27,7 +27,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments)).next());
     });
 };
-const a_1 = require('./a');
+const a_1 = require("./a");
 (function () {
     return __awaiter(this, void 0, void 0, function* () {
         const value = yield a_1.default;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index f327c62e571..ae5701b86bc 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -33,7 +33,7 @@ var Decl = (function () {
     return Decl;
 }());
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = Decl;
+exports.default = exports.Decl;
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index 7c9bd88bc16..ef8d6853d98 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -18,7 +18,7 @@ export interface Foo {
 function Foo() {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = Foo;
+exports.default = exports.Foo;
 var Foo;
 (function (Foo) {
-})(Foo || (Foo = {}));
+})(exports.Foo || (exports.Foo = {}));
diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.js b/tests/baselines/reference/defaultExportsGetExportedSystem.js
index eaf6d323f09..089551195ae 100644
--- a/tests/baselines/reference/defaultExportsGetExportedSystem.js
+++ b/tests/baselines/reference/defaultExportsGetExportedSystem.js
@@ -8,28 +8,28 @@ export default function foo() {}
 
 
 //// [a.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var Foo;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             Foo = class Foo {
             };
             exports_1("default", Foo);
         }
-    }
+    };
 });
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function foo() { }
     exports_1("default", foo);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 754c5b00ac8..79d88222806 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -8,14 +8,14 @@ export default function foo() {}
 
 
 //// [a.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     class Foo {
     }
@@ -23,14 +23,14 @@ export default function foo() {}
     exports.default = Foo;
 });
 //// [b.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     function foo() { }
     Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index fad51e2ee1f..8e12bb9bd2c 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -21,7 +21,7 @@ define(["require", "exports"], function (require, exports) {
     exports.A = A;
 });
 //// [B.js]
-define(["require", "exports", 'A'], function (require, exports, a) {
+define(["require", "exports", "A"], function (require, exports, a) {
     "use strict";
     var A = a.A;
     return A;
diff --git a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
index e043ee8a5c5..50408d3bee7 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -77,6 +77,6 @@ var Derived = (function (_super) {
         enumerable: true,
         configurable: true
     });
-    Derived.a = _super.call(this);
     return Derived;
 }(Base));
+Derived.a = _super.call(this);
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 8938757adc2..48053fdbc4f 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -6,14 +6,14 @@ export let { toString } = 1;
 
 
 //// [destructuringInVariableDeclarations5.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     exports.toString = (1).toString;
     {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
index b9dddb673cf..479d4ee34af 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -7,14 +7,14 @@ export {};
 
 
 //// [destructuringInVariableDeclarations6.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     let { toString } = 1;
     {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations7.js b/tests/baselines/reference/destructuringInVariableDeclarations7.js
index 129a9db8d15..e7e4f803b77 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations7.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations7.js
@@ -6,17 +6,17 @@ export let { toString } = 1;
 
 
 //// [destructuringInVariableDeclarations7.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var toString;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("toString", toString = (1).toString);
             {
                 let { toFixed } = 1;
             }
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations8.js b/tests/baselines/reference/destructuringInVariableDeclarations8.js
index bc19fa118f6..12340433bf4 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations8.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations8.js
@@ -7,17 +7,17 @@ export {};
 
 
 //// [destructuringInVariableDeclarations8.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var toString;
     return {
-        setters:[],
-        execute: function() {
-            ({ toString } = 1);
+        setters: [],
+        execute: function () {
+            toString = (1).toString;
             {
                 let { toFixed } = 1;
             }
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES6.js b/tests/baselines/reference/destructuringParameterDeclaration1ES6.js
index f5c79c5fe88..3a155b14fd5 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES6.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES6.js
@@ -145,8 +145,7 @@ c3({ b: 1 }); // Implied type is { b: number|string }.
 c5([1, 2, [["string"]]]); // Implied type is is [any, any, [[any]]]
 c5([1, 2, [["string"]], false, true]); // Implied type is is [any, any, [[any]]]
 class C2 {
-    constructor() {
-    }
+    constructor() { }
     d3() { }
     d4() { }
     e0([a, b, c]) { }
diff --git a/tests/baselines/reference/destructuringParameterDeclaration6.js b/tests/baselines/reference/destructuringParameterDeclaration6.js
index f34f2d695ce..ad86b2983b3 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration6.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration6.js
@@ -32,10 +32,17 @@ function a(_a) {
 function a1(_a) {
     var public = _a.public;
 }
+function a4(_a) { }
 while (, )
     for (, public; ; )
         ;
 { }
+function a5() {
+    var  = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        [_i - 0] = arguments[_i];
+    }
+}
 while () { }
 function a6() {
     var public = [];
diff --git a/tests/baselines/reference/destructuringParameterProperties1.js b/tests/baselines/reference/destructuringParameterProperties1.js
index 55d62d6720e..cfe16d642d3 100644
--- a/tests/baselines/reference/destructuringParameterProperties1.js
+++ b/tests/baselines/reference/destructuringParameterProperties1.js
@@ -33,21 +33,18 @@ var [c3_x, c3_y, c3_z] = [c3.x, c3.y, c3.z];
 var C1 = (function () {
     function C1(_a) {
         var x = _a[0], y = _a[1], z = _a[2];
-        this.[x, y, z] = [x, y, z];
     }
     return C1;
 }());
 var C2 = (function () {
     function C2(_a) {
         var x = _a[0], y = _a[1], z = _a[2];
-        this.[x, y, z] = [x, y, z];
     }
     return C2;
 }());
 var C3 = (function () {
     function C3(_a) {
         var x = _a.x, y = _a.y, z = _a.z;
-        this.{ x, y, z } = { x, y, z };
     }
     return C3;
 }());
diff --git a/tests/baselines/reference/destructuringParameterProperties2.js b/tests/baselines/reference/destructuringParameterProperties2.js
index 086585fac8e..4dd12bdc317 100644
--- a/tests/baselines/reference/destructuringParameterProperties2.js
+++ b/tests/baselines/reference/destructuringParameterProperties2.js
@@ -34,7 +34,6 @@ var C1 = (function () {
     function C1(k, _a) {
         var a = _a[0], b = _a[1], c = _a[2];
         this.k = k;
-        this.[a, b, c] = [a, b, c];
         if ((b === undefined && c === undefined) || (this.b === undefined && this.c === undefined)) {
             this.a = a || k;
         }
diff --git a/tests/baselines/reference/destructuringParameterProperties3.js b/tests/baselines/reference/destructuringParameterProperties3.js
index 71992019015..d9b0c5aebf6 100644
--- a/tests/baselines/reference/destructuringParameterProperties3.js
+++ b/tests/baselines/reference/destructuringParameterProperties3.js
@@ -37,7 +37,6 @@ var C1 = (function () {
     function C1(k, _a) {
         var a = _a[0], b = _a[1], c = _a[2];
         this.k = k;
-        this.[a, b, c] = [a, b, c];
         if ((b === undefined && c === undefined) || (this.b === undefined && this.c === undefined)) {
             this.a = a || k;
         }
diff --git a/tests/baselines/reference/destructuringParameterProperties4.js b/tests/baselines/reference/destructuringParameterProperties4.js
index cd6334c8568..aa8087cfde6 100644
--- a/tests/baselines/reference/destructuringParameterProperties4.js
+++ b/tests/baselines/reference/destructuringParameterProperties4.js
@@ -31,7 +31,6 @@ class C2 extends C1<number, string, boolean> {
 class C1 {
     constructor(k, [a, b, c]) {
         this.k = k;
-        this.[a, b, c] = [a, b, c];
         if ((b === undefined && c === undefined) || (this.b === undefined && this.c === undefined)) {
             this.a = a || k;
         }
diff --git a/tests/baselines/reference/destructuringParameterProperties5.js b/tests/baselines/reference/destructuringParameterProperties5.js
index d857ea040a8..f07f6e9f5a5 100644
--- a/tests/baselines/reference/destructuringParameterProperties5.js
+++ b/tests/baselines/reference/destructuringParameterProperties5.js
@@ -16,7 +16,6 @@ var [a_x1, a_x2, a_x3, a_y, a_z] = [a.x1, a.x2, a.x3, a.y, a.z];
 var C1 = (function () {
     function C1(_a) {
         var _b = _a[0], x1 = _b.x1, x2 = _b.x2, x3 = _b.x3, y = _a[1], z = _a[2];
-        this.[{ x1, x2, x3 }, y, z] = [{ x1, x2, x3 }, y, z];
         var foo = x1 || x2 || x3 || y || z;
         var bar = this.x1 || this.x2 || this.x3 || this.y || this.z;
     }
diff --git a/tests/baselines/reference/disallowAsyncModifierInES5.errors.txt b/tests/baselines/reference/disallowAsyncModifierInES5.errors.txt
deleted file mode 100644
index eb3cc8218d1..00000000000
--- a/tests/baselines/reference/disallowAsyncModifierInES5.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS2318: Cannot find global type 'Promise'.
-tests/cases/compiler/disallowAsyncModifierInES5.ts(2,1): error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
-tests/cases/compiler/disallowAsyncModifierInES5.ts(2,16): error TS1057: An async function or method must have a valid awaitable return type.
-tests/cases/compiler/disallowAsyncModifierInES5.ts(3,11): error TS1057: An async function or method must have a valid awaitable return type.
-tests/cases/compiler/disallowAsyncModifierInES5.ts(3,11): error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
-tests/cases/compiler/disallowAsyncModifierInES5.ts(4,11): error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
-tests/cases/compiler/disallowAsyncModifierInES5.ts(4,11): error TS1057: An async function or method must have a valid awaitable return type.
-
-
-!!! error TS2318: Cannot find global type 'Promise'.
-==== tests/cases/compiler/disallowAsyncModifierInES5.ts (6 errors) ====
-    
-    async function foo() { return 42; } // ERROR: Async functions are only available in ES6+
-    ~~~~~
-!!! error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
-                   ~~~
-!!! error TS1057: An async function or method must have a valid awaitable return type.
-    let bar = async function () { return 42; } // OK, but should be an error
-              ~~~~~
-!!! error TS1057: An async function or method must have a valid awaitable return type.
-              ~~~~~
-!!! error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
-    let baz = async () => 42; // OK, but should be an error
-              ~~~~~
-!!! error TS1311: Async functions are only available when targeting ECMAScript 2015 or higher.
-              ~~~~~~~~~~~~~~
-!!! error TS1057: An async function or method must have a valid awaitable return type.
\ No newline at end of file
diff --git a/tests/baselines/reference/disallowAsyncModifierInES5.js b/tests/baselines/reference/disallowAsyncModifierInES5.js
deleted file mode 100644
index 8216e5fd0e6..00000000000
--- a/tests/baselines/reference/disallowAsyncModifierInES5.js
+++ /dev/null
@@ -1,22 +0,0 @@
-//// [disallowAsyncModifierInES5.ts]
-
-async function foo() { return 42; } // ERROR: Async functions are only available in ES6+
-let bar = async function () { return 42; } // OK, but should be an error
-let baz = async () => 42; // OK, but should be an error
-
-//// [disallowAsyncModifierInES5.js]
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments)).next());
-    });
-};
-function foo() {
-    return __awaiter(this, void 0, void 0, function* () { return 42; });
-} // ERROR: Async functions are only available in ES6+
-var bar = function () {
-    return __awaiter(this, void 0, void 0, function* () { return 42; });
-}; // OK, but should be an error
-var baz = function () __awaiter(this, void 0, void 0, function* () { return 42; }); // OK, but should be an error
diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
index b6a4eb9783e..1044146ccd0 100644
--- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
+++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
@@ -107,30 +107,16 @@ var f7 = function (x, y, z) {
 var f8 = function (x, y, z) {
     if (z === void 0) { z = 10; }
 };
-var f9 = function (a) {
-    return a;
-};
-var f10 = function (a) {
-    return a;
-};
-var f11 = function (a) {
-    return a;
-};
-var f12 = function (a) {
-    return a;
-};
+var f9 = function (a) { return a; };
+var f10 = function (a) { return a; };
+var f11 = function (a) { return a; };
+var f12 = function (a) { return a; };
 // Should be valid.
-var f11 = function (a) {
-    return a;
-};
+var f11 = function (a) { return a; };
 // Should be valid.
-var f12 = function (a) {
-    return a;
-};
+var f12 = function (a) { return a; };
 // Should be valid.
-var f13 = function (a) {
-    return a;
-};
+var f13 = function (a) { return a; };
 // Should be valid.
 var f14 = function () { };
 // Should be valid.
@@ -141,30 +127,20 @@ var f16 = function (a, b) {
     return a + b;
 };
 function foo(func) { }
-foo(function () {
-    return true;
-});
+foo(function () { return true; });
 foo(function () { return false; });
 var m;
 (function (m) {
     var City = (function () {
         function City(x, thing) {
-            if (thing === void 0) { thing = function () {
-                return 100;
-            }; }
-            this.m = function () {
-                return 2 * 2 * 2;
-            };
+            if (thing === void 0) { thing = function () { return 100; }; }
+            this.m = function () { return 2 * 2 * 2; };
         }
         return City;
     }());
     (function (Enum) {
-        Enum[Enum["claw"] = (function () {
-            return 10;
-        })()] = "claw";
+        Enum[Enum["claw"] = (function () { return 10; })()] = "claw";
     })(m.Enum || (m.Enum = {}));
     var Enum = m.Enum;
-    m.v = function (x) {
-        return new City(Enum.claw);
-    };
+    m.v = function (x) { return new City(Enum.claw); };
 })(m || (m = {}));
diff --git a/tests/baselines/reference/dottedNamesInSystem.js b/tests/baselines/reference/dottedNamesInSystem.js
index 4f1814f393d..c4bb44f03cf 100644
--- a/tests/baselines/reference/dottedNamesInSystem.js
+++ b/tests/baselines/reference/dottedNamesInSystem.js
@@ -8,17 +8,17 @@ export function bar() {
 }
 
 //// [dottedNamesInSystem.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var A;
     function bar() {
         return A.B.C.foo();
     }
+    var A;
     exports_1("bar", bar);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             (function (A) {
                 var B;
                 (function (B) {
@@ -31,5 +31,5 @@ System.register([], function(exports_1, context_1) {
             })(A = A || (A = {}));
             exports_1("A", A);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/downlevelLetConst18.js b/tests/baselines/reference/downlevelLetConst18.js
index cc11c1eef3a..7dcd563f759 100644
--- a/tests/baselines/reference/downlevelLetConst18.js
+++ b/tests/baselines/reference/downlevelLetConst18.js
@@ -33,45 +33,45 @@ for (let x; ;) {
 
 //// [downlevelLetConst18.js]
 'use strict';
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     function foo() { x; }
     ;
 };
 for (var x = void 0;;) {
     _loop_1(x);
 }
-var _loop_2 = function(x) {
+var _loop_2 = function (x) {
     function foo1() { x; }
     ;
 };
 for (var x = void 0;;) {
     _loop_2(x);
 }
-var _loop_3 = function(x) {
+var _loop_3 = function (x) {
     (function () { x; })();
 };
 for (var x = void 0;;) {
     _loop_3(x);
 }
-var _loop_4 = function(x) {
+var _loop_4 = function (x) {
     (function () { x; })();
 };
 for (var x = 1;;) {
     _loop_4(x);
 }
-var _loop_5 = function(x) {
+var _loop_5 = function (x) {
     ({ foo: function () { x; } });
 };
 for (var x = void 0;;) {
     _loop_5(x);
 }
-var _loop_6 = function(x) {
+var _loop_6 = function (x) {
     ({ get foo() { return x; } });
 };
 for (var x = void 0;;) {
     _loop_6(x);
 }
-var _loop_7 = function(x) {
+var _loop_7 = function (x) {
     ({ set foo(v) { x; } });
 };
 for (var x = void 0;;) {
diff --git a/tests/baselines/reference/duplicateAnonymousInners1.js b/tests/baselines/reference/duplicateAnonymousInners1.js
index 5bb73bf68ed..24f79566d56 100644
--- a/tests/baselines/reference/duplicateAnonymousInners1.js
+++ b/tests/baselines/reference/duplicateAnonymousInners1.js
@@ -49,4 +49,6 @@ var Foo;
         }
         return Helper;
     }());
+    // Inner should not show up in intellisense
+    // Outer should show up in intellisense
 })(Foo || (Foo = {}));
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
index 21733e2cebf..eae9e9e4de1 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
@@ -73,8 +73,8 @@ var M;
         function f() {
         }
         return f;
-    }());
-    M.f = f; // error
+    }()); // error
+    M.f = f;
 })(M || (M = {}));
 var M;
 (function (M) {
@@ -86,8 +86,8 @@ var M;
         function g() {
         }
         return g;
-    }());
-    M.g = g; // no error
+    }()); // no error
+    M.g = g;
 })(M || (M = {}));
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index d37d1efb3bb..bb04e3c72a4 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -92,8 +92,8 @@ define(["require", "exports"], function (require, exports) {
         (function (F) {
             var t;
         })(F || (F = {}));
-        function F() { }
-        M.F = F; // Only one error for duplicate identifier (don't consider visibility)
+        function F() { } // Only one error for duplicate identifier (don't consider visibility)
+        M.F = F;
     })(M || (M = {}));
     var M;
     (function (M) {
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index 573c86425dc..94fa1f7e852 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -23,8 +23,8 @@ exports.main = 10;
 exports.main = 10;
 //// [elidingImportNames_test.js]
 "use strict";
-var a = require('./elidingImportNames_main'); // alias used in typeof
+var a = require("./elidingImportNames_main"); // alias used in typeof
 var b = a;
 var x;
-var a2 = require('./elidingImportNames_main1'); // alias not used in typeof
+var a2 = require("./elidingImportNames_main1"); // alias not used in typeof
 var b2 = a2;
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js
index 6641e28b867..8434d0a5251 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js
@@ -41,9 +41,9 @@ var b = function () {
     };
 };
 function baz() {
-    (() => {
+    () => {
         var arg = arguments[0];
-    });
+    };
 }
 function foo(inputFunc) { }
 foo(() => {
@@ -52,8 +52,8 @@ foo(() => {
 function bar() {
     var arg = arguments[0]; // no error
 }
-(() => {
+() => {
     function foo() {
         var arg = arguments[0]; // no error
     }
-});
+};
diff --git a/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.js b/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.js
index f999cfe70f0..890b9d4c9b8 100644
--- a/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.js
+++ b/tests/baselines/reference/emitCapturingThisInTupleDestructuring2.js
@@ -17,7 +17,7 @@ var B = (function () {
     }
     B.prototype.method = function () {
         var _this = this;
-        (function () { return (_this.test = array1[0], _this.test1 = array1[1], _this.test2 = array1[2], array1); }); // even though there is a compiler error, we should still emit lexical capture for "this" 
+        (function () { return _this.test = array1[0], _this.test1 = array1[1], _this.test2 = array1[2], array1; }); // even though there is a compiler error, we should still emit lexical capture for "this" 
     };
     return B;
 }());
diff --git a/tests/baselines/reference/emitClassDeclarationOverloadInES6.js b/tests/baselines/reference/emitClassDeclarationOverloadInES6.js
index 4cf96778f3f..e4bc2768fc0 100644
--- a/tests/baselines/reference/emitClassDeclarationOverloadInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationOverloadInES6.js
@@ -16,6 +16,5 @@ class C {
     }
 }
 class D {
-    constructor(x, z = "hello") {
-    }
+    constructor(x, z = "hello") { }
 }
diff --git a/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.js b/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.js
index cd217af6a81..62b540776d1 100644
--- a/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.js
@@ -12,8 +12,7 @@ class D extends B<number> {
 
 //// [emitClassDeclarationWithExtensionAndTypeArgumentInES6.js]
 class B {
-    constructor(a) {
-    }
+    constructor(a) { }
 }
 class C extends B {
 }
diff --git a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.js b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.js
index 8dc5b6cddaa..5cea85d0129 100644
--- a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.js
@@ -24,9 +24,7 @@ class B<T> {
 
 //// [emitClassDeclarationWithTypeArgumentAndOverloadInES6.js]
 class B {
-    constructor(a) {
-        this.B = a;
-    }
+    constructor(a) { this.B = a; }
     foo() {
         return this.x;
     }
diff --git a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.js b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.js
index 4e2872b4f06..b53e291f0e5 100644
--- a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.js
@@ -16,9 +16,7 @@ class B<T> {
 
 //// [emitClassDeclarationWithTypeArgumentInES6.js]
 class B {
-    constructor(a) {
-        this.B = a;
-    }
+    constructor(a) { this.B = a; }
     foo() {
         return this.x;
     }
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS1.js b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS1.js
index 3b9db4c6998..d94104a1c4b 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS1.js
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS1.js
@@ -19,14 +19,14 @@ array3[j0++] **= array3[j1++] **= array3[j0++] **= 1;
 //// [emitCompoundExponentiationAssignmentWithIndexingOnLHS1.js]
 var array0 = [1, 2, 3];
 var i0 = 0;
-(_a = array0, _i = ++i0, _a[_i] = Math.pow(_a[_i], 2));
+(_a = array0)[_b = ++i0] = Math.pow(_a[_b], 2);
 var array1 = [1, 2, 3];
 var i1 = 0;
-(_b = array1, _c = ++i1, _b[_c] = Math.pow(_b[_c], (_d = array1, _e = ++i1, _d[_e] = Math.pow(_d[_e], 2))));
+(_c = array1)[_d = ++i1] = Math.pow(_c[_d], (_e = array1)[_f = ++i1] = Math.pow(_e[_f], 2));
 var array2 = [1, 2, 3];
 var i2 = 0;
-(_f = array2, _g = ++i2, _f[_g] = Math.pow(_f[_g], Math.pow(array2[++i2], 2)));
+(_g = array2)[_h = ++i2] = Math.pow(_g[_h], Math.pow(array2[++i2], 2));
 var array3 = [2, 2, 3];
 var j0 = 0, j1 = 1;
-(_h = array3, _j = j0++, _h[_j] = Math.pow(_h[_j], (_k = array3, _l = j1++, _k[_l] = Math.pow(_k[_l], (_m = array3, _o = j0++, _m[_o] = Math.pow(_m[_o], 1))))));
-var _a, _i, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+(_j = array3)[_k = j0++] = Math.pow(_j[_k], (_l = array3)[_m = j1++] = Math.pow(_l[_m], (_o = array3)[_p = j0++] = Math.pow(_o[_p], 1)));
+var _a, _b, _e, _f, _c, _d, _g, _h, _o, _p, _l, _m, _j, _k;
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.js b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.js
index 83e0b2473e8..54ef77b0467 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.js
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.js
@@ -17,10 +17,10 @@ function foo() {
     globalCounter += 1;
     return { 0: 2 };
 }
-(_a = foo(), _a[0] = Math.pow(_a[0], foo()[0]));
-var result_foo1 = (_b = foo(), _b[0] = Math.pow(_b[0], foo()[0]));
-(_c = foo(), _c[0] = Math.pow(_c[0], (_d = foo(), _d[0] = Math.pow(_d[0], 2))));
-var result_foo2 = (_e = foo(), _e[0] = Math.pow(_e[0], (_f = foo(), _f[0] = Math.pow(_f[0], 2))));
-(_g = foo(), _g[0] = Math.pow(_g[0], Math.pow(foo()[0], 2)));
-var result_foo3 = (_h = foo(), _h[0] = Math.pow(_h[0], Math.pow(foo()[0], 2)));
-var _a, _b, _c, _d, _e, _f, _g, _h;
+(_a = foo())[_b = 0] = Math.pow(_a[_b], foo()[0]);
+var result_foo1 = (_c = foo())[_d = 0] = Math.pow(_c[_d], foo()[0]);
+(_e = foo())[_f = 0] = Math.pow(_e[_f], (_g = foo())[_h = 0] = Math.pow(_g[_h], 2));
+var result_foo2 = (_j = foo())[_k = 0] = Math.pow(_j[_k], (_l = foo())[_m = 0] = Math.pow(_l[_m], 2));
+(_o = foo())[_p = 0] = Math.pow(_o[_p], Math.pow(foo()[0], 2));
+var result_foo3 = (_q = foo())[_r = 0] = Math.pow(_q[_r], Math.pow(foo()[0], 2));
+var _a, _b, _c, _d, _g, _h, _e, _f, _l, _m, _j, _k, _o, _p, _q, _r;
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.js b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.js
index 797ccccc331..66b9a7018fc 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.js
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.js
@@ -23,7 +23,7 @@ var object = {
         this._0 = x;
     },
 };
-(_a = object, _a[0] = Math.pow(_a[0], object[0]));
-(_b = object, _b[0] = Math.pow(_b[0], (_c = object, _c[0] = Math.pow(_c[0], 2))));
-(_d = object, _d[0] = Math.pow(_d[0], Math.pow(object[0], 2)));
-var _a, _b, _c, _d;
+(_a = object)[_b = 0] = Math.pow(_a[_b], object[0]);
+(_c = object)[_d = 0] = Math.pow(_c[_d], (_e = object)[_f = 0] = Math.pow(_e[_f], 2));
+(_g = object)[_h = 0] = Math.pow(_g[_h], Math.pow(object[0], 2));
+var _a, _b, _e, _f, _c, _d, _g, _h;
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS4.js b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS4.js
index f61693f192c..d16e20c4cac 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS4.js
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS4.js
@@ -23,7 +23,7 @@ function incrementIdx(max) {
     return idx;
 }
 var array1 = [1, 2, 3, 4, 5];
-(_a = array1, _i = incrementIdx(array1.length), _a[_i] = Math.pow(_a[_i], 3));
-(_b = array1, _c = incrementIdx(array1.length), _b[_c] = Math.pow(_b[_c], (_d = array1, _e = incrementIdx(array1.length), _d[_e] = Math.pow(_d[_e], 2))));
-(_f = array1, _g = incrementIdx(array1.length), _f[_g] = Math.pow(_f[_g], Math.pow(array1[incrementIdx(array1.length)], 2)));
-var _a, _i, _b, _c, _d, _e, _f, _g;
+(_a = array1)[_b = incrementIdx(array1.length)] = Math.pow(_a[_b], 3);
+(_c = array1)[_d = incrementIdx(array1.length)] = Math.pow(_c[_d], (_e = array1)[_f = incrementIdx(array1.length)] = Math.pow(_e[_f], 2));
+(_g = array1)[_h = incrementIdx(array1.length)] = Math.pow(_g[_h], Math.pow(array1[incrementIdx(array1.length)], 2));
+var _a, _b, _e, _f, _c, _d, _g, _h;
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1.js b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1.js
index 99204e6362c..c6244161b19 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1.js
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1.js
@@ -18,10 +18,10 @@ function foo() {
     globalCounter += 1;
     return { prop: 2 };
 }
-(_a = foo(), _a.prop = Math.pow(_a.prop, 2));
-var result0 = (_b = foo(), _b.prop = Math.pow(_b.prop, 2));
-(_c = foo(), _c.prop = Math.pow(_c.prop, (_d = foo(), _d.prop = Math.pow(_d.prop, 2))));
-var result1 = (_e = foo(), _e.prop = Math.pow(_e.prop, (_f = foo(), _f.prop = Math.pow(_f.prop, 2))));
-(_g = foo(), _g.prop = Math.pow(_g.prop, Math.pow(foo().prop, 2)));
-var result2 = (_h = foo(), _h.prop = Math.pow(_h.prop, Math.pow(foo().prop, 2)));
-var _a, _b, _c, _d, _e, _f, _g, _h;
+(_a = foo()).prop = Math.pow(_a.prop, 2);
+var result0 = (_b = foo()).prop = Math.pow(_b.prop, 2);
+(_c = foo()).prop = Math.pow(_c.prop, (_d = foo()).prop = Math.pow(_d.prop, 2));
+var result1 = (_e = foo()).prop = Math.pow(_e.prop, (_f = foo()).prop = Math.pow(_f.prop, 2));
+(_g = foo()).prop = Math.pow(_g.prop, Math.pow(foo().prop, 2));
+var result2 = (_h = foo()).prop = Math.pow(_h.prop, Math.pow(foo().prop, 2));
+var _a, _b, _d, _c, _f, _e, _g, _h;
diff --git a/tests/baselines/reference/emitDecoratorMetadata_restArgs.js b/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
index 6ca7e40d413..ec8240b2642 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
+++ b/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
@@ -41,18 +41,18 @@ var A = (function () {
             args[_i - 0] = arguments[_i];
         }
     };
-    __decorate([
-        MyMethodDecorator, 
-        __metadata('design:type', Function), 
-        __metadata('design:paramtypes', [Object]), 
-        __metadata('design:returntype', void 0)
-    ], A.prototype, "method", null);
-    A = __decorate([
-        MyClassDecorator, 
-        __metadata('design:paramtypes', [Object])
-    ], A);
     return A;
 }());
+__decorate([
+    MyMethodDecorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], A.prototype, "method", null);
+A = __decorate([
+    MyClassDecorator,
+    __metadata("design:paramtypes", [Object])
+], A);
 var B = (function () {
     function B() {
         var args = [];
@@ -66,15 +66,15 @@ var B = (function () {
             args[_i - 0] = arguments[_i];
         }
     };
-    __decorate([
-        MyMethodDecorator, 
-        __metadata('design:type', Function), 
-        __metadata('design:paramtypes', [String]), 
-        __metadata('design:returntype', void 0)
-    ], B.prototype, "method", null);
-    B = __decorate([
-        MyClassDecorator, 
-        __metadata('design:paramtypes', [Number])
-    ], B);
     return B;
 }());
+__decorate([
+    MyMethodDecorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], B.prototype, "method", null);
+B = __decorate([
+    MyClassDecorator,
+    __metadata("design:paramtypes", [Number])
+], B);
diff --git a/tests/baselines/reference/emitDefaultParametersMethodES6.js b/tests/baselines/reference/emitDefaultParametersMethodES6.js
index 2b97e3e1632..bd7fcd16a7d 100644
--- a/tests/baselines/reference/emitDefaultParametersMethodES6.js
+++ b/tests/baselines/reference/emitDefaultParametersMethodES6.js
@@ -18,18 +18,15 @@ class E {
 
 //// [emitDefaultParametersMethodES6.js]
 class C {
-    constructor(t, z, x, y = "hello") {
-    }
+    constructor(t, z, x, y = "hello") { }
     foo(x, t = false) { }
     foo1(x, t = false, ...rest) { }
     bar(t = false) { }
     boo(t = false, ...rest) { }
 }
 class D {
-    constructor(y = "hello") {
-    }
+    constructor(y = "hello") { }
 }
 class E {
-    constructor(y = "hello", ...rest) {
-    }
+    constructor(y = "hello", ...rest) { }
 }
diff --git a/tests/baselines/reference/emitExponentiationOperator4.js b/tests/baselines/reference/emitExponentiationOperator4.js
index 7bed614b664..3ba8aae44e4 100644
--- a/tests/baselines/reference/emitExponentiationOperator4.js
+++ b/tests/baselines/reference/emitExponentiationOperator4.js
@@ -40,14 +40,14 @@ var temp: any;
 //// [emitExponentiationOperator4.js]
 var temp;
 Math.pow(temp, 3);
-Math.pow((--temp), 3);
-Math.pow((++temp), 3);
-Math.pow((temp--), 3);
-Math.pow((temp++), 3);
-Math.pow(1, Math.pow((--temp), 3));
-Math.pow(1, Math.pow((++temp), 3));
-Math.pow(1, Math.pow((temp--), 3));
-Math.pow(1, Math.pow((temp++), 3));
+Math.pow(--temp, 3);
+Math.pow(++temp, 3);
+Math.pow(temp--, 3);
+Math.pow(temp++, 3);
+Math.pow(1, Math.pow(--temp, 3));
+Math.pow(1, Math.pow(++temp, 3));
+Math.pow(1, Math.pow(temp--, 3));
+Math.pow(1, Math.pow(temp++, 3));
 Math.pow((void --temp), 3);
 Math.pow((void temp--), 3);
 Math.pow((void 3), 4);
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.js b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.js
index 433cd764726..c3c589e6a61 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.js
+++ b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.js
@@ -32,22 +32,22 @@ var t1 = 10;
 var t2 = 10;
 var s;
 // With TemplateTail
-(Math.pow(t1, -t2)) + " world";
-(Math.pow((-t1), t2) - t1) + " world";
-(Math.pow((-++t1), t2) - t1) + " world";
-(Math.pow((-t1++), t2) - t1) + " world";
-(Math.pow((~t1), Math.pow(t2, --t1))) + " world";
+Math.pow(t1, -t2) + " world";
+Math.pow((-t1), t2) - t1 + " world";
+Math.pow((-++t1), t2) - t1 + " world";
+Math.pow((-t1++), t2) - t1 + " world";
+Math.pow((~t1), Math.pow(t2, --t1)) + " world";
 typeof (Math.pow(t1, Math.pow(t2, t1))) + " world";
 // TempateHead & TemplateTail are empt
-(Math.pow(t1, -t2)) + " hello world " + (Math.pow(t1, -t2));
-(Math.pow((-t1), t2) - t1) + " hello world " + (Math.pow((-t1), t2) - t1);
-(Math.pow((-++t1), t2) - t1) + " hello world " + (Math.pow(t1, Math.pow((-++t1), -t1)));
-(Math.pow((-t1++), t2) - t1) + " hello world " + (Math.pow(t2, Math.pow((-t1++), -t1)));
-(Math.pow((~t1), Math.pow(t2, --t1))) + " hello world " + (Math.pow((~t1), Math.pow(t2, --t1)));
+Math.pow(t1, -t2) + " hello world " + Math.pow(t1, -t2);
+Math.pow((-t1), t2) - t1 + " hello world " + (Math.pow((-t1), t2) - t1);
+Math.pow((-++t1), t2) - t1 + " hello world " + Math.pow(t1, Math.pow((-++t1), -t1));
+Math.pow((-t1++), t2) - t1 + " hello world " + Math.pow(t2, Math.pow((-t1++), -t1));
+Math.pow((~t1), Math.pow(t2, --t1)) + " hello world " + Math.pow((~t1), Math.pow(t2, --t1));
 typeof (Math.pow(t1, Math.pow(t2, t1))) + " hello world " + typeof (Math.pow(t1, Math.pow(t2, t1)));
 // With templateHead
 "hello " + (Math.pow((-t1), t2) - t1);
 "hello " + (Math.pow((-++t1), t2) - t1);
 "hello " + (Math.pow((-t1++), t2) - t1);
-"hello " + (Math.pow((~t1), Math.pow(t2, --t1)));
+"hello " + Math.pow((~t1), Math.pow(t2, --t1));
 "hello " + typeof (Math.pow(t1, Math.pow(t2, t1)));
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.js b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.js
index eb879cce6a5..cd9ac32bbd2 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.js
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.js
@@ -32,22 +32,22 @@ var t1 = 10;
 var t2 = 10;
 var s;
 // TempateHead & TemplateTail are empty
-"" + (Math.pow(t1, t2));
-"" + (Math.pow(t1, Math.pow(t2, t1)));
+"" + Math.pow(t1, t2);
+"" + Math.pow(t1, Math.pow(t2, t1));
 "" + (t1 + Math.pow(t2, t1));
 "" + (Math.pow(t1, t2) + t1);
 "" + (t1 + Math.pow(t2, t2) + t1);
 "" + typeof (Math.pow(t1, Math.pow(t2, t1)));
 "" + (1 + typeof (Math.pow(t1, Math.pow(t2, t1))));
-"" + (Math.pow(t1, t2)) + (Math.pow(t1, t2));
-"" + (Math.pow(t1, Math.pow(t2, t1))) + (Math.pow(t1, Math.pow(t2, t1)));
+"" + Math.pow(t1, t2) + Math.pow(t1, t2);
+"" + Math.pow(t1, Math.pow(t2, t1)) + Math.pow(t1, Math.pow(t2, t1));
 "" + (t1 + Math.pow(t2, t1)) + (t1 + Math.pow(t2, t1));
 "" + (Math.pow(t1, t2) + t1) + (Math.pow(t1, t2) + t1);
 "" + (t1 + Math.pow(t2, t2) + t1) + (t1 + Math.pow(t2, t2) + t1);
 "" + typeof (Math.pow(t1, Math.pow(t2, t1))) + typeof (Math.pow(t1, Math.pow(t2, t1)));
-(Math.pow(t1, t2)) + " hello world " + (Math.pow(t1, t2));
-(Math.pow(t1, Math.pow(t2, t1))) + " hello world " + (Math.pow(t1, Math.pow(t2, t1)));
-(t1 + Math.pow(t2, t1)) + " hello world " + (t1 + Math.pow(t2, t1));
-(Math.pow(t1, t2) + t1) + " hello world " + (Math.pow(t1, t2) + t1);
-(t1 + Math.pow(t2, t2) + t1) + " hello world " + (t1 + Math.pow(t2, t2) + t1);
+Math.pow(t1, t2) + " hello world " + Math.pow(t1, t2);
+Math.pow(t1, Math.pow(t2, t1)) + " hello world " + Math.pow(t1, Math.pow(t2, t1));
+t1 + Math.pow(t2, t1) + " hello world " + (t1 + Math.pow(t2, t1));
+Math.pow(t1, t2) + t1 + " hello world " + (Math.pow(t1, t2) + t1);
+t1 + Math.pow(t2, t2) + t1 + " hello world " + (t1 + Math.pow(t2, t2) + t1);
 typeof (Math.pow(t1, Math.pow(t2, t1))) + " hello world " + typeof (Math.pow(t1, Math.pow(t2, t1)));
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.js b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.js
index 73384762706..cd73e04327f 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.js
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.js
@@ -32,21 +32,21 @@ var t1 = 10;
 var t2 = 10;
 var s;
 // With templateHead
-"hello " + (Math.pow(t1, t2));
-"hello " + (Math.pow(t1, Math.pow(t2, t1)));
+"hello " + Math.pow(t1, t2);
+"hello " + Math.pow(t1, Math.pow(t2, t1));
 "hello " + (t1 + Math.pow(t2, t1));
 "hello " + (Math.pow(t1, t2) + t1);
 "hello " + (t1 + Math.pow(t2, t2) + t1);
 "hello " + typeof (Math.pow(t1, Math.pow(t2, t1)));
 "hello " + (1 + typeof (Math.pow(t1, Math.pow(t2, t1))));
-"hello " + (Math.pow(t1, t2)) + (Math.pow(t1, t2));
-"hello " + (Math.pow(t1, Math.pow(t2, t1))) + (Math.pow(t1, Math.pow(t2, t1)));
+"hello " + Math.pow(t1, t2) + Math.pow(t1, t2);
+"hello " + Math.pow(t1, Math.pow(t2, t1)) + Math.pow(t1, Math.pow(t2, t1));
 "hello " + (t1 + Math.pow(t2, t1)) + (t1 + Math.pow(t2, t1));
 "hello " + (Math.pow(t1, t2) + t1) + (Math.pow(t1, t2) + t1);
 "hello " + (t1 + Math.pow(t2, t2) + t1) + (t1 + Math.pow(t2, t2) + t1);
 "hello " + typeof (Math.pow(t1, Math.pow(t2, t1))) + typeof (Math.pow(t1, Math.pow(t2, t1)));
-"hello " + (Math.pow(t1, t2)) + " hello world " + (Math.pow(t1, t2));
-"hello " + (Math.pow(t1, Math.pow(t2, t1))) + " hello world " + (Math.pow(t1, Math.pow(t2, t1)));
+"hello " + Math.pow(t1, t2) + " hello world " + Math.pow(t1, t2);
+"hello " + Math.pow(t1, Math.pow(t2, t1)) + " hello world " + Math.pow(t1, Math.pow(t2, t1));
 "hello " + (t1 + Math.pow(t2, t1)) + " hello world " + (t1 + Math.pow(t2, t1));
 "hello " + (Math.pow(t1, t2) + t1) + " hello world " + (Math.pow(t1, t2) + t1);
 "hello " + (t1 + Math.pow(t2, t2) + t1) + " hello world " + (t1 + Math.pow(t2, t2) + t1);
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.js b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.js
index 9c3b937d94b..966464b8220 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.js
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.js
@@ -33,22 +33,22 @@ var t1 = 10;
 var t2 = 10;
 var s;
 // With TemplateTail
-(Math.pow(t1, t2)) + " world";
-(Math.pow(t1, Math.pow(t2, t1))) + " world";
-(t1 + Math.pow(t2, t1)) + " world";
-(Math.pow(t1, t2) + t1) + " world";
-(t1 + Math.pow(t2, t2) + t1) + " world";
+Math.pow(t1, t2) + " world";
+Math.pow(t1, Math.pow(t2, t1)) + " world";
+t1 + Math.pow(t2, t1) + " world";
+Math.pow(t1, t2) + t1 + " world";
+t1 + Math.pow(t2, t2) + t1 + " world";
 typeof (Math.pow(t1, Math.pow(t2, t1))) + " world";
-(1 + typeof (Math.pow(t1, Math.pow(t2, t1)))) + " world";
-"" + (Math.pow(t1, t2)) + (Math.pow(t1, t2)) + " world";
-"" + (Math.pow(t1, Math.pow(t2, t1))) + (Math.pow(t1, Math.pow(t2, t1))) + " world";
+1 + typeof (Math.pow(t1, Math.pow(t2, t1))) + " world";
+"" + Math.pow(t1, t2) + Math.pow(t1, t2) + " world";
+"" + Math.pow(t1, Math.pow(t2, t1)) + Math.pow(t1, Math.pow(t2, t1)) + " world";
 "" + (t1 + Math.pow(t2, t1)) + (t1 + Math.pow(t2, t1)) + " world";
 "" + (Math.pow(t1, t2) + t1) + (Math.pow(t1, t2) + t1) + " world";
 "" + (t1 + Math.pow(t2, t2) + t1) + (t1 + Math.pow(t2, t2) + t1) + " world";
 "" + typeof (Math.pow(t1, Math.pow(t2, t1))) + typeof (Math.pow(t1, Math.pow(t2, t1))) + " world";
-(Math.pow(t1, t2)) + " hello world " + (Math.pow(t1, t2)) + " !!";
-(Math.pow(t1, Math.pow(t2, t1))) + " hello world " + (Math.pow(t1, Math.pow(t2, t1))) + " !!";
-(t1 + Math.pow(t2, t1)) + " hello world " + (t1 + Math.pow(t2, t1)) + " !!";
-(Math.pow(t1, t2) + t1) + " hello world " + (Math.pow(t1, t2) + t1) + " !!";
-(t1 + Math.pow(t2, t2) + t1) + " hello world " + (t1 + Math.pow(t2, t2) + t1) + " !!";
+Math.pow(t1, t2) + " hello world " + Math.pow(t1, t2) + " !!";
+Math.pow(t1, Math.pow(t2, t1)) + " hello world " + Math.pow(t1, Math.pow(t2, t1)) + " !!";
+t1 + Math.pow(t2, t1) + " hello world " + (t1 + Math.pow(t2, t1)) + " !!";
+Math.pow(t1, t2) + t1 + " hello world " + (Math.pow(t1, t2) + t1) + " !!";
+t1 + Math.pow(t2, t2) + t1 + " hello world " + (t1 + Math.pow(t2, t2) + t1) + " !!";
 typeof (Math.pow(t1, Math.pow(t2, t1))) + " hello world " + typeof (Math.pow(t1, Math.pow(t2, t1))) + " !!";
diff --git a/tests/baselines/reference/emitRestParametersMethodES6.js b/tests/baselines/reference/emitRestParametersMethodES6.js
index 930cd109b6e..b7c98ac9d19 100644
--- a/tests/baselines/reference/emitRestParametersMethodES6.js
+++ b/tests/baselines/reference/emitRestParametersMethodES6.js
@@ -16,14 +16,12 @@ class D {
 
 //// [emitRestParametersMethodES6.js]
 class C {
-    constructor(name, ...rest) {
-    }
+    constructor(name, ...rest) { }
     bar(...rest) { }
     foo(x, ...rest) { }
 }
 class D {
-    constructor(...rest) {
-    }
+    constructor(...rest) { }
     bar(...rest) { }
     foo(x, ...rest) { }
 }
diff --git a/tests/baselines/reference/emitThisInSuperMethodCall.js b/tests/baselines/reference/emitThisInSuperMethodCall.js
index ba648b12d86..1350ed9d4c8 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -54,8 +54,9 @@ var RegisteredUser = (function (_super) {
     };
     RegisteredUser.prototype.g = function () {
         function inner() {
+            var _this = this;
             (function () {
-                _super.sayHello.call(this);
+                _super.sayHello.call(_this);
             });
         }
     };
diff --git a/tests/baselines/reference/emptyArrayBindingPatternParameter04.js b/tests/baselines/reference/emptyArrayBindingPatternParameter04.js
index c9819c88f40..69266916935 100644
--- a/tests/baselines/reference/emptyArrayBindingPatternParameter04.js
+++ b/tests/baselines/reference/emptyArrayBindingPatternParameter04.js
@@ -6,7 +6,7 @@ function f([] = [1,2,3,4]) {
 
 //// [emptyArrayBindingPatternParameter04.js]
 function f(_a) {
-    var _a = [1, 2, 3, 4];
+    _a = [1, 2, 3, 4];
     var x, y, z;
 }
 
diff --git a/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js b/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js
index 27a0b5f9b61..370e019104f 100644
--- a/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js
+++ b/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js
@@ -9,8 +9,8 @@ let x, y, z, a1, a2, a3;
 //// [emptyAssignmentPatterns02_ES5.js]
 var a;
 var x, y, z, a1, a2, a3;
-((x = a.x, y = a.y, z = a.z, a));
-((a1 = a[0], a2 = a[1], a3 = a[2], a));
+(x = a.x, y = a.y, z = a.z, a);
+(a1 = a[0], a2 = a[1], a3 = a[2], a);
 
 
 //// [emptyAssignmentPatterns02_ES5.d.ts]
diff --git a/tests/baselines/reference/emptyObjectBindingPatternParameter04.js b/tests/baselines/reference/emptyObjectBindingPatternParameter04.js
index 8c128bb806e..8d91e8f34c3 100644
--- a/tests/baselines/reference/emptyObjectBindingPatternParameter04.js
+++ b/tests/baselines/reference/emptyObjectBindingPatternParameter04.js
@@ -6,7 +6,7 @@ function f({} = {a: 1, b: "2", c: true}) {
 
 //// [emptyObjectBindingPatternParameter04.js]
 function f(_a) {
-    var _a = { a: 1, b: "2", c: true };
+    _a = { a: 1, b: "2", c: true };
     var x, y, z;
 }
 
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js
index 52207ceda96..655a9f073a2 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.js
@@ -67,12 +67,12 @@
     for (var _u = {}, _v = {}; false; void 0) {
     }
     function f(_a, _b, _c) {
-        var _a = a;
-        var _b = a;
+        _a = a;
+        _b = a;
         var _d = (_c === void 0 ? a : _c).p, _e = _d === void 0 ? a : _d;
         return function (_a, _b, _c) {
-            var _a = a;
-            var _b = a;
+            _a = a;
+            _b = a;
             var _d = (_c === void 0 ? a : _c).p, _e = _d === void 0 ? a : _d;
             return a;
         };
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.js
index 1303ab1e3d0..98661c440c6 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.js
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.js
@@ -52,31 +52,31 @@
 //// [emptyVariableDeclarationBindingPatterns01_ES6.js]
 (function () {
     var a;
-    var {  } = a;
-    let {  } = a;
-    const {  } = a;
+    var {} = a;
+    let {} = a;
+    const {} = a;
     var [] = a;
     let [] = a;
     const [] = a;
-    var {  } = a, [] = a;
-    let {  } = a, [] = a;
-    const {  } = a, [] = a;
-    var { p1: {  }, p2: [] } = a;
-    let { p1: {  }, p2: [] } = a;
-    const { p1: {  }, p2: [] } = a;
-    for (var {  } = {}, {  } = {}; false; void 0) {
+    var {} = a, [] = a;
+    let {} = a, [] = a;
+    const {} = a, [] = a;
+    var { p1: {}, p2: [] } = a;
+    let { p1: {}, p2: [] } = a;
+    const { p1: {}, p2: [] } = a;
+    for (var {} = {}, {} = {}; false; void 0) {
     }
-    function f({  } = a, [] = a, { p: {  } = a } = a) {
-        return ({  } = a, [] = a, { p: {  } = a } = a) => a;
+    function f({} = a, [] = a, { p: {} = a } = a) {
+        return ({} = a, [] = a, { p: {} = a } = a) => a;
     }
 })();
 (function () {
     const ns = [];
-    for (var {  } of ns) {
+    for (var {} of ns) {
     }
-    for (let {  } of ns) {
+    for (let {} of ns) {
     }
-    for (const {  } of ns) {
+    for (const {} of ns) {
     }
     for (var [] of ns) {
     }
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js
index 8b2df68ed70..9b78828cc49 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns02_ES6.js
@@ -12,9 +12,9 @@
 
 //// [emptyVariableDeclarationBindingPatterns02_ES6.js]
 (function () {
-    var {  };
-    let {  };
-    const {  };
+    var {};
+    let {};
+    const {};
     var [];
     let [];
     const [];
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index 5561517341d..77f0e643969 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -19,5 +19,5 @@ var Mode = exports.Mode;
 //// [enumFromExternalModule_1.js]
 "use strict";
 ///<reference path='enumFromExternalModule_0.ts'/>
-var f = require('./enumFromExternalModule_0');
+var f = require("./enumFromExternalModule_0");
 var x = f.Mode.Open;
diff --git a/tests/baselines/reference/enumIdentifierLiterals.js b/tests/baselines/reference/enumIdentifierLiterals.js
index 72a8a56570c..5f132b965f2 100644
--- a/tests/baselines/reference/enumIdentifierLiterals.js
+++ b/tests/baselines/reference/enumIdentifierLiterals.js
@@ -10,9 +10,9 @@ enum Nums {
 //// [enumIdentifierLiterals.js]
 var Nums;
 (function (Nums) {
-    Nums[Nums["1"] = 0] = "1";
-    Nums[Nums["1.1"] = 1] = "1.1";
-    Nums[Nums["1.2"] = 2] = "1.2";
+    Nums[Nums[1] = 0] = 1;
+    Nums[Nums[1.1] = 1] = 1.1;
+    Nums[Nums[1.2] = 2] = 1.2;
     Nums[Nums["13e-1"] = 3] = "13e-1";
-    Nums[Nums["61453"] = 4] = "61453";
+    Nums[Nums[61453] = 4] = 61453;
 })(Nums || (Nums = {}));
diff --git a/tests/baselines/reference/enumWithComputedMember.errors.txt b/tests/baselines/reference/enumWithComputedMember.errors.txt
new file mode 100644
index 00000000000..cdbcaf575e8
--- /dev/null
+++ b/tests/baselines/reference/enumWithComputedMember.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/enumWithComputedMember.ts(4,5): error TS1061: Enum member must have initializer.
+
+
+==== tests/cases/compiler/enumWithComputedMember.ts (1 errors) ====
+    enum A { 
+        X = "".length, 
+        Y = X,
+        Z
+        ~
+!!! error TS1061: Enum member must have initializer.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/enumWithComputedMember.js b/tests/baselines/reference/enumWithComputedMember.js
new file mode 100644
index 00000000000..ca4bfac7adb
--- /dev/null
+++ b/tests/baselines/reference/enumWithComputedMember.js
@@ -0,0 +1,15 @@
+//// [enumWithComputedMember.ts]
+enum A { 
+    X = "".length, 
+    Y = X,
+    Z
+}
+
+
+//// [enumWithComputedMember.js]
+var A;
+(function (A) {
+    A[A["X"] = "".length] = "X";
+    A[A["Y"] = A.X] = "Y";
+    A[A["Z"] = void 0] = "Z";
+})(A || (A = {}));
diff --git a/tests/baselines/reference/enumWithQuotedElementName1.js b/tests/baselines/reference/enumWithQuotedElementName1.js
index 22f6f02f1b7..8f945e07cee 100644
--- a/tests/baselines/reference/enumWithQuotedElementName1.js
+++ b/tests/baselines/reference/enumWithQuotedElementName1.js
@@ -6,5 +6,5 @@ enum E {
 //// [enumWithQuotedElementName1.js]
 var E;
 (function (E) {
-    E[E['fo"o'] = 0] = 'fo"o';
+    E[E["fo\"o"] = 0] = "fo\"o";
 })(E || (E = {}));
diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.js b/tests/baselines/reference/enumWithUnicodeEscape1.js
index df6034924ff..68116bd1c12 100644
--- a/tests/baselines/reference/enumWithUnicodeEscape1.js
+++ b/tests/baselines/reference/enumWithUnicodeEscape1.js
@@ -7,5 +7,5 @@ enum E {
 //// [enumWithUnicodeEscape1.js]
 var E;
 (function (E) {
-    E[E['gold \u2730'] = 0] = 'gold \u2730';
+    E[E["gold \u2730"] = 0] = "gold \u2730";
 })(E || (E = {}));
diff --git a/tests/baselines/reference/errorSuperCalls.js b/tests/baselines/reference/errorSuperCalls.js
index 4cc6a4d968f..3e778535bb7 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -83,9 +83,9 @@ var __extends = (this && this.__extends) || function (d, b) {
 //super call in class constructor with no base type
 var NoBase = (function () {
     function NoBase() {
+        _super.call(this);
         //super call in class member initializer with no base type
         this.p = _super.call(this);
-        _super.call(this);
     }
     //super call in class member function with no base type
     NoBase.prototype.fn = function () {
@@ -119,10 +119,10 @@ var NoBase = (function () {
         enumerable: true,
         configurable: true
     });
-    //super call in static class member initializer with no base type
-    NoBase.k = _super.call(this);
     return NoBase;
 }());
+//super call in static class member initializer with no base type
+NoBase.k = _super.call(this);
 var Base = (function () {
     function Base() {
     }
diff --git a/tests/baselines/reference/errorSuperPropertyAccess.js b/tests/baselines/reference/errorSuperPropertyAccess.js
index cf6ed2598ea..dbfbdb46940 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -175,10 +175,10 @@ var SomeBase = (function () {
     SomeBase.prototype.publicFunc = function () { };
     SomeBase.privateStaticFunc = function () { };
     SomeBase.publicStaticFunc = function () { };
-    SomeBase.privateStaticMember = 0;
-    SomeBase.publicStaticMember = 0;
     return SomeBase;
 }());
+SomeBase.privateStaticMember = 0;
+SomeBase.publicStaticMember = 0;
 //super.publicInstanceMemberNotFunction in constructor of derived class
 //super.publicInstanceMemberNotFunction in instance member function of derived class
 //super.publicInstanceMemberNotFunction in instance member accessor(get and set) of derived class
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index ac6a0bd24da..2ce6113b4fe 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -19,10 +19,10 @@ assert(Foo.CONSTANT === "Foo");
 var Foo = (function () {
     function Foo() {
     }
-    Foo.CONSTANT = "Foo";
     return Foo;
 }());
 exports.Foo = Foo;
+Foo.CONSTANT = "Foo";
 function assert(value) {
     if (!value)
         throw new Error("Assertion failed!");
diff --git a/tests/baselines/reference/es5-asyncFunction.js b/tests/baselines/reference/es5-asyncFunction.js
new file mode 100644
index 00000000000..9cb6f1d3674
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunction.js
@@ -0,0 +1,75 @@
+//// [es5-asyncFunction.ts]
+declare var x;
+
+async function empty() {
+}
+
+async function singleAwait() {
+    await x;
+}
+
+//// [es5-asyncFunction.js]
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+function empty() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
+function singleAwait() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunction.symbols b/tests/baselines/reference/es5-asyncFunction.symbols
new file mode 100644
index 00000000000..9a79e235090
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunction.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/es5-asyncFunction.ts ===
+declare var x;
+>x : Symbol(x, Decl(es5-asyncFunction.ts, 0, 11))
+
+async function empty() {
+>empty : Symbol(empty, Decl(es5-asyncFunction.ts, 0, 14))
+}
+
+async function singleAwait() {
+>singleAwait : Symbol(singleAwait, Decl(es5-asyncFunction.ts, 3, 1))
+
+    await x;
+>x : Symbol(x, Decl(es5-asyncFunction.ts, 0, 11))
+}
diff --git a/tests/baselines/reference/es5-asyncFunction.types b/tests/baselines/reference/es5-asyncFunction.types
new file mode 100644
index 00000000000..71700db7c30
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunction.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/es5-asyncFunction.ts ===
+declare var x;
+>x : any
+
+async function empty() {
+>empty : () => Promise<void>
+}
+
+async function singleAwait() {
+>singleAwait : () => Promise<void>
+
+    await x;
+>await x : any
+>x : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js
new file mode 100644
index 00000000000..c8a4733aa94
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.js
@@ -0,0 +1,150 @@
+//// [es5-asyncFunctionArrayLiterals.ts]
+declare var x, y, z, a;
+
+async function arrayLiteral0() {
+    x = [await y, z];
+}
+
+async function arrayLiteral1() {
+    x = [y, await z];
+}
+
+async function arrayLiteral2() {
+    x = [...(await y), z];
+}
+
+async function arrayLiteral3() {
+    x = [...y, await z];
+}
+
+async function arrayLiteral4() {
+    x = [await y, ...z];
+}
+
+async function arrayLiteral5() {
+    x = [y, ...(await z)];
+}
+
+async function arrayLiteral6() {
+    x = [y, await z, a];
+}
+
+async function arrayLiteral7() {
+    x = [await y, z, await a];
+}
+
+//// [es5-asyncFunctionArrayLiterals.js]
+function arrayLiteral0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, y];
+                case 1:
+                    x = [_b.sent(), z];
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    x = _a.concat([_b.sent()]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral2() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, y];
+                case 1:
+                    x = (_a.sent()).concat([z]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    _b = (_a = y).concat;
+                    return [4 /*yield*/, z];
+                case 1:
+                    x = _b.apply(_a, [[_e.sent()]]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral4() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, y];
+                case 1:
+                    x = [_b.sent()].concat(z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = [y]).concat;
+                    return [4 /*yield*/, z];
+                case 1:
+                    x = _b.apply(_a, [(_d.sent())]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    x = _a.concat([_b.sent(), a]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function arrayLiteral7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, y];
+                case 1:
+                    _a = [_b.sent(), z];
+                    return [4 /*yield*/, a];
+                case 2:
+                    x = _a.concat([_b.sent()]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionArrayLiterals.symbols b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.symbols
new file mode 100644
index 00000000000..3bdfb070d1b
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.symbols
@@ -0,0 +1,80 @@
+=== tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts ===
+declare var x, y, z, a;
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 20))
+
+async function arrayLiteral0() {
+>arrayLiteral0 : Symbol(arrayLiteral0, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 23))
+
+    x = [await y, z];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+}
+
+async function arrayLiteral1() {
+>arrayLiteral1 : Symbol(arrayLiteral1, Decl(es5-asyncFunctionArrayLiterals.ts, 4, 1))
+
+    x = [y, await z];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+}
+
+async function arrayLiteral2() {
+>arrayLiteral2 : Symbol(arrayLiteral2, Decl(es5-asyncFunctionArrayLiterals.ts, 8, 1))
+
+    x = [...(await y), z];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+}
+
+async function arrayLiteral3() {
+>arrayLiteral3 : Symbol(arrayLiteral3, Decl(es5-asyncFunctionArrayLiterals.ts, 12, 1))
+
+    x = [...y, await z];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+}
+
+async function arrayLiteral4() {
+>arrayLiteral4 : Symbol(arrayLiteral4, Decl(es5-asyncFunctionArrayLiterals.ts, 16, 1))
+
+    x = [await y, ...z];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+}
+
+async function arrayLiteral5() {
+>arrayLiteral5 : Symbol(arrayLiteral5, Decl(es5-asyncFunctionArrayLiterals.ts, 20, 1))
+
+    x = [y, ...(await z)];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+}
+
+async function arrayLiteral6() {
+>arrayLiteral6 : Symbol(arrayLiteral6, Decl(es5-asyncFunctionArrayLiterals.ts, 24, 1))
+
+    x = [y, await z, a];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 20))
+}
+
+async function arrayLiteral7() {
+>arrayLiteral7 : Symbol(arrayLiteral7, Decl(es5-asyncFunctionArrayLiterals.ts, 28, 1))
+
+    x = [await y, z, await a];
+>x : Symbol(x, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionArrayLiterals.ts, 0, 20))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionArrayLiterals.types b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.types
new file mode 100644
index 00000000000..80b4e095c9d
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionArrayLiterals.types
@@ -0,0 +1,111 @@
+=== tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts ===
+declare var x, y, z, a;
+>x : any
+>y : any
+>z : any
+>a : any
+
+async function arrayLiteral0() {
+>arrayLiteral0 : () => Promise<void>
+
+    x = [await y, z];
+>x = [await y, z] : any[]
+>x : any
+>[await y, z] : any[]
+>await y : any
+>y : any
+>z : any
+}
+
+async function arrayLiteral1() {
+>arrayLiteral1 : () => Promise<void>
+
+    x = [y, await z];
+>x = [y, await z] : any[]
+>x : any
+>[y, await z] : any[]
+>y : any
+>await z : any
+>z : any
+}
+
+async function arrayLiteral2() {
+>arrayLiteral2 : () => Promise<void>
+
+    x = [...(await y), z];
+>x = [...(await y), z] : any[]
+>x : any
+>[...(await y), z] : any[]
+>...(await y) : any
+>(await y) : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function arrayLiteral3() {
+>arrayLiteral3 : () => Promise<void>
+
+    x = [...y, await z];
+>x = [...y, await z] : any[]
+>x : any
+>[...y, await z] : any[]
+>...y : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function arrayLiteral4() {
+>arrayLiteral4 : () => Promise<void>
+
+    x = [await y, ...z];
+>x = [await y, ...z] : any[]
+>x : any
+>[await y, ...z] : any[]
+>await y : any
+>y : any
+>...z : any
+>z : any
+}
+
+async function arrayLiteral5() {
+>arrayLiteral5 : () => Promise<void>
+
+    x = [y, ...(await z)];
+>x = [y, ...(await z)] : any[]
+>x : any
+>[y, ...(await z)] : any[]
+>y : any
+>...(await z) : any
+>(await z) : any
+>await z : any
+>z : any
+}
+
+async function arrayLiteral6() {
+>arrayLiteral6 : () => Promise<void>
+
+    x = [y, await z, a];
+>x = [y, await z, a] : any[]
+>x : any
+>[y, await z, a] : any[]
+>y : any
+>await z : any
+>z : any
+>a : any
+}
+
+async function arrayLiteral7() {
+>arrayLiteral7 : () => Promise<void>
+
+    x = [await y, z, await a];
+>x = [await y, z, await a] : any[]
+>x : any
+>[await y, z, await a] : any[]
+>await y : any
+>y : any
+>z : any
+>await a : any
+>a : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.js b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.js
new file mode 100644
index 00000000000..a7aff630256
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.js
@@ -0,0 +1,561 @@
+//// [es5-asyncFunctionBinaryExpressions.ts]
+declare var x, y, z, a, b, c;
+
+async function binaryPlus0() {
+    (await x) + y;
+}
+
+async function binaryPlus1() {
+    x + await y;
+}
+
+async function binaryLogicalAnd0() {
+    (await x) && y;
+}
+
+async function binaryLogicalAnd1() {
+    x && await y;
+}
+
+async function binaryAssignment0() {
+    x = await y;
+}
+
+async function binaryAssignment1() {
+    x.a = await y;
+}
+
+async function binaryAssignment2() {
+    x.a.b = await y;
+}
+
+async function binaryAssignment3() {
+    x[z] = await y;
+}
+
+async function binaryAssignment4() {
+    x[z].b = await y;
+}
+
+async function binaryAssignment5() {
+    x.a[z] = await y;
+}
+
+async function binaryAssignment6() {
+    (await x).a = y;
+}
+
+async function binaryAssignment7() {
+    (await x.a).b = y;
+}
+
+async function binaryAssignment8() {
+    (await x)[z] = y;
+}
+
+async function binaryAssignment9() {
+    x[await z] = y;
+}
+
+async function binaryAssignment10() {
+    x[await z].b = y;
+}
+
+async function binaryAssignment11() {
+    (await x[z]).b = y;
+}
+
+async function binaryAssignment12() {
+    x.a[await z] = y;
+}
+
+async function binaryAssignment13() {
+    (await x.a)[z] = y;
+}
+
+async function binaryCompoundAssignment0() {
+    x += await y;
+}
+
+async function binaryCompoundAssignment1() {
+    x.a += await y;
+}
+
+async function binaryCompoundAssignment2() {
+    x[a] += await y;
+}
+
+async function binaryCompoundAssignment3() {
+    (await x).a += y;
+}
+
+async function binaryCompoundAssignment4() {
+    (await x)[a] += y;
+}
+
+async function binaryCompoundAssignment5() {
+    x[await a] += y;
+}
+
+async function binaryCompoundAssignment6() {
+    (await x).a += await y;
+}
+
+async function binaryCompoundAssignment7() {
+    (await x)[a] += await y;
+}
+
+async function binaryCompoundAssignment8() {
+    x[await a] += await y;
+}
+
+async function binaryExponentiation() {
+    (await x) ** y;
+    x ** await y;
+}
+
+async function binaryComma0() {
+    return (await x), y;
+}
+
+async function binaryComma1(): Promise<any> {
+    return x, await y;
+}
+
+//// [es5-asyncFunctionBinaryExpressions.js]
+function binaryPlus0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent()) + y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryPlus1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a + (_b.sent());
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryLogicalAnd0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent()) && y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryLogicalAnd1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    if (!_a)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = (_b.sent());
+                    _b.label = 2;
+                case 2:
+                    _a;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, y];
+                case 1:
+                    x = _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.a = _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x.a;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.b = _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x;
+                    _b = z;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a[_b] = _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment4() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x[z];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.b = _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x.a;
+                    _b = z;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a[_b] = _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment6() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent()).a = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment7() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.a];
+                case 1:
+                    (_a.sent()).b = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment8() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent())[z] = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment9() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, z];
+                case 1:
+                    _a[_b.sent()] = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment10() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, z];
+                case 1:
+                    _a[_b.sent()].b = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment11() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x[z]];
+                case 1:
+                    (_a.sent()).b = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment12() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x.a;
+                    return [4 /*yield*/, z];
+                case 1:
+                    _a[_b.sent()] = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryAssignment13() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.a];
+                case 1:
+                    (_a.sent())[z] = y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    x = _a + _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x;
+                    _b = _a.a;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.a = _b + _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _a = x;
+                    _b = a;
+                    _c = _a[_b];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a[_b] = _c + _d.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment3() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent()).a += y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent())[a] += y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, a];
+                case 1:
+                    _a[_b.sent()] += y;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a = (_c.sent());
+                    _b = _a.a;
+                    return [4 /*yield*/, y];
+                case 2:
+                    _a.a = _b + _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a = (_d.sent());
+                    _b = a;
+                    _c = _a[_b];
+                    return [4 /*yield*/, y];
+                case 2:
+                    _a[_b] = _c + _d.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryCompoundAssignment8() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, a];
+                case 1:
+                    _b = _d.sent();
+                    _c = _a[_b];
+                    return [4 /*yield*/, y];
+                case 2:
+                    _a[_b] = _c + _d.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryExponentiation() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _b = (_a = Math).pow;
+                    return [4 /*yield*/, x];
+                case 1:
+                    _b.apply(_a, [(_g.sent()), y]);
+                    _e = (_d = Math).pow;
+                    _f = [x];
+                    return [4 /*yield*/, y];
+                case 2:
+                    _e.apply(_d, _f.concat([_g.sent()]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function binaryComma0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1: return [2 /*return*/, ((_a.sent()), y)];
+            }
+        });
+    });
+}
+function binaryComma1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    x;
+                    return [4 /*yield*/, y];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols
new file mode 100644
index 00000000000..6c6a1820717
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols
@@ -0,0 +1,267 @@
+=== tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 26))
+
+async function binaryPlus0() {
+>binaryPlus0 : Symbol(binaryPlus0, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 29))
+
+    (await x) + y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryPlus1() {
+>binaryPlus1 : Symbol(binaryPlus1, Decl(es5-asyncFunctionBinaryExpressions.ts, 4, 1))
+
+    x + await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryLogicalAnd0() {
+>binaryLogicalAnd0 : Symbol(binaryLogicalAnd0, Decl(es5-asyncFunctionBinaryExpressions.ts, 8, 1))
+
+    (await x) && y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryLogicalAnd1() {
+>binaryLogicalAnd1 : Symbol(binaryLogicalAnd1, Decl(es5-asyncFunctionBinaryExpressions.ts, 12, 1))
+
+    x && await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment0() {
+>binaryAssignment0 : Symbol(binaryAssignment0, Decl(es5-asyncFunctionBinaryExpressions.ts, 16, 1))
+
+    x = await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment1() {
+>binaryAssignment1 : Symbol(binaryAssignment1, Decl(es5-asyncFunctionBinaryExpressions.ts, 20, 1))
+
+    x.a = await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment2() {
+>binaryAssignment2 : Symbol(binaryAssignment2, Decl(es5-asyncFunctionBinaryExpressions.ts, 24, 1))
+
+    x.a.b = await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment3() {
+>binaryAssignment3 : Symbol(binaryAssignment3, Decl(es5-asyncFunctionBinaryExpressions.ts, 28, 1))
+
+    x[z] = await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment4() {
+>binaryAssignment4 : Symbol(binaryAssignment4, Decl(es5-asyncFunctionBinaryExpressions.ts, 32, 1))
+
+    x[z].b = await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment5() {
+>binaryAssignment5 : Symbol(binaryAssignment5, Decl(es5-asyncFunctionBinaryExpressions.ts, 36, 1))
+
+    x.a[z] = await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment6() {
+>binaryAssignment6 : Symbol(binaryAssignment6, Decl(es5-asyncFunctionBinaryExpressions.ts, 40, 1))
+
+    (await x).a = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment7() {
+>binaryAssignment7 : Symbol(binaryAssignment7, Decl(es5-asyncFunctionBinaryExpressions.ts, 44, 1))
+
+    (await x.a).b = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment8() {
+>binaryAssignment8 : Symbol(binaryAssignment8, Decl(es5-asyncFunctionBinaryExpressions.ts, 48, 1))
+
+    (await x)[z] = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment9() {
+>binaryAssignment9 : Symbol(binaryAssignment9, Decl(es5-asyncFunctionBinaryExpressions.ts, 52, 1))
+
+    x[await z] = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment10() {
+>binaryAssignment10 : Symbol(binaryAssignment10, Decl(es5-asyncFunctionBinaryExpressions.ts, 56, 1))
+
+    x[await z].b = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment11() {
+>binaryAssignment11 : Symbol(binaryAssignment11, Decl(es5-asyncFunctionBinaryExpressions.ts, 60, 1))
+
+    (await x[z]).b = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment12() {
+>binaryAssignment12 : Symbol(binaryAssignment12, Decl(es5-asyncFunctionBinaryExpressions.ts, 64, 1))
+
+    x.a[await z] = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryAssignment13() {
+>binaryAssignment13 : Symbol(binaryAssignment13, Decl(es5-asyncFunctionBinaryExpressions.ts, 68, 1))
+
+    (await x.a)[z] = y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>z : Symbol(z, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 17))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment0() {
+>binaryCompoundAssignment0 : Symbol(binaryCompoundAssignment0, Decl(es5-asyncFunctionBinaryExpressions.ts, 72, 1))
+
+    x += await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment1() {
+>binaryCompoundAssignment1 : Symbol(binaryCompoundAssignment1, Decl(es5-asyncFunctionBinaryExpressions.ts, 76, 1))
+
+    x.a += await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment2() {
+>binaryCompoundAssignment2 : Symbol(binaryCompoundAssignment2, Decl(es5-asyncFunctionBinaryExpressions.ts, 80, 1))
+
+    x[a] += await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment3() {
+>binaryCompoundAssignment3 : Symbol(binaryCompoundAssignment3, Decl(es5-asyncFunctionBinaryExpressions.ts, 84, 1))
+
+    (await x).a += y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment4() {
+>binaryCompoundAssignment4 : Symbol(binaryCompoundAssignment4, Decl(es5-asyncFunctionBinaryExpressions.ts, 88, 1))
+
+    (await x)[a] += y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment5() {
+>binaryCompoundAssignment5 : Symbol(binaryCompoundAssignment5, Decl(es5-asyncFunctionBinaryExpressions.ts, 92, 1))
+
+    x[await a] += y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment6() {
+>binaryCompoundAssignment6 : Symbol(binaryCompoundAssignment6, Decl(es5-asyncFunctionBinaryExpressions.ts, 96, 1))
+
+    (await x).a += await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment7() {
+>binaryCompoundAssignment7 : Symbol(binaryCompoundAssignment7, Decl(es5-asyncFunctionBinaryExpressions.ts, 100, 1))
+
+    (await x)[a] += await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryCompoundAssignment8() {
+>binaryCompoundAssignment8 : Symbol(binaryCompoundAssignment8, Decl(es5-asyncFunctionBinaryExpressions.ts, 104, 1))
+
+    x[await a] += await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryExponentiation() {
+>binaryExponentiation : Symbol(binaryExponentiation, Decl(es5-asyncFunctionBinaryExpressions.ts, 108, 1))
+
+    (await x) ** y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+
+    x ** await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryComma0() {
+>binaryComma0 : Symbol(binaryComma0, Decl(es5-asyncFunctionBinaryExpressions.ts, 113, 1))
+
+    return (await x), y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
+
+async function binaryComma1(): Promise<any> {
+>binaryComma1 : Symbol(binaryComma1, Decl(es5-asyncFunctionBinaryExpressions.ts, 117, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    return x, await y;
+>x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 14))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types
new file mode 100644
index 00000000000..54afaee22c5
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types
@@ -0,0 +1,389 @@
+=== tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function binaryPlus0() {
+>binaryPlus0 : () => Promise<void>
+
+    (await x) + y;
+>(await x) + y : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+}
+
+async function binaryPlus1() {
+>binaryPlus1 : () => Promise<void>
+
+    x + await y;
+>x + await y : any
+>x : any
+>await y : any
+>y : any
+}
+
+async function binaryLogicalAnd0() {
+>binaryLogicalAnd0 : () => Promise<void>
+
+    (await x) && y;
+>(await x) && y : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+}
+
+async function binaryLogicalAnd1() {
+>binaryLogicalAnd1 : () => Promise<void>
+
+    x && await y;
+>x && await y : any
+>x : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment0() {
+>binaryAssignment0 : () => Promise<void>
+
+    x = await y;
+>x = await y : any
+>x : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment1() {
+>binaryAssignment1 : () => Promise<void>
+
+    x.a = await y;
+>x.a = await y : any
+>x.a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment2() {
+>binaryAssignment2 : () => Promise<void>
+
+    x.a.b = await y;
+>x.a.b = await y : any
+>x.a.b : any
+>x.a : any
+>x : any
+>a : any
+>b : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment3() {
+>binaryAssignment3 : () => Promise<void>
+
+    x[z] = await y;
+>x[z] = await y : any
+>x[z] : any
+>x : any
+>z : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment4() {
+>binaryAssignment4 : () => Promise<void>
+
+    x[z].b = await y;
+>x[z].b = await y : any
+>x[z].b : any
+>x[z] : any
+>x : any
+>z : any
+>b : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment5() {
+>binaryAssignment5 : () => Promise<void>
+
+    x.a[z] = await y;
+>x.a[z] = await y : any
+>x.a[z] : any
+>x.a : any
+>x : any
+>a : any
+>z : any
+>await y : any
+>y : any
+}
+
+async function binaryAssignment6() {
+>binaryAssignment6 : () => Promise<void>
+
+    (await x).a = y;
+>(await x).a = y : any
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+}
+
+async function binaryAssignment7() {
+>binaryAssignment7 : () => Promise<void>
+
+    (await x.a).b = y;
+>(await x.a).b = y : any
+>(await x.a).b : any
+>(await x.a) : any
+>await x.a : any
+>x.a : any
+>x : any
+>a : any
+>b : any
+>y : any
+}
+
+async function binaryAssignment8() {
+>binaryAssignment8 : () => Promise<void>
+
+    (await x)[z] = y;
+>(await x)[z] = y : any
+>(await x)[z] : any
+>(await x) : any
+>await x : any
+>x : any
+>z : any
+>y : any
+}
+
+async function binaryAssignment9() {
+>binaryAssignment9 : () => Promise<void>
+
+    x[await z] = y;
+>x[await z] = y : any
+>x[await z] : any
+>x : any
+>await z : any
+>z : any
+>y : any
+}
+
+async function binaryAssignment10() {
+>binaryAssignment10 : () => Promise<void>
+
+    x[await z].b = y;
+>x[await z].b = y : any
+>x[await z].b : any
+>x[await z] : any
+>x : any
+>await z : any
+>z : any
+>b : any
+>y : any
+}
+
+async function binaryAssignment11() {
+>binaryAssignment11 : () => Promise<void>
+
+    (await x[z]).b = y;
+>(await x[z]).b = y : any
+>(await x[z]).b : any
+>(await x[z]) : any
+>await x[z] : any
+>x[z] : any
+>x : any
+>z : any
+>b : any
+>y : any
+}
+
+async function binaryAssignment12() {
+>binaryAssignment12 : () => Promise<void>
+
+    x.a[await z] = y;
+>x.a[await z] = y : any
+>x.a[await z] : any
+>x.a : any
+>x : any
+>a : any
+>await z : any
+>z : any
+>y : any
+}
+
+async function binaryAssignment13() {
+>binaryAssignment13 : () => Promise<void>
+
+    (await x.a)[z] = y;
+>(await x.a)[z] = y : any
+>(await x.a)[z] : any
+>(await x.a) : any
+>await x.a : any
+>x.a : any
+>x : any
+>a : any
+>z : any
+>y : any
+}
+
+async function binaryCompoundAssignment0() {
+>binaryCompoundAssignment0 : () => Promise<void>
+
+    x += await y;
+>x += await y : any
+>x : any
+>await y : any
+>y : any
+}
+
+async function binaryCompoundAssignment1() {
+>binaryCompoundAssignment1 : () => Promise<void>
+
+    x.a += await y;
+>x.a += await y : any
+>x.a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+}
+
+async function binaryCompoundAssignment2() {
+>binaryCompoundAssignment2 : () => Promise<void>
+
+    x[a] += await y;
+>x[a] += await y : any
+>x[a] : any
+>x : any
+>a : any
+>await y : any
+>y : any
+}
+
+async function binaryCompoundAssignment3() {
+>binaryCompoundAssignment3 : () => Promise<void>
+
+    (await x).a += y;
+>(await x).a += y : any
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+}
+
+async function binaryCompoundAssignment4() {
+>binaryCompoundAssignment4 : () => Promise<void>
+
+    (await x)[a] += y;
+>(await x)[a] += y : any
+>(await x)[a] : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+}
+
+async function binaryCompoundAssignment5() {
+>binaryCompoundAssignment5 : () => Promise<void>
+
+    x[await a] += y;
+>x[await a] += y : any
+>x[await a] : any
+>x : any
+>await a : any
+>a : any
+>y : any
+}
+
+async function binaryCompoundAssignment6() {
+>binaryCompoundAssignment6 : () => Promise<void>
+
+    (await x).a += await y;
+>(await x).a += await y : any
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>await y : any
+>y : any
+}
+
+async function binaryCompoundAssignment7() {
+>binaryCompoundAssignment7 : () => Promise<void>
+
+    (await x)[a] += await y;
+>(await x)[a] += await y : any
+>(await x)[a] : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>await y : any
+>y : any
+}
+
+async function binaryCompoundAssignment8() {
+>binaryCompoundAssignment8 : () => Promise<void>
+
+    x[await a] += await y;
+>x[await a] += await y : any
+>x[await a] : any
+>x : any
+>await a : any
+>a : any
+>await y : any
+>y : any
+}
+
+async function binaryExponentiation() {
+>binaryExponentiation : () => Promise<void>
+
+    (await x) ** y;
+>(await x) ** y : number
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+
+    x ** await y;
+>x ** await y : number
+>x : any
+>await y : any
+>y : any
+}
+
+async function binaryComma0() {
+>binaryComma0 : () => Promise<any>
+
+    return (await x), y;
+>(await x), y : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+}
+
+async function binaryComma1(): Promise<any> {
+>binaryComma1 : () => Promise<any>
+>Promise : Promise<T>
+
+    return x, await y;
+>x, await y : any
+>x : any
+>await y : any
+>y : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionCallExpressions.js b/tests/baselines/reference/es5-asyncFunctionCallExpressions.js
new file mode 100644
index 00000000000..93c4dcfd3cb
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionCallExpressions.js
@@ -0,0 +1,383 @@
+//// [es5-asyncFunctionCallExpressions.ts]
+declare var x, y, z, a, b, c;
+
+async function callExpression0() {
+    await x(y, z);
+}
+
+async function callExpression1() {
+    (await x)(y, z);
+}
+
+async function callExpression2() {
+    x(await y, z);
+}
+
+async function callExpression3() {
+    x(y, await z);
+}
+
+async function callExpression4() {
+    await x(...y, z);
+}
+
+async function callExpression5() {
+    (await x)(...y, z);
+}
+
+async function callExpression6() {
+    x(...(await y), z);
+}
+
+async function callExpression7() {
+    x(...y, await z);
+}
+
+async function callExpression8() {
+    x(await y, ...z);
+}
+
+async function callExpression9() {
+    x(y, ...(await z));
+}
+
+async function callExpression10() {
+    await x.a(y, z);
+}
+
+async function callExpression11() {
+    (await x.a)(y, z);
+}
+
+async function callExpression12() {
+    (await x).a(y, z);
+}
+
+async function callExpression13() {
+    x.a(await y, z);
+}
+
+async function callExpression14() {
+    x.a(y, await z);
+}
+
+async function callExpression15() {
+    await x[a](y, z);
+}
+
+async function callExpression16() {
+    (await x[a])(y, z);
+}
+
+async function callExpression17() {
+    (await x)[a](y, z);
+}
+
+async function callExpression18() {
+    x[await a](y, z);
+}
+
+async function callExpression19() {
+    x[a](await y, z);
+}
+
+async function callExpression20() {
+    x[a](y, await z);
+}
+
+
+//// [es5-asyncFunctionCallExpressions.js]
+function callExpression0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x(y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent())(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.apply(void 0, [_c.sent(), z]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x;
+                    _b = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    _a.apply(void 0, _b.concat([_c.sent()]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.apply(void 0, y.concat([z]))];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression5() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent()).apply(void 0, y.concat([z]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x).apply;
+                    _c = [void 0];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _b.apply(_a, _c.concat([(_d.sent()).concat([z])]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    _b = (_a = x).apply;
+                    _c = [void 0];
+                    _e = (_d = y).concat;
+                    return [4 /*yield*/, z];
+                case 1:
+                    _b.apply(_a, _c.concat([_e.apply(_d, [[_h.sent()]])]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression8() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    _b = (_a = x).apply;
+                    _c = [void 0];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _b.apply(_a, _c.concat([[_e.sent()].concat(z)]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression9() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _b = (_a = x).apply;
+                    _c = [void 0];
+                    _e = (_d = [y]).concat;
+                    return [4 /*yield*/, z];
+                case 1:
+                    _b.apply(_a, _c.concat([_e.apply(_d, [(_g.sent())])]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression10() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.a(y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression11() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.a];
+                case 1:
+                    (_a.sent())(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression12() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent()).a(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression13() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x).a;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _b.apply(_a, [_d.sent(), z]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression14() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x).a;
+                    _c = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    _b.apply(_a, _c.concat([_d.sent()]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression15() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x[a](y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression16() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x[a]];
+                case 1:
+                    (_a.sent())(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression17() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    (_a.sent())[a](y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression18() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, a];
+                case 1:
+                    _a[_b.sent()](y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression19() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x)[a];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _b.apply(_a, [_d.sent(), z]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression20() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x)[a];
+                    _c = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    _b.apply(_a, _c.concat([_d.sent()]));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionCallExpressions.symbols b/tests/baselines/reference/es5-asyncFunctionCallExpressions.symbols
new file mode 100644
index 00000000000..4a73045b5f3
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionCallExpressions.symbols
@@ -0,0 +1,204 @@
+=== tests/cases/compiler/es5-asyncFunctionCallExpressions.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionCallExpressions.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionCallExpressions.ts, 0, 26))
+
+async function callExpression0() {
+>callExpression0 : Symbol(callExpression0, Decl(es5-asyncFunctionCallExpressions.ts, 0, 29))
+
+    await x(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression1() {
+>callExpression1 : Symbol(callExpression1, Decl(es5-asyncFunctionCallExpressions.ts, 4, 1))
+
+    (await x)(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression2() {
+>callExpression2 : Symbol(callExpression2, Decl(es5-asyncFunctionCallExpressions.ts, 8, 1))
+
+    x(await y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression3() {
+>callExpression3 : Symbol(callExpression3, Decl(es5-asyncFunctionCallExpressions.ts, 12, 1))
+
+    x(y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression4() {
+>callExpression4 : Symbol(callExpression4, Decl(es5-asyncFunctionCallExpressions.ts, 16, 1))
+
+    await x(...y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression5() {
+>callExpression5 : Symbol(callExpression5, Decl(es5-asyncFunctionCallExpressions.ts, 20, 1))
+
+    (await x)(...y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression6() {
+>callExpression6 : Symbol(callExpression6, Decl(es5-asyncFunctionCallExpressions.ts, 24, 1))
+
+    x(...(await y), z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression7() {
+>callExpression7 : Symbol(callExpression7, Decl(es5-asyncFunctionCallExpressions.ts, 28, 1))
+
+    x(...y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression8() {
+>callExpression8 : Symbol(callExpression8, Decl(es5-asyncFunctionCallExpressions.ts, 32, 1))
+
+    x(await y, ...z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression9() {
+>callExpression9 : Symbol(callExpression9, Decl(es5-asyncFunctionCallExpressions.ts, 36, 1))
+
+    x(y, ...(await z));
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression10() {
+>callExpression10 : Symbol(callExpression10, Decl(es5-asyncFunctionCallExpressions.ts, 40, 1))
+
+    await x.a(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression11() {
+>callExpression11 : Symbol(callExpression11, Decl(es5-asyncFunctionCallExpressions.ts, 44, 1))
+
+    (await x.a)(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression12() {
+>callExpression12 : Symbol(callExpression12, Decl(es5-asyncFunctionCallExpressions.ts, 48, 1))
+
+    (await x).a(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression13() {
+>callExpression13 : Symbol(callExpression13, Decl(es5-asyncFunctionCallExpressions.ts, 52, 1))
+
+    x.a(await y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression14() {
+>callExpression14 : Symbol(callExpression14, Decl(es5-asyncFunctionCallExpressions.ts, 56, 1))
+
+    x.a(y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression15() {
+>callExpression15 : Symbol(callExpression15, Decl(es5-asyncFunctionCallExpressions.ts, 60, 1))
+
+    await x[a](y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression16() {
+>callExpression16 : Symbol(callExpression16, Decl(es5-asyncFunctionCallExpressions.ts, 64, 1))
+
+    (await x[a])(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression17() {
+>callExpression17 : Symbol(callExpression17, Decl(es5-asyncFunctionCallExpressions.ts, 68, 1))
+
+    (await x)[a](y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression18() {
+>callExpression18 : Symbol(callExpression18, Decl(es5-asyncFunctionCallExpressions.ts, 72, 1))
+
+    x[await a](y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression19() {
+>callExpression19 : Symbol(callExpression19, Decl(es5-asyncFunctionCallExpressions.ts, 76, 1))
+
+    x[a](await y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
+async function callExpression20() {
+>callExpression20 : Symbol(callExpression20, Decl(es5-asyncFunctionCallExpressions.ts, 80, 1))
+
+    x[a](y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionCallExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionCallExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionCallExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionCallExpressions.ts, 0, 17))
+}
+
diff --git a/tests/baselines/reference/es5-asyncFunctionCallExpressions.types b/tests/baselines/reference/es5-asyncFunctionCallExpressions.types
new file mode 100644
index 00000000000..82207b218d2
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionCallExpressions.types
@@ -0,0 +1,276 @@
+=== tests/cases/compiler/es5-asyncFunctionCallExpressions.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function callExpression0() {
+>callExpression0 : () => Promise<void>
+
+    await x(y, z);
+>await x(y, z) : any
+>x(y, z) : any
+>x : any
+>y : any
+>z : any
+}
+
+async function callExpression1() {
+>callExpression1 : () => Promise<void>
+
+    (await x)(y, z);
+>(await x)(y, z) : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+>z : any
+}
+
+async function callExpression2() {
+>callExpression2 : () => Promise<void>
+
+    x(await y, z);
+>x(await y, z) : any
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function callExpression3() {
+>callExpression3 : () => Promise<void>
+
+    x(y, await z);
+>x(y, await z) : any
+>x : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function callExpression4() {
+>callExpression4 : () => Promise<void>
+
+    await x(...y, z);
+>await x(...y, z) : any
+>x(...y, z) : any
+>x : any
+>...y : any
+>y : any
+>z : any
+}
+
+async function callExpression5() {
+>callExpression5 : () => Promise<void>
+
+    (await x)(...y, z);
+>(await x)(...y, z) : any
+>(await x) : any
+>await x : any
+>x : any
+>...y : any
+>y : any
+>z : any
+}
+
+async function callExpression6() {
+>callExpression6 : () => Promise<void>
+
+    x(...(await y), z);
+>x(...(await y), z) : any
+>x : any
+>...(await y) : any
+>(await y) : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function callExpression7() {
+>callExpression7 : () => Promise<void>
+
+    x(...y, await z);
+>x(...y, await z) : any
+>x : any
+>...y : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function callExpression8() {
+>callExpression8 : () => Promise<void>
+
+    x(await y, ...z);
+>x(await y, ...z) : any
+>x : any
+>await y : any
+>y : any
+>...z : any
+>z : any
+}
+
+async function callExpression9() {
+>callExpression9 : () => Promise<void>
+
+    x(y, ...(await z));
+>x(y, ...(await z)) : any
+>x : any
+>y : any
+>...(await z) : any
+>(await z) : any
+>await z : any
+>z : any
+}
+
+async function callExpression10() {
+>callExpression10 : () => Promise<void>
+
+    await x.a(y, z);
+>await x.a(y, z) : any
+>x.a(y, z) : any
+>x.a : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression11() {
+>callExpression11 : () => Promise<void>
+
+    (await x.a)(y, z);
+>(await x.a)(y, z) : any
+>(await x.a) : any
+>await x.a : any
+>x.a : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression12() {
+>callExpression12 : () => Promise<void>
+
+    (await x).a(y, z);
+>(await x).a(y, z) : any
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression13() {
+>callExpression13 : () => Promise<void>
+
+    x.a(await y, z);
+>x.a(await y, z) : any
+>x.a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function callExpression14() {
+>callExpression14 : () => Promise<void>
+
+    x.a(y, await z);
+>x.a(y, await z) : any
+>x.a : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function callExpression15() {
+>callExpression15 : () => Promise<void>
+
+    await x[a](y, z);
+>await x[a](y, z) : any
+>x[a](y, z) : any
+>x[a] : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression16() {
+>callExpression16 : () => Promise<void>
+
+    (await x[a])(y, z);
+>(await x[a])(y, z) : any
+>(await x[a]) : any
+>await x[a] : any
+>x[a] : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression17() {
+>callExpression17 : () => Promise<void>
+
+    (await x)[a](y, z);
+>(await x)[a](y, z) : any
+>(await x)[a] : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression18() {
+>callExpression18 : () => Promise<void>
+
+    x[await a](y, z);
+>x[await a](y, z) : any
+>x[await a] : any
+>x : any
+>await a : any
+>a : any
+>y : any
+>z : any
+}
+
+async function callExpression19() {
+>callExpression19 : () => Promise<void>
+
+    x[a](await y, z);
+>x[a](await y, z) : any
+>x[a] : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function callExpression20() {
+>callExpression20 : () => Promise<void>
+
+    x[a](y, await z);
+>x[a](y, await z) : any
+>x[a] : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
+
diff --git a/tests/baselines/reference/es5-asyncFunctionConditionals.js b/tests/baselines/reference/es5-asyncFunctionConditionals.js
new file mode 100644
index 00000000000..b42b0c07b0a
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionConditionals.js
@@ -0,0 +1,71 @@
+//// [es5-asyncFunctionConditionals.ts]
+declare var x, y, z, a, b, c;
+
+async function conditional0() {
+    a = (await x) ? y : z;
+}
+
+async function conditional1() {
+    a = x ? await y : z;
+}
+
+async function conditional2() {
+    a = x ? y : await z;
+}
+
+//// [es5-asyncFunctionConditionals.js]
+function conditional0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    a = (_a.sent()) ? y : z;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function conditional1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _b.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    _a = z;
+                    _b.label = 3;
+                case 3:
+                    a = _a;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function conditional2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 1];
+                    _a = y;
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, z];
+                case 2:
+                    _a = _b.sent();
+                    _b.label = 3;
+                case 3:
+                    a = _a;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionConditionals.symbols b/tests/baselines/reference/es5-asyncFunctionConditionals.symbols
new file mode 100644
index 00000000000..8efa16840f2
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionConditionals.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/es5-asyncFunctionConditionals.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionConditionals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionConditionals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionConditionals.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionConditionals.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionConditionals.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionConditionals.ts, 0, 26))
+
+async function conditional0() {
+>conditional0 : Symbol(conditional0, Decl(es5-asyncFunctionConditionals.ts, 0, 29))
+
+    a = (await x) ? y : z;
+>a : Symbol(a, Decl(es5-asyncFunctionConditionals.ts, 0, 20))
+>x : Symbol(x, Decl(es5-asyncFunctionConditionals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionConditionals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionConditionals.ts, 0, 17))
+}
+
+async function conditional1() {
+>conditional1 : Symbol(conditional1, Decl(es5-asyncFunctionConditionals.ts, 4, 1))
+
+    a = x ? await y : z;
+>a : Symbol(a, Decl(es5-asyncFunctionConditionals.ts, 0, 20))
+>x : Symbol(x, Decl(es5-asyncFunctionConditionals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionConditionals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionConditionals.ts, 0, 17))
+}
+
+async function conditional2() {
+>conditional2 : Symbol(conditional2, Decl(es5-asyncFunctionConditionals.ts, 8, 1))
+
+    a = x ? y : await z;
+>a : Symbol(a, Decl(es5-asyncFunctionConditionals.ts, 0, 20))
+>x : Symbol(x, Decl(es5-asyncFunctionConditionals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionConditionals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionConditionals.ts, 0, 17))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionConditionals.types b/tests/baselines/reference/es5-asyncFunctionConditionals.types
new file mode 100644
index 00000000000..21f13585e89
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionConditionals.types
@@ -0,0 +1,48 @@
+=== tests/cases/compiler/es5-asyncFunctionConditionals.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function conditional0() {
+>conditional0 : () => Promise<void>
+
+    a = (await x) ? y : z;
+>a = (await x) ? y : z : any
+>a : any
+>(await x) ? y : z : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+>z : any
+}
+
+async function conditional1() {
+>conditional1 : () => Promise<void>
+
+    a = x ? await y : z;
+>a = x ? await y : z : any
+>a : any
+>x ? await y : z : any
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function conditional2() {
+>conditional2 : () => Promise<void>
+
+    a = x ? y : await z;
+>a = x ? y : await z : any
+>a : any
+>x ? y : await z : any
+>x : any
+>y : any
+>await z : any
+>z : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionDoStatements.js b/tests/baselines/reference/es5-asyncFunctionDoStatements.js
new file mode 100644
index 00000000000..7151446dddf
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionDoStatements.js
@@ -0,0 +1,372 @@
+//// [es5-asyncFunctionDoStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function doStatement0() {
+    do { x; } while (y);
+}
+
+async function doStatement1() {
+    do { await x; } while (y);
+}
+
+async function doStatement2() {
+    do { x; } while (await y);
+}
+
+async function doStatement3() {
+    do { continue; } while (y);
+}
+
+async function doStatement4() {
+    do { await x; continue; } while (y);
+}
+
+async function doStatement5() {
+    do { if (1) continue; await x; } while (y);
+}
+
+async function doStatement6() {
+    do { continue; } while (await y);
+}
+
+async function doStatement7() {
+    A: do { continue A; } while (y);
+}
+
+async function doStatement8() {
+    B: do { await x; continue B; } while (y);
+}
+
+async function doStatement9() {
+    C: do { if (1) continue C; await x; } while (y);
+}
+
+async function doStatement10() {
+    D: do { continue D; } while (await y);
+}
+
+async function doStatement11() {
+    do { break; } while (y);
+}
+
+async function doStatement12() {
+    do { await x; break; } while (y);
+}
+
+async function doStatement13() {
+    do { if (1) break; await x; } while (y);
+}
+
+async function doStatement14() {
+    do { break; } while (await y);
+}
+
+async function doStatement15() {
+    E: do { break E; } while (y);
+}
+
+async function doStatement16() {
+    F: do { await x; break F; } while (y);
+}
+
+async function doStatement17() {
+    G: do { if (1) break G; await x; } while (y);
+}
+
+async function doStatement18() {
+    H: do { break H; } while (await y);
+}
+
+//// [es5-asyncFunctionDoStatements.js]
+function doStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            do {
+                x;
+            } while (y);
+            return [2 /*return*/];
+        });
+    });
+}
+function doStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    x;
+                    _a.label = 1;
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    if (_a.sent())
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            do {
+                continue;
+            } while (y);
+            return [2 /*return*/];
+        });
+    });
+}
+function doStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 2];
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (1)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement6() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [3 /*break*/, 1];
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    if (_a.sent())
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement7() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            A: do {
+                continue A;
+            } while (y);
+            return [2 /*return*/];
+        });
+    });
+}
+function doStatement8() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 2];
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement9() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (1)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement10() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [3 /*break*/, 1];
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    if (_a.sent())
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement11() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            do {
+                break;
+            } while (y);
+            return [2 /*return*/];
+        });
+    });
+}
+function doStatement12() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement13() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (1)
+                        return [3 /*break*/, 3];
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement14() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    if (_a.sent())
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement15() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            E: do {
+                break E;
+            } while (y);
+            return [2 /*return*/];
+        });
+    });
+}
+function doStatement16() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement17() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (1)
+                        return [3 /*break*/, 3];
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (y)
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function doStatement18() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    if (_a.sent())
+                        return [3 /*break*/, 0];
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionDoStatements.symbols b/tests/baselines/reference/es5-asyncFunctionDoStatements.symbols
new file mode 100644
index 00000000000..4f234828e63
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionDoStatements.symbols
@@ -0,0 +1,152 @@
+=== tests/cases/compiler/es5-asyncFunctionDoStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionDoStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionDoStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionDoStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionDoStatements.ts, 0, 26))
+
+async function doStatement0() {
+>doStatement0 : Symbol(doStatement0, Decl(es5-asyncFunctionDoStatements.ts, 0, 29))
+
+    do { x; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement1() {
+>doStatement1 : Symbol(doStatement1, Decl(es5-asyncFunctionDoStatements.ts, 4, 1))
+
+    do { await x; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement2() {
+>doStatement2 : Symbol(doStatement2, Decl(es5-asyncFunctionDoStatements.ts, 8, 1))
+
+    do { x; } while (await y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement3() {
+>doStatement3 : Symbol(doStatement3, Decl(es5-asyncFunctionDoStatements.ts, 12, 1))
+
+    do { continue; } while (y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement4() {
+>doStatement4 : Symbol(doStatement4, Decl(es5-asyncFunctionDoStatements.ts, 16, 1))
+
+    do { await x; continue; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement5() {
+>doStatement5 : Symbol(doStatement5, Decl(es5-asyncFunctionDoStatements.ts, 20, 1))
+
+    do { if (1) continue; await x; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement6() {
+>doStatement6 : Symbol(doStatement6, Decl(es5-asyncFunctionDoStatements.ts, 24, 1))
+
+    do { continue; } while (await y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement7() {
+>doStatement7 : Symbol(doStatement7, Decl(es5-asyncFunctionDoStatements.ts, 28, 1))
+
+    A: do { continue A; } while (y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement8() {
+>doStatement8 : Symbol(doStatement8, Decl(es5-asyncFunctionDoStatements.ts, 32, 1))
+
+    B: do { await x; continue B; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement9() {
+>doStatement9 : Symbol(doStatement9, Decl(es5-asyncFunctionDoStatements.ts, 36, 1))
+
+    C: do { if (1) continue C; await x; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement10() {
+>doStatement10 : Symbol(doStatement10, Decl(es5-asyncFunctionDoStatements.ts, 40, 1))
+
+    D: do { continue D; } while (await y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement11() {
+>doStatement11 : Symbol(doStatement11, Decl(es5-asyncFunctionDoStatements.ts, 44, 1))
+
+    do { break; } while (y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement12() {
+>doStatement12 : Symbol(doStatement12, Decl(es5-asyncFunctionDoStatements.ts, 48, 1))
+
+    do { await x; break; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement13() {
+>doStatement13 : Symbol(doStatement13, Decl(es5-asyncFunctionDoStatements.ts, 52, 1))
+
+    do { if (1) break; await x; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement14() {
+>doStatement14 : Symbol(doStatement14, Decl(es5-asyncFunctionDoStatements.ts, 56, 1))
+
+    do { break; } while (await y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement15() {
+>doStatement15 : Symbol(doStatement15, Decl(es5-asyncFunctionDoStatements.ts, 60, 1))
+
+    E: do { break E; } while (y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement16() {
+>doStatement16 : Symbol(doStatement16, Decl(es5-asyncFunctionDoStatements.ts, 64, 1))
+
+    F: do { await x; break F; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement17() {
+>doStatement17 : Symbol(doStatement17, Decl(es5-asyncFunctionDoStatements.ts, 68, 1))
+
+    G: do { if (1) break G; await x; } while (y);
+>x : Symbol(x, Decl(es5-asyncFunctionDoStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
+
+async function doStatement18() {
+>doStatement18 : Symbol(doStatement18, Decl(es5-asyncFunctionDoStatements.ts, 72, 1))
+
+    H: do { break H; } while (await y);
+>y : Symbol(y, Decl(es5-asyncFunctionDoStatements.ts, 0, 14))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionDoStatements.types b/tests/baselines/reference/es5-asyncFunctionDoStatements.types
new file mode 100644
index 00000000000..cfec3eebcfb
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionDoStatements.types
@@ -0,0 +1,186 @@
+=== tests/cases/compiler/es5-asyncFunctionDoStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function doStatement0() {
+>doStatement0 : () => Promise<void>
+
+    do { x; } while (y);
+>x : any
+>y : any
+}
+
+async function doStatement1() {
+>doStatement1 : () => Promise<void>
+
+    do { await x; } while (y);
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement2() {
+>doStatement2 : () => Promise<void>
+
+    do { x; } while (await y);
+>x : any
+>await y : any
+>y : any
+}
+
+async function doStatement3() {
+>doStatement3 : () => Promise<void>
+
+    do { continue; } while (y);
+>y : any
+}
+
+async function doStatement4() {
+>doStatement4 : () => Promise<void>
+
+    do { await x; continue; } while (y);
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement5() {
+>doStatement5 : () => Promise<void>
+
+    do { if (1) continue; await x; } while (y);
+>1 : number
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement6() {
+>doStatement6 : () => Promise<void>
+
+    do { continue; } while (await y);
+>await y : any
+>y : any
+}
+
+async function doStatement7() {
+>doStatement7 : () => Promise<void>
+
+    A: do { continue A; } while (y);
+>A : any
+>A : any
+>y : any
+}
+
+async function doStatement8() {
+>doStatement8 : () => Promise<void>
+
+    B: do { await x; continue B; } while (y);
+>B : any
+>await x : any
+>x : any
+>B : any
+>y : any
+}
+
+async function doStatement9() {
+>doStatement9 : () => Promise<void>
+
+    C: do { if (1) continue C; await x; } while (y);
+>C : any
+>1 : number
+>C : any
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement10() {
+>doStatement10 : () => Promise<void>
+
+    D: do { continue D; } while (await y);
+>D : any
+>D : any
+>await y : any
+>y : any
+}
+
+async function doStatement11() {
+>doStatement11 : () => Promise<void>
+
+    do { break; } while (y);
+>y : any
+}
+
+async function doStatement12() {
+>doStatement12 : () => Promise<void>
+
+    do { await x; break; } while (y);
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement13() {
+>doStatement13 : () => Promise<void>
+
+    do { if (1) break; await x; } while (y);
+>1 : number
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement14() {
+>doStatement14 : () => Promise<void>
+
+    do { break; } while (await y);
+>await y : any
+>y : any
+}
+
+async function doStatement15() {
+>doStatement15 : () => Promise<void>
+
+    E: do { break E; } while (y);
+>E : any
+>E : any
+>y : any
+}
+
+async function doStatement16() {
+>doStatement16 : () => Promise<void>
+
+    F: do { await x; break F; } while (y);
+>F : any
+>await x : any
+>x : any
+>F : any
+>y : any
+}
+
+async function doStatement17() {
+>doStatement17 : () => Promise<void>
+
+    G: do { if (1) break G; await x; } while (y);
+>G : any
+>1 : number
+>G : any
+>await x : any
+>x : any
+>y : any
+}
+
+async function doStatement18() {
+>doStatement18 : () => Promise<void>
+
+    H: do { break H; } while (await y);
+>H : any
+>H : any
+>await y : any
+>y : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionElementAccess.js b/tests/baselines/reference/es5-asyncFunctionElementAccess.js
new file mode 100644
index 00000000000..56c9b54644b
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionElementAccess.js
@@ -0,0 +1,56 @@
+//// [es5-asyncFunctionElementAccess.ts]
+declare var x, y, z, a, b, c;
+
+async function elementAccess0() {
+    z = await x[y];
+}
+
+async function elementAccess1() {
+    z = (await x)[y];
+}
+
+async function elementAccess2() {
+    z = x[await y];
+}
+
+
+//// [es5-asyncFunctionElementAccess.js]
+function elementAccess0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x[y]];
+                case 1:
+                    z = _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function elementAccess1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    z = (_a.sent())[y];
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function elementAccess2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    z = _a[_b.sent()];
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionElementAccess.symbols b/tests/baselines/reference/es5-asyncFunctionElementAccess.symbols
new file mode 100644
index 00000000000..b4c9968e7b9
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionElementAccess.symbols
@@ -0,0 +1,36 @@
+=== tests/cases/compiler/es5-asyncFunctionElementAccess.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionElementAccess.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionElementAccess.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionElementAccess.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionElementAccess.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionElementAccess.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionElementAccess.ts, 0, 26))
+
+async function elementAccess0() {
+>elementAccess0 : Symbol(elementAccess0, Decl(es5-asyncFunctionElementAccess.ts, 0, 29))
+
+    z = await x[y];
+>z : Symbol(z, Decl(es5-asyncFunctionElementAccess.ts, 0, 17))
+>x : Symbol(x, Decl(es5-asyncFunctionElementAccess.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionElementAccess.ts, 0, 14))
+}
+
+async function elementAccess1() {
+>elementAccess1 : Symbol(elementAccess1, Decl(es5-asyncFunctionElementAccess.ts, 4, 1))
+
+    z = (await x)[y];
+>z : Symbol(z, Decl(es5-asyncFunctionElementAccess.ts, 0, 17))
+>x : Symbol(x, Decl(es5-asyncFunctionElementAccess.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionElementAccess.ts, 0, 14))
+}
+
+async function elementAccess2() {
+>elementAccess2 : Symbol(elementAccess2, Decl(es5-asyncFunctionElementAccess.ts, 8, 1))
+
+    z = x[await y];
+>z : Symbol(z, Decl(es5-asyncFunctionElementAccess.ts, 0, 17))
+>x : Symbol(x, Decl(es5-asyncFunctionElementAccess.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionElementAccess.ts, 0, 14))
+}
+
diff --git a/tests/baselines/reference/es5-asyncFunctionElementAccess.types b/tests/baselines/reference/es5-asyncFunctionElementAccess.types
new file mode 100644
index 00000000000..ab5c31ad09a
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionElementAccess.types
@@ -0,0 +1,46 @@
+=== tests/cases/compiler/es5-asyncFunctionElementAccess.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function elementAccess0() {
+>elementAccess0 : () => Promise<void>
+
+    z = await x[y];
+>z = await x[y] : any
+>z : any
+>await x[y] : any
+>x[y] : any
+>x : any
+>y : any
+}
+
+async function elementAccess1() {
+>elementAccess1 : () => Promise<void>
+
+    z = (await x)[y];
+>z = (await x)[y] : any
+>z : any
+>(await x)[y] : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+}
+
+async function elementAccess2() {
+>elementAccess2 : () => Promise<void>
+
+    z = x[await y];
+>z = x[await y] : any
+>z : any
+>x[await y] : any
+>x : any
+>await y : any
+>y : any
+}
+
diff --git a/tests/baselines/reference/es5-asyncFunctionForInStatements.js b/tests/baselines/reference/es5-asyncFunctionForInStatements.js
new file mode 100644
index 00000000000..30946fca56d
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForInStatements.js
@@ -0,0 +1,250 @@
+//// [es5-asyncFunctionForInStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function forInStatement0() {
+    for (x in y) { z; }
+}
+
+async function forInStatement1() {
+    for (x in await y) { z; }
+}
+
+async function forInStatement2() {
+    for (x in y) { await z; }
+}
+
+async function forInStatement3() {
+    for ((await x).a in y) { z; }
+}
+
+async function forInStatement4() {
+    for (x.a in await y) { z; }
+}
+
+async function forInStatement5() {
+    for (x.a in y) { await z; }
+}
+
+async function forInStatement6() {
+    for (var a in y) { z; }
+}
+
+async function forInStatement7() {
+    for (var b in await y) { z; }
+}
+
+async function forInStatement8() {
+    for (var c in y) { await z; }
+}
+
+//// [es5-asyncFunctionForInStatements.js]
+function forInStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            for (x in y) {
+                z;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function forInStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    return [4 /*yield*/, y];
+                case 1:
+                    for (_b in _c.sent())
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x = _a[_i];
+                    z;
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forInStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    for (_b in y)
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x = _a[_i];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _c.sent();
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forInStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    for (_b in y)
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    return [4 /*yield*/, x];
+                case 2:
+                    (_c.sent()).a = _a[_i];
+                    z;
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forInStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    return [4 /*yield*/, y];
+                case 1:
+                    for (_b in _c.sent())
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x.a = _a[_i];
+                    z;
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forInStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    for (_b in y)
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x.a = _a[_i];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _c.sent();
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forInStatement6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var a;
+        return __generator(this, function (_a) {
+            for (a in y) {
+                z;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function forInStatement7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i, b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    return [4 /*yield*/, y];
+                case 1:
+                    for (_b in _c.sent())
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    b = _a[_i];
+                    z;
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forInStatement8() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _i, c;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = [];
+                    for (_b in y)
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    c = _a[_i];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _c.sent();
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForInStatements.symbols b/tests/baselines/reference/es5-asyncFunctionForInStatements.symbols
new file mode 100644
index 00000000000..623978f0b64
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForInStatements.symbols
@@ -0,0 +1,89 @@
+=== tests/cases/compiler/es5-asyncFunctionForInStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForInStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionForInStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionForInStatements.ts, 0, 26))
+
+async function forInStatement0() {
+>forInStatement0 : Symbol(forInStatement0, Decl(es5-asyncFunctionForInStatements.ts, 0, 29))
+
+    for (x in y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement1() {
+>forInStatement1 : Symbol(forInStatement1, Decl(es5-asyncFunctionForInStatements.ts, 4, 1))
+
+    for (x in await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement2() {
+>forInStatement2 : Symbol(forInStatement2, Decl(es5-asyncFunctionForInStatements.ts, 8, 1))
+
+    for (x in y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement3() {
+>forInStatement3 : Symbol(forInStatement3, Decl(es5-asyncFunctionForInStatements.ts, 12, 1))
+
+    for ((await x).a in y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement4() {
+>forInStatement4 : Symbol(forInStatement4, Decl(es5-asyncFunctionForInStatements.ts, 16, 1))
+
+    for (x.a in await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement5() {
+>forInStatement5 : Symbol(forInStatement5, Decl(es5-asyncFunctionForInStatements.ts, 20, 1))
+
+    for (x.a in y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForInStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement6() {
+>forInStatement6 : Symbol(forInStatement6, Decl(es5-asyncFunctionForInStatements.ts, 24, 1))
+
+    for (var a in y) { z; }
+>a : Symbol(a, Decl(es5-asyncFunctionForInStatements.ts, 27, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement7() {
+>forInStatement7 : Symbol(forInStatement7, Decl(es5-asyncFunctionForInStatements.ts, 28, 1))
+
+    for (var b in await y) { z; }
+>b : Symbol(b, Decl(es5-asyncFunctionForInStatements.ts, 31, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
+
+async function forInStatement8() {
+>forInStatement8 : Symbol(forInStatement8, Decl(es5-asyncFunctionForInStatements.ts, 32, 1))
+
+    for (var c in y) { await z; }
+>c : Symbol(c, Decl(es5-asyncFunctionForInStatements.ts, 35, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForInStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForInStatements.ts, 0, 17))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForInStatements.types b/tests/baselines/reference/es5-asyncFunctionForInStatements.types
new file mode 100644
index 00000000000..dcdb276cc90
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForInStatements.types
@@ -0,0 +1,103 @@
+=== tests/cases/compiler/es5-asyncFunctionForInStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function forInStatement0() {
+>forInStatement0 : () => Promise<void>
+
+    for (x in y) { z; }
+>x : any
+>y : any
+>z : any
+}
+
+async function forInStatement1() {
+>forInStatement1 : () => Promise<void>
+
+    for (x in await y) { z; }
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forInStatement2() {
+>forInStatement2 : () => Promise<void>
+
+    for (x in y) { await z; }
+>x : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forInStatement3() {
+>forInStatement3 : () => Promise<void>
+
+    for ((await x).a in y) { z; }
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function forInStatement4() {
+>forInStatement4 : () => Promise<void>
+
+    for (x.a in await y) { z; }
+>x.a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forInStatement5() {
+>forInStatement5 : () => Promise<void>
+
+    for (x.a in y) { await z; }
+>x.a : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forInStatement6() {
+>forInStatement6 : () => Promise<void>
+
+    for (var a in y) { z; }
+>a : string
+>y : any
+>z : any
+}
+
+async function forInStatement7() {
+>forInStatement7 : () => Promise<void>
+
+    for (var b in await y) { z; }
+>b : string
+>await y : any
+>y : any
+>z : any
+}
+
+async function forInStatement8() {
+>forInStatement8 : () => Promise<void>
+
+    for (var c in y) { await z; }
+>c : string
+>y : any
+>await z : any
+>z : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForOfStatements.js b/tests/baselines/reference/es5-asyncFunctionForOfStatements.js
new file mode 100644
index 00000000000..e12f1e18d44
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForOfStatements.js
@@ -0,0 +1,537 @@
+//// [es5-asyncFunctionForOfStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function forOfStatement0() {
+    for (x of y) { z; }
+}
+
+async function forOfStatement1() {
+    for (x of await y) { z; }
+}
+
+async function forOfStatement2() {
+    for (x of y) { await z; }
+}
+
+async function forOfStatement3() {
+    for ((await x).a of y) { z; }
+}
+
+async function forOfStatement4() {
+    for (x.a of await y) { z; }
+}
+
+async function forOfStatement5() {
+    for (x.a of y) { await z; }
+}
+
+async function forOfStatement6() {
+    for (var b of y) { z; }
+}
+
+async function forOfStatement7() {
+    for (var c of await y) { z; }
+}
+
+async function forOfStatement8() {
+    for (var d of y) { await z; }
+}
+
+async function forOfStatement9() {
+    for ([x] of await y) { z; }
+}
+
+async function forOfStatement10() {
+    for ([x] of y) { await z; }
+}
+
+async function forOfStatement11() {
+    for ([x = await a] of y) { z; }
+}
+
+async function forOfStatement12() {
+    for ([x = a] of await y) { z; }
+}
+
+async function forOfStatement13() {
+    for ([x = a] of y) { await z; }
+}
+
+async function forOfStatement14() {
+    for ({ x } of await y) { z; }
+}
+
+async function forOfStatement15() {
+    for ({ x } of y) { await z; }
+}
+
+async function forOfStatement16() {
+    for ({ x = await a } of y) { z; }
+}
+
+async function forOfStatement17() {
+    for ({ x = a } of await y) { z; }
+}
+
+async function forOfStatement18() {
+    for ({ x = a } of y) { await z; }
+}
+
+//// [es5-asyncFunctionForOfStatements.js]
+function forOfStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_1;
+        return __generator(this, function (_a) {
+            for (_i = 0, y_1 = y; _i < y_1.length; _i++) {
+                x = y_1[_i];
+                z;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function forOfStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x = _a[_i];
+                    z;
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, y_2 = y;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < y_2.length))
+                        return [3 /*break*/, 4];
+                    x = y_2[_i];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_3;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, y_3 = y;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < y_3.length))
+                        return [3 /*break*/, 4];
+                    return [4 /*yield*/, x];
+                case 2:
+                    (_a.sent()).a = y_3[_i];
+                    z;
+                    _a.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x.a = _a[_i];
+                    z;
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_4;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, y_4 = y;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < y_4.length))
+                        return [3 /*break*/, 4];
+                    x.a = y_4[_i];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_5, b;
+        return __generator(this, function (_a) {
+            for (_i = 0, y_5 = y; _i < y_5.length; _i++) {
+                b = y_5[_i];
+                z;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function forOfStatement7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a, c;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    c = _a[_i];
+                    z;
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement8() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_6, d;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, y_6 = y;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < y_6.length))
+                        return [3 /*break*/, 4];
+                    d = y_6[_i];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement9() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x = _a[_i][0];
+                    z;
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement10() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_7;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, y_7 = y;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < y_7.length))
+                        return [3 /*break*/, 4];
+                    x = y_7[_i][0];
+                    return [4 /*yield*/, z];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement11() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_8, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _i = 0, y_8 = y;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < y_8.length))
+                        return [3 /*break*/, 6];
+                    _b = y_8[_i][0];
+                    if (!(_b === void 0))
+                        return [3 /*break*/, 3];
+                    return [4 /*yield*/, a];
+                case 2:
+                    _a = _c.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = _b;
+                    _c.label = 4;
+                case 4:
+                    x = _a;
+                    z;
+                    _c.label = 5;
+                case 5:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 6: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement12() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _c.sent();
+                    _c.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    _b = _a[_i][0], x = _b === void 0 ? a : _b;
+                    z;
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement13() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_9, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0, y_9 = y;
+                    _b.label = 1;
+                case 1:
+                    if (!(_i < y_9.length))
+                        return [3 /*break*/, 4];
+                    _a = y_9[_i][0], x = _a === void 0 ? a : _a;
+                    return [4 /*yield*/, z];
+                case 2:
+                    _b.sent();
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement14() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    x = _a[_i].x;
+                    z;
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement15() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_10;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _i = 0, y_10 = y;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < y_10.length))
+                        return [3 /*break*/, 4];
+                    x = y_10[_i].x;
+                    return [4 /*yield*/, z];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement16() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_11, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _i = 0, y_11 = y;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < y_11.length))
+                        return [3 /*break*/, 6];
+                    _b = y_11[_i].x;
+                    if (!(_b === void 0))
+                        return [3 /*break*/, 3];
+                    return [4 /*yield*/, a];
+                case 2:
+                    _a = _c.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = _b;
+                    _c.label = 4;
+                case 4:
+                    x = _a;
+                    z;
+                    _c.label = 5;
+                case 5:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 6: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement17() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _i = 0;
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a = _c.sent();
+                    _c.label = 2;
+                case 2:
+                    if (!(_i < _a.length))
+                        return [3 /*break*/, 4];
+                    _b = _a[_i].x, x = _b === void 0 ? a : _b;
+                    z;
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forOfStatement18() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _i, y_12, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _i = 0, y_12 = y;
+                    _b.label = 1;
+                case 1:
+                    if (!(_i < y_12.length))
+                        return [3 /*break*/, 4];
+                    _a = y_12[_i].x, x = _a === void 0 ? a : _a;
+                    return [4 /*yield*/, z];
+                case 2:
+                    _b.sent();
+                    _b.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForOfStatements.symbols b/tests/baselines/reference/es5-asyncFunctionForOfStatements.symbols
new file mode 100644
index 00000000000..15742967e09
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForOfStatements.symbols
@@ -0,0 +1,183 @@
+=== tests/cases/compiler/es5-asyncFunctionForOfStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForOfStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionForOfStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionForOfStatements.ts, 0, 26))
+
+async function forOfStatement0() {
+>forOfStatement0 : Symbol(forOfStatement0, Decl(es5-asyncFunctionForOfStatements.ts, 0, 29))
+
+    for (x of y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement1() {
+>forOfStatement1 : Symbol(forOfStatement1, Decl(es5-asyncFunctionForOfStatements.ts, 4, 1))
+
+    for (x of await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement2() {
+>forOfStatement2 : Symbol(forOfStatement2, Decl(es5-asyncFunctionForOfStatements.ts, 8, 1))
+
+    for (x of y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement3() {
+>forOfStatement3 : Symbol(forOfStatement3, Decl(es5-asyncFunctionForOfStatements.ts, 12, 1))
+
+    for ((await x).a of y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement4() {
+>forOfStatement4 : Symbol(forOfStatement4, Decl(es5-asyncFunctionForOfStatements.ts, 16, 1))
+
+    for (x.a of await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement5() {
+>forOfStatement5 : Symbol(forOfStatement5, Decl(es5-asyncFunctionForOfStatements.ts, 20, 1))
+
+    for (x.a of y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement6() {
+>forOfStatement6 : Symbol(forOfStatement6, Decl(es5-asyncFunctionForOfStatements.ts, 24, 1))
+
+    for (var b of y) { z; }
+>b : Symbol(b, Decl(es5-asyncFunctionForOfStatements.ts, 27, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement7() {
+>forOfStatement7 : Symbol(forOfStatement7, Decl(es5-asyncFunctionForOfStatements.ts, 28, 1))
+
+    for (var c of await y) { z; }
+>c : Symbol(c, Decl(es5-asyncFunctionForOfStatements.ts, 31, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement8() {
+>forOfStatement8 : Symbol(forOfStatement8, Decl(es5-asyncFunctionForOfStatements.ts, 32, 1))
+
+    for (var d of y) { await z; }
+>d : Symbol(d, Decl(es5-asyncFunctionForOfStatements.ts, 35, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement9() {
+>forOfStatement9 : Symbol(forOfStatement9, Decl(es5-asyncFunctionForOfStatements.ts, 36, 1))
+
+    for ([x] of await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement10() {
+>forOfStatement10 : Symbol(forOfStatement10, Decl(es5-asyncFunctionForOfStatements.ts, 40, 1))
+
+    for ([x] of y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement11() {
+>forOfStatement11 : Symbol(forOfStatement11, Decl(es5-asyncFunctionForOfStatements.ts, 44, 1))
+
+    for ([x = await a] of y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionForOfStatements.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement12() {
+>forOfStatement12 : Symbol(forOfStatement12, Decl(es5-asyncFunctionForOfStatements.ts, 48, 1))
+
+    for ([x = a] of await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionForOfStatements.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement13() {
+>forOfStatement13 : Symbol(forOfStatement13, Decl(es5-asyncFunctionForOfStatements.ts, 52, 1))
+
+    for ([x = a] of y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionForOfStatements.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement14() {
+>forOfStatement14 : Symbol(forOfStatement14, Decl(es5-asyncFunctionForOfStatements.ts, 56, 1))
+
+    for ({ x } of await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 59, 10))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement15() {
+>forOfStatement15 : Symbol(forOfStatement15, Decl(es5-asyncFunctionForOfStatements.ts, 60, 1))
+
+    for ({ x } of y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 63, 10))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement16() {
+>forOfStatement16 : Symbol(forOfStatement16, Decl(es5-asyncFunctionForOfStatements.ts, 64, 1))
+
+    for ({ x = await a } of y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 67, 10))
+>a : Symbol(a, Decl(es5-asyncFunctionForOfStatements.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement17() {
+>forOfStatement17 : Symbol(forOfStatement17, Decl(es5-asyncFunctionForOfStatements.ts, 68, 1))
+
+    for ({ x = a } of await y) { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 71, 10))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
+
+async function forOfStatement18() {
+>forOfStatement18 : Symbol(forOfStatement18, Decl(es5-asyncFunctionForOfStatements.ts, 72, 1))
+
+    for ({ x = a } of y) { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionForOfStatements.ts, 75, 10))
+>y : Symbol(y, Decl(es5-asyncFunctionForOfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForOfStatements.ts, 0, 17))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForOfStatements.types b/tests/baselines/reference/es5-asyncFunctionForOfStatements.types
new file mode 100644
index 00000000000..24c5e5eb83c
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForOfStatements.types
@@ -0,0 +1,222 @@
+=== tests/cases/compiler/es5-asyncFunctionForOfStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function forOfStatement0() {
+>forOfStatement0 : () => Promise<void>
+
+    for (x of y) { z; }
+>x : any
+>y : any
+>z : any
+}
+
+async function forOfStatement1() {
+>forOfStatement1 : () => Promise<void>
+
+    for (x of await y) { z; }
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement2() {
+>forOfStatement2 : () => Promise<void>
+
+    for (x of y) { await z; }
+>x : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forOfStatement3() {
+>forOfStatement3 : () => Promise<void>
+
+    for ((await x).a of y) { z; }
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function forOfStatement4() {
+>forOfStatement4 : () => Promise<void>
+
+    for (x.a of await y) { z; }
+>x.a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement5() {
+>forOfStatement5 : () => Promise<void>
+
+    for (x.a of y) { await z; }
+>x.a : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forOfStatement6() {
+>forOfStatement6 : () => Promise<void>
+
+    for (var b of y) { z; }
+>b : any
+>y : any
+>z : any
+}
+
+async function forOfStatement7() {
+>forOfStatement7 : () => Promise<void>
+
+    for (var c of await y) { z; }
+>c : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement8() {
+>forOfStatement8 : () => Promise<void>
+
+    for (var d of y) { await z; }
+>d : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forOfStatement9() {
+>forOfStatement9 : () => Promise<void>
+
+    for ([x] of await y) { z; }
+>[x] : [any]
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement10() {
+>forOfStatement10 : () => Promise<void>
+
+    for ([x] of y) { await z; }
+>[x] : [any]
+>x : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forOfStatement11() {
+>forOfStatement11 : () => Promise<void>
+
+    for ([x = await a] of y) { z; }
+>[x = await a] : [any]
+>x = await a : any
+>x : any
+>await a : any
+>a : any
+>y : any
+>z : any
+}
+
+async function forOfStatement12() {
+>forOfStatement12 : () => Promise<void>
+
+    for ([x = a] of await y) { z; }
+>[x = a] : [any]
+>x = a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement13() {
+>forOfStatement13 : () => Promise<void>
+
+    for ([x = a] of y) { await z; }
+>[x = a] : [any]
+>x = a : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forOfStatement14() {
+>forOfStatement14 : () => Promise<void>
+
+    for ({ x } of await y) { z; }
+>{ x } : { x: any; }
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement15() {
+>forOfStatement15 : () => Promise<void>
+
+    for ({ x } of y) { await z; }
+>{ x } : { x: any; }
+>x : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function forOfStatement16() {
+>forOfStatement16 : () => Promise<void>
+
+    for ({ x = await a } of y) { z; }
+>{ x = await a } : { x?: any; }
+>x : any
+>await a : any
+>a : any
+>y : any
+>z : any
+}
+
+async function forOfStatement17() {
+>forOfStatement17 : () => Promise<void>
+
+    for ({ x = a } of await y) { z; }
+>{ x = a } : { x?: any; }
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function forOfStatement18() {
+>forOfStatement18 : () => Promise<void>
+
+    for ({ x = a } of y) { await z; }
+>{ x = a } : { x?: any; }
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForStatements.js b/tests/baselines/reference/es5-asyncFunctionForStatements.js
new file mode 100644
index 00000000000..e02d20c7864
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForStatements.js
@@ -0,0 +1,149 @@
+//// [es5-asyncFunctionForStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function forStatement0() {
+    for (x; y; z) { a; }
+}
+
+async function forStatement1() {
+    for (await x; y; z) { a; }
+}
+
+async function forStatement2() {
+    for (x; await y; z) { a; }
+}
+
+async function forStatement3() {
+    for (x; y; await z) { a; }
+}
+
+async function forStatement4() {
+    for (x; y; z) { await a; }
+}
+
+async function forStatement5() {
+    for (var b; y; z) { a; }
+}
+
+async function forStatement6() {
+    for (var c = x; y; z) { a; }
+}
+
+//// [es5-asyncFunctionForStatements.js]
+function forStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            for (x; y; z) {
+                a;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function forStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (!y)
+                        return [3 /*break*/, 4];
+                    a;
+                    _a.label = 3;
+                case 3:
+                    z;
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    x;
+                    _a.label = 1;
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    if (!_a.sent())
+                        return [3 /*break*/, 4];
+                    a;
+                    _a.label = 3;
+                case 3:
+                    z;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    x;
+                    _a.label = 1;
+                case 1:
+                    if (!y)
+                        return [3 /*break*/, 4];
+                    a;
+                    _a.label = 2;
+                case 2: return [4 /*yield*/, z];
+                case 3:
+                    _a.sent();
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    x;
+                    _a.label = 1;
+                case 1:
+                    if (!y)
+                        return [3 /*break*/, 4];
+                    return [4 /*yield*/, a];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    z;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function forStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var b;
+        return __generator(this, function (_a) {
+            for (; y; z) {
+                a;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function forStatement6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var c;
+        return __generator(this, function (_a) {
+            for (c = x; y; z) {
+                a;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForStatements.symbols b/tests/baselines/reference/es5-asyncFunctionForStatements.symbols
new file mode 100644
index 00000000000..878c29e4847
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForStatements.symbols
@@ -0,0 +1,79 @@
+=== tests/cases/compiler/es5-asyncFunctionForStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionForStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionForStatements.ts, 0, 26))
+
+async function forStatement0() {
+>forStatement0 : Symbol(forStatement0, Decl(es5-asyncFunctionForStatements.ts, 0, 29))
+
+    for (x; y; z) { a; }
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
+
+async function forStatement1() {
+>forStatement1 : Symbol(forStatement1, Decl(es5-asyncFunctionForStatements.ts, 4, 1))
+
+    for (await x; y; z) { a; }
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
+
+async function forStatement2() {
+>forStatement2 : Symbol(forStatement2, Decl(es5-asyncFunctionForStatements.ts, 8, 1))
+
+    for (x; await y; z) { a; }
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
+
+async function forStatement3() {
+>forStatement3 : Symbol(forStatement3, Decl(es5-asyncFunctionForStatements.ts, 12, 1))
+
+    for (x; y; await z) { a; }
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
+
+async function forStatement4() {
+>forStatement4 : Symbol(forStatement4, Decl(es5-asyncFunctionForStatements.ts, 16, 1))
+
+    for (x; y; z) { await a; }
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
+
+async function forStatement5() {
+>forStatement5 : Symbol(forStatement5, Decl(es5-asyncFunctionForStatements.ts, 20, 1))
+
+    for (var b; y; z) { a; }
+>b : Symbol(b, Decl(es5-asyncFunctionForStatements.ts, 23, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
+
+async function forStatement6() {
+>forStatement6 : Symbol(forStatement6, Decl(es5-asyncFunctionForStatements.ts, 24, 1))
+
+    for (var c = x; y; z) { a; }
+>c : Symbol(c, Decl(es5-asyncFunctionForStatements.ts, 27, 12))
+>x : Symbol(x, Decl(es5-asyncFunctionForStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionForStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionForStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionForStatements.ts, 0, 20))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionForStatements.types b/tests/baselines/reference/es5-asyncFunctionForStatements.types
new file mode 100644
index 00000000000..0b060f5b708
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionForStatements.types
@@ -0,0 +1,83 @@
+=== tests/cases/compiler/es5-asyncFunctionForStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function forStatement0() {
+>forStatement0 : () => Promise<void>
+
+    for (x; y; z) { a; }
+>x : any
+>y : any
+>z : any
+>a : any
+}
+
+async function forStatement1() {
+>forStatement1 : () => Promise<void>
+
+    for (await x; y; z) { a; }
+>await x : any
+>x : any
+>y : any
+>z : any
+>a : any
+}
+
+async function forStatement2() {
+>forStatement2 : () => Promise<void>
+
+    for (x; await y; z) { a; }
+>x : any
+>await y : any
+>y : any
+>z : any
+>a : any
+}
+
+async function forStatement3() {
+>forStatement3 : () => Promise<void>
+
+    for (x; y; await z) { a; }
+>x : any
+>y : any
+>await z : any
+>z : any
+>a : any
+}
+
+async function forStatement4() {
+>forStatement4 : () => Promise<void>
+
+    for (x; y; z) { await a; }
+>x : any
+>y : any
+>z : any
+>await a : any
+>a : any
+}
+
+async function forStatement5() {
+>forStatement5 : () => Promise<void>
+
+    for (var b; y; z) { a; }
+>b : any
+>y : any
+>z : any
+>a : any
+}
+
+async function forStatement6() {
+>forStatement6 : () => Promise<void>
+
+    for (var c = x; y; z) { a; }
+>c : any
+>x : any
+>y : any
+>z : any
+>a : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionHoisting.js b/tests/baselines/reference/es5-asyncFunctionHoisting.js
new file mode 100644
index 00000000000..1ee846d0126
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionHoisting.js
@@ -0,0 +1,105 @@
+//// [es5-asyncFunctionHoisting.ts]
+declare var y;
+
+async function hoisting() {
+    var a0, a1 = 1;
+    function z() {
+        var b0, b1 = 1;
+    }
+
+    if (true) {
+        var c0, c1 = 1;
+    }
+
+    for (var a = 0; y;) {
+
+    }
+
+    for (var b in y) {
+
+    }
+
+    for (var c of y) {
+
+    }
+}
+
+async function hoistingWithAwait() {
+    var a0, a1 = 1;
+
+    function z() {
+        var b0, b1 = 1;
+    }
+
+    await 0;
+
+    if (true) {
+        var c0, c1 = 1;
+    }
+
+    for (var a = 0; y;) {
+
+    }
+
+    for (var b in y) {
+
+    }
+
+    for (var c of y) {
+
+    }
+}
+
+
+
+//// [es5-asyncFunctionHoisting.js]
+function hoisting() {
+    return __awaiter(this, void 0, void 0, function () {
+        function z() {
+            var b0, b1 = 1;
+        }
+        var a0, a1, c0, c1, a, b, _i, y_1, c;
+        return __generator(this, function (_a) {
+            a1 = 1;
+            if (true) {
+                c1 = 1;
+            }
+            for (a = 0; y;) {
+            }
+            for (b in y) {
+            }
+            for (_i = 0, y_1 = y; _i < y_1.length; _i++) {
+                c = y_1[_i];
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function hoistingWithAwait() {
+    return __awaiter(this, void 0, void 0, function () {
+        function z() {
+            var b0, b1 = 1;
+        }
+        var a0, a1, c0, c1, a, b, _i, y_2, c;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    a1 = 1;
+                    return [4 /*yield*/, 0];
+                case 1:
+                    _a.sent();
+                    if (true) {
+                        c1 = 1;
+                    }
+                    for (a = 0; y;) {
+                    }
+                    for (b in y) {
+                    }
+                    for (_i = 0, y_2 = y; _i < y_2.length; _i++) {
+                        c = y_2[_i];
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionHoisting.symbols b/tests/baselines/reference/es5-asyncFunctionHoisting.symbols
new file mode 100644
index 00000000000..24106028622
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionHoisting.symbols
@@ -0,0 +1,87 @@
+=== tests/cases/compiler/es5-asyncFunctionHoisting.ts ===
+declare var y;
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+async function hoisting() {
+>hoisting : Symbol(hoisting, Decl(es5-asyncFunctionHoisting.ts, 0, 14))
+
+    var a0, a1 = 1;
+>a0 : Symbol(a0, Decl(es5-asyncFunctionHoisting.ts, 3, 7))
+>a1 : Symbol(a1, Decl(es5-asyncFunctionHoisting.ts, 3, 11))
+
+    function z() {
+>z : Symbol(z, Decl(es5-asyncFunctionHoisting.ts, 3, 19))
+
+        var b0, b1 = 1;
+>b0 : Symbol(b0, Decl(es5-asyncFunctionHoisting.ts, 5, 11))
+>b1 : Symbol(b1, Decl(es5-asyncFunctionHoisting.ts, 5, 15))
+    }
+
+    if (true) {
+        var c0, c1 = 1;
+>c0 : Symbol(c0, Decl(es5-asyncFunctionHoisting.ts, 9, 11))
+>c1 : Symbol(c1, Decl(es5-asyncFunctionHoisting.ts, 9, 15))
+    }
+
+    for (var a = 0; y;) {
+>a : Symbol(a, Decl(es5-asyncFunctionHoisting.ts, 12, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+    }
+
+    for (var b in y) {
+>b : Symbol(b, Decl(es5-asyncFunctionHoisting.ts, 16, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+    }
+
+    for (var c of y) {
+>c : Symbol(c, Decl(es5-asyncFunctionHoisting.ts, 20, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+    }
+}
+
+async function hoistingWithAwait() {
+>hoistingWithAwait : Symbol(hoistingWithAwait, Decl(es5-asyncFunctionHoisting.ts, 23, 1))
+
+    var a0, a1 = 1;
+>a0 : Symbol(a0, Decl(es5-asyncFunctionHoisting.ts, 26, 7))
+>a1 : Symbol(a1, Decl(es5-asyncFunctionHoisting.ts, 26, 11))
+
+    function z() {
+>z : Symbol(z, Decl(es5-asyncFunctionHoisting.ts, 26, 19))
+
+        var b0, b1 = 1;
+>b0 : Symbol(b0, Decl(es5-asyncFunctionHoisting.ts, 29, 11))
+>b1 : Symbol(b1, Decl(es5-asyncFunctionHoisting.ts, 29, 15))
+    }
+
+    await 0;
+
+    if (true) {
+        var c0, c1 = 1;
+>c0 : Symbol(c0, Decl(es5-asyncFunctionHoisting.ts, 35, 11))
+>c1 : Symbol(c1, Decl(es5-asyncFunctionHoisting.ts, 35, 15))
+    }
+
+    for (var a = 0; y;) {
+>a : Symbol(a, Decl(es5-asyncFunctionHoisting.ts, 38, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+    }
+
+    for (var b in y) {
+>b : Symbol(b, Decl(es5-asyncFunctionHoisting.ts, 42, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+    }
+
+    for (var c of y) {
+>c : Symbol(c, Decl(es5-asyncFunctionHoisting.ts, 46, 12))
+>y : Symbol(y, Decl(es5-asyncFunctionHoisting.ts, 0, 11))
+
+    }
+}
+
+
diff --git a/tests/baselines/reference/es5-asyncFunctionHoisting.types b/tests/baselines/reference/es5-asyncFunctionHoisting.types
new file mode 100644
index 00000000000..04b968c571d
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionHoisting.types
@@ -0,0 +1,101 @@
+=== tests/cases/compiler/es5-asyncFunctionHoisting.ts ===
+declare var y;
+>y : any
+
+async function hoisting() {
+>hoisting : () => Promise<void>
+
+    var a0, a1 = 1;
+>a0 : any
+>a1 : number
+>1 : number
+
+    function z() {
+>z : () => void
+
+        var b0, b1 = 1;
+>b0 : any
+>b1 : number
+>1 : number
+    }
+
+    if (true) {
+>true : boolean
+
+        var c0, c1 = 1;
+>c0 : any
+>c1 : number
+>1 : number
+    }
+
+    for (var a = 0; y;) {
+>a : number
+>0 : number
+>y : any
+
+    }
+
+    for (var b in y) {
+>b : string
+>y : any
+
+    }
+
+    for (var c of y) {
+>c : any
+>y : any
+
+    }
+}
+
+async function hoistingWithAwait() {
+>hoistingWithAwait : () => Promise<void>
+
+    var a0, a1 = 1;
+>a0 : any
+>a1 : number
+>1 : number
+
+    function z() {
+>z : () => void
+
+        var b0, b1 = 1;
+>b0 : any
+>b1 : number
+>1 : number
+    }
+
+    await 0;
+>await 0 : number
+>0 : number
+
+    if (true) {
+>true : boolean
+
+        var c0, c1 = 1;
+>c0 : any
+>c1 : number
+>1 : number
+    }
+
+    for (var a = 0; y;) {
+>a : number
+>0 : number
+>y : any
+
+    }
+
+    for (var b in y) {
+>b : string
+>y : any
+
+    }
+
+    for (var c of y) {
+>c : any
+>y : any
+
+    }
+}
+
+
diff --git a/tests/baselines/reference/es5-asyncFunctionIfStatements.js b/tests/baselines/reference/es5-asyncFunctionIfStatements.js
new file mode 100644
index 00000000000..7ac35c995e7
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionIfStatements.js
@@ -0,0 +1,70 @@
+//// [es5-asyncFunctionIfStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function ifStatement1() {
+    if (await x) { y; } else { z; }
+}
+
+async function ifStatement2() {
+    if (x) { await y; } else { z; }
+}
+
+async function ifStatement3() {
+    if (x) { y; } else { await z; }
+}
+
+//// [es5-asyncFunctionIfStatements.js]
+function ifStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    if (_a.sent()) {
+                        y;
+                    }
+                    else {
+                        z;
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function ifStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    z;
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function ifStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 1];
+                    y;
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, z];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionIfStatements.symbols b/tests/baselines/reference/es5-asyncFunctionIfStatements.symbols
new file mode 100644
index 00000000000..b8d8387eaec
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionIfStatements.symbols
@@ -0,0 +1,35 @@
+=== tests/cases/compiler/es5-asyncFunctionIfStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionIfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionIfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionIfStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionIfStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionIfStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionIfStatements.ts, 0, 26))
+
+async function ifStatement1() {
+>ifStatement1 : Symbol(ifStatement1, Decl(es5-asyncFunctionIfStatements.ts, 0, 29))
+
+    if (await x) { y; } else { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionIfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionIfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionIfStatements.ts, 0, 17))
+}
+
+async function ifStatement2() {
+>ifStatement2 : Symbol(ifStatement2, Decl(es5-asyncFunctionIfStatements.ts, 4, 1))
+
+    if (x) { await y; } else { z; }
+>x : Symbol(x, Decl(es5-asyncFunctionIfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionIfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionIfStatements.ts, 0, 17))
+}
+
+async function ifStatement3() {
+>ifStatement3 : Symbol(ifStatement3, Decl(es5-asyncFunctionIfStatements.ts, 8, 1))
+
+    if (x) { y; } else { await z; }
+>x : Symbol(x, Decl(es5-asyncFunctionIfStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionIfStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionIfStatements.ts, 0, 17))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionIfStatements.types b/tests/baselines/reference/es5-asyncFunctionIfStatements.types
new file mode 100644
index 00000000000..9cecdcb9f60
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionIfStatements.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/es5-asyncFunctionIfStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function ifStatement1() {
+>ifStatement1 : () => Promise<void>
+
+    if (await x) { y; } else { z; }
+>await x : any
+>x : any
+>y : any
+>z : any
+}
+
+async function ifStatement2() {
+>ifStatement2 : () => Promise<void>
+
+    if (x) { await y; } else { z; }
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function ifStatement3() {
+>ifStatement3 : () => Promise<void>
+
+    if (x) { y; } else { await z; }
+>x : any
+>y : any
+>await z : any
+>z : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionNestedLoops.js b/tests/baselines/reference/es5-asyncFunctionNestedLoops.js
new file mode 100644
index 00000000000..28ccc288b7e
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionNestedLoops.js
@@ -0,0 +1,38 @@
+//// [es5-asyncFunctionNestedLoops.ts]
+declare var x, y, z, a, b, c;
+
+async function nestedLoops() {
+    A: while (x) {
+        await y;
+        while (z) {
+            continue A;
+        }
+        while (a) {
+            continue;
+        }
+    }
+}
+
+//// [es5-asyncFunctionNestedLoops.js]
+function nestedLoops() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    while (z) {
+                        return [3 /*break*/, 0];
+                    }
+                    while (a) {
+                        continue;
+                    }
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionNestedLoops.symbols b/tests/baselines/reference/es5-asyncFunctionNestedLoops.symbols
new file mode 100644
index 00000000000..45d9cdc781b
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionNestedLoops.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/es5-asyncFunctionNestedLoops.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionNestedLoops.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNestedLoops.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNestedLoops.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionNestedLoops.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionNestedLoops.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionNestedLoops.ts, 0, 26))
+
+async function nestedLoops() {
+>nestedLoops : Symbol(nestedLoops, Decl(es5-asyncFunctionNestedLoops.ts, 0, 29))
+
+    A: while (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionNestedLoops.ts, 0, 11))
+
+        await y;
+>y : Symbol(y, Decl(es5-asyncFunctionNestedLoops.ts, 0, 14))
+
+        while (z) {
+>z : Symbol(z, Decl(es5-asyncFunctionNestedLoops.ts, 0, 17))
+
+            continue A;
+        }
+        while (a) {
+>a : Symbol(a, Decl(es5-asyncFunctionNestedLoops.ts, 0, 20))
+
+            continue;
+        }
+    }
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionNestedLoops.types b/tests/baselines/reference/es5-asyncFunctionNestedLoops.types
new file mode 100644
index 00000000000..3a2913e65b1
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionNestedLoops.types
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/es5-asyncFunctionNestedLoops.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function nestedLoops() {
+>nestedLoops : () => Promise<void>
+
+    A: while (x) {
+>A : any
+>x : any
+
+        await y;
+>await y : any
+>y : any
+
+        while (z) {
+>z : any
+
+            continue A;
+>A : any
+        }
+        while (a) {
+>a : any
+
+            continue;
+        }
+    }
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionNewExpressions.js b/tests/baselines/reference/es5-asyncFunctionNewExpressions.js
new file mode 100644
index 00000000000..486bf0fdd7f
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionNewExpressions.js
@@ -0,0 +1,386 @@
+//// [es5-asyncFunctionNewExpressions.ts]
+declare var x, y, z, a, b, c;
+
+async function newExpression0() {
+    await new x(y, z);
+}
+
+async function newExpression1() {
+    new (await x)(y, z);
+}
+
+async function newExpression2() {
+    new x(await y, z);
+}
+
+async function newExpression3() {
+    new x(y, await z);
+}
+
+async function newExpression4() {
+    await new x(...y, z);
+}
+
+async function newExpression5() {
+    new (await x)(...y, z);
+}
+
+async function newExpression6() {
+    new x(...(await y), z);
+}
+
+async function newExpression7() {
+    new x(...y, await z);
+}
+
+async function newExpression8() {
+    new x(await y, ...z);
+}
+
+async function newExpression9() {
+    new x(y, ...(await z));
+}
+
+async function newExpression10() {
+    await new x.a(y, z);
+}
+
+async function newExpression11() {
+    new (await x.a)(y, z);
+}
+
+async function newExpression12() {
+    new (await x).a(y, z);
+}
+
+async function newExpression13() {
+    new x.a(await y, z);
+}
+
+async function newExpression14() {
+    new x.a(y, await z);
+}
+
+async function newExpression15() {
+    await new x[a](y, z);
+}
+
+async function newExpression16() {
+    new (await x[a])(y, z);
+}
+
+async function newExpression17() {
+    new (await x)[a](y, z);
+}
+
+async function newExpression18() {
+    new x[await a](y, z);
+}
+
+async function newExpression19() {
+    new x[a](await y, z);
+}
+
+async function newExpression20() {
+    new x[a](y, await z);
+}
+
+//// [es5-asyncFunctionNewExpressions.js]
+function newExpression0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, new x(y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    new (_a.sent())(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x.bind;
+                    return [4 /*yield*/, y];
+                case 1:
+                    new (_a.apply(x, [_c.sent(), z]))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x.bind;
+                    _b = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    new (_a.apply(x, _b.concat([_c.sent()])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, new (x.bind.apply(x, [void 0].concat(y, [z])))()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    new ((_a = (_b.sent())).bind.apply(_a, [void 0].concat(y, [z])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _b = (_a = x.bind).apply;
+                    _c = [x];
+                    _e = (_d = [void 0]).concat;
+                    return [4 /*yield*/, y];
+                case 1:
+                    new (_b.apply(_a, _c.concat([_e.apply(_d, [(_g.sent()), [z]])])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    _b = (_a = x.bind).apply;
+                    _c = [x];
+                    _e = (_d = [void 0]).concat;
+                    _f = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    new (_b.apply(_a, _c.concat([_e.apply(_d, _f.concat([[_h.sent()]]))])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression8() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    _b = (_a = x.bind).apply;
+                    _c = [x];
+                    _d = [void 0];
+                    return [4 /*yield*/, y];
+                case 1:
+                    new (_b.apply(_a, _c.concat([_d.concat([_e.sent()]).concat(z)])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression9() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _b = (_a = x.bind).apply;
+                    _c = [x];
+                    _e = (_d = [void 0, y]).concat;
+                    return [4 /*yield*/, z];
+                case 1:
+                    new (_b.apply(_a, _c.concat([_e.apply(_d, [(_g.sent())])])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression10() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, new x.a(y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression11() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.a];
+                case 1:
+                    new (_a.sent())(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression12() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    new (_a.sent()).a(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression13() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x.a).bind;
+                    return [4 /*yield*/, y];
+                case 1:
+                    new (_b.apply(_a, [_d.sent(), z]))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression14() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x.a).bind;
+                    _c = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    new (_b.apply(_a, _c.concat([_d.sent()])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression15() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, new x[a](y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression16() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x[a]];
+                case 1:
+                    new (_a.sent())(y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression17() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    new (_a.sent())[a](y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression18() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, a];
+                case 1:
+                    new _a[_b.sent()](y, z);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression19() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x[a]).bind;
+                    return [4 /*yield*/, y];
+                case 1:
+                    new (_b.apply(_a, [_d.sent(), z]))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function newExpression20() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = x[a]).bind;
+                    _c = [y];
+                    return [4 /*yield*/, z];
+                case 1:
+                    new (_b.apply(_a, _c.concat([_d.sent()])))();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionNewExpressions.symbols b/tests/baselines/reference/es5-asyncFunctionNewExpressions.symbols
new file mode 100644
index 00000000000..19309bd19fe
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionNewExpressions.symbols
@@ -0,0 +1,203 @@
+=== tests/cases/compiler/es5-asyncFunctionNewExpressions.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionNewExpressions.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionNewExpressions.ts, 0, 26))
+
+async function newExpression0() {
+>newExpression0 : Symbol(newExpression0, Decl(es5-asyncFunctionNewExpressions.ts, 0, 29))
+
+    await new x(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression1() {
+>newExpression1 : Symbol(newExpression1, Decl(es5-asyncFunctionNewExpressions.ts, 4, 1))
+
+    new (await x)(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression2() {
+>newExpression2 : Symbol(newExpression2, Decl(es5-asyncFunctionNewExpressions.ts, 8, 1))
+
+    new x(await y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression3() {
+>newExpression3 : Symbol(newExpression3, Decl(es5-asyncFunctionNewExpressions.ts, 12, 1))
+
+    new x(y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression4() {
+>newExpression4 : Symbol(newExpression4, Decl(es5-asyncFunctionNewExpressions.ts, 16, 1))
+
+    await new x(...y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression5() {
+>newExpression5 : Symbol(newExpression5, Decl(es5-asyncFunctionNewExpressions.ts, 20, 1))
+
+    new (await x)(...y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression6() {
+>newExpression6 : Symbol(newExpression6, Decl(es5-asyncFunctionNewExpressions.ts, 24, 1))
+
+    new x(...(await y), z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression7() {
+>newExpression7 : Symbol(newExpression7, Decl(es5-asyncFunctionNewExpressions.ts, 28, 1))
+
+    new x(...y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression8() {
+>newExpression8 : Symbol(newExpression8, Decl(es5-asyncFunctionNewExpressions.ts, 32, 1))
+
+    new x(await y, ...z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression9() {
+>newExpression9 : Symbol(newExpression9, Decl(es5-asyncFunctionNewExpressions.ts, 36, 1))
+
+    new x(y, ...(await z));
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression10() {
+>newExpression10 : Symbol(newExpression10, Decl(es5-asyncFunctionNewExpressions.ts, 40, 1))
+
+    await new x.a(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression11() {
+>newExpression11 : Symbol(newExpression11, Decl(es5-asyncFunctionNewExpressions.ts, 44, 1))
+
+    new (await x.a)(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression12() {
+>newExpression12 : Symbol(newExpression12, Decl(es5-asyncFunctionNewExpressions.ts, 48, 1))
+
+    new (await x).a(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression13() {
+>newExpression13 : Symbol(newExpression13, Decl(es5-asyncFunctionNewExpressions.ts, 52, 1))
+
+    new x.a(await y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression14() {
+>newExpression14 : Symbol(newExpression14, Decl(es5-asyncFunctionNewExpressions.ts, 56, 1))
+
+    new x.a(y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression15() {
+>newExpression15 : Symbol(newExpression15, Decl(es5-asyncFunctionNewExpressions.ts, 60, 1))
+
+    await new x[a](y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression16() {
+>newExpression16 : Symbol(newExpression16, Decl(es5-asyncFunctionNewExpressions.ts, 64, 1))
+
+    new (await x[a])(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression17() {
+>newExpression17 : Symbol(newExpression17, Decl(es5-asyncFunctionNewExpressions.ts, 68, 1))
+
+    new (await x)[a](y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression18() {
+>newExpression18 : Symbol(newExpression18, Decl(es5-asyncFunctionNewExpressions.ts, 72, 1))
+
+    new x[await a](y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression19() {
+>newExpression19 : Symbol(newExpression19, Decl(es5-asyncFunctionNewExpressions.ts, 76, 1))
+
+    new x[a](await y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
+
+async function newExpression20() {
+>newExpression20 : Symbol(newExpression20, Decl(es5-asyncFunctionNewExpressions.ts, 80, 1))
+
+    new x[a](y, await z);
+>x : Symbol(x, Decl(es5-asyncFunctionNewExpressions.ts, 0, 11))
+>a : Symbol(a, Decl(es5-asyncFunctionNewExpressions.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionNewExpressions.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionNewExpressions.ts, 0, 17))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionNewExpressions.types b/tests/baselines/reference/es5-asyncFunctionNewExpressions.types
new file mode 100644
index 00000000000..c6390430380
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionNewExpressions.types
@@ -0,0 +1,275 @@
+=== tests/cases/compiler/es5-asyncFunctionNewExpressions.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function newExpression0() {
+>newExpression0 : () => Promise<void>
+
+    await new x(y, z);
+>await new x(y, z) : any
+>new x(y, z) : any
+>x : any
+>y : any
+>z : any
+}
+
+async function newExpression1() {
+>newExpression1 : () => Promise<void>
+
+    new (await x)(y, z);
+>new (await x)(y, z) : any
+>(await x) : any
+>await x : any
+>x : any
+>y : any
+>z : any
+}
+
+async function newExpression2() {
+>newExpression2 : () => Promise<void>
+
+    new x(await y, z);
+>new x(await y, z) : any
+>x : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function newExpression3() {
+>newExpression3 : () => Promise<void>
+
+    new x(y, await z);
+>new x(y, await z) : any
+>x : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function newExpression4() {
+>newExpression4 : () => Promise<void>
+
+    await new x(...y, z);
+>await new x(...y, z) : any
+>new x(...y, z) : any
+>x : any
+>...y : any
+>y : any
+>z : any
+}
+
+async function newExpression5() {
+>newExpression5 : () => Promise<void>
+
+    new (await x)(...y, z);
+>new (await x)(...y, z) : any
+>(await x) : any
+>await x : any
+>x : any
+>...y : any
+>y : any
+>z : any
+}
+
+async function newExpression6() {
+>newExpression6 : () => Promise<void>
+
+    new x(...(await y), z);
+>new x(...(await y), z) : any
+>x : any
+>...(await y) : any
+>(await y) : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function newExpression7() {
+>newExpression7 : () => Promise<void>
+
+    new x(...y, await z);
+>new x(...y, await z) : any
+>x : any
+>...y : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function newExpression8() {
+>newExpression8 : () => Promise<void>
+
+    new x(await y, ...z);
+>new x(await y, ...z) : any
+>x : any
+>await y : any
+>y : any
+>...z : any
+>z : any
+}
+
+async function newExpression9() {
+>newExpression9 : () => Promise<void>
+
+    new x(y, ...(await z));
+>new x(y, ...(await z)) : any
+>x : any
+>y : any
+>...(await z) : any
+>(await z) : any
+>await z : any
+>z : any
+}
+
+async function newExpression10() {
+>newExpression10 : () => Promise<void>
+
+    await new x.a(y, z);
+>await new x.a(y, z) : any
+>new x.a(y, z) : any
+>x.a : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression11() {
+>newExpression11 : () => Promise<void>
+
+    new (await x.a)(y, z);
+>new (await x.a)(y, z) : any
+>(await x.a) : any
+>await x.a : any
+>x.a : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression12() {
+>newExpression12 : () => Promise<void>
+
+    new (await x).a(y, z);
+>new (await x).a(y, z) : any
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression13() {
+>newExpression13 : () => Promise<void>
+
+    new x.a(await y, z);
+>new x.a(await y, z) : any
+>x.a : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function newExpression14() {
+>newExpression14 : () => Promise<void>
+
+    new x.a(y, await z);
+>new x.a(y, await z) : any
+>x.a : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
+
+async function newExpression15() {
+>newExpression15 : () => Promise<void>
+
+    await new x[a](y, z);
+>await new x[a](y, z) : any
+>new x[a](y, z) : any
+>x[a] : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression16() {
+>newExpression16 : () => Promise<void>
+
+    new (await x[a])(y, z);
+>new (await x[a])(y, z) : any
+>(await x[a]) : any
+>await x[a] : any
+>x[a] : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression17() {
+>newExpression17 : () => Promise<void>
+
+    new (await x)[a](y, z);
+>new (await x)[a](y, z) : any
+>(await x)[a] : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression18() {
+>newExpression18 : () => Promise<void>
+
+    new x[await a](y, z);
+>new x[await a](y, z) : any
+>x[await a] : any
+>x : any
+>await a : any
+>a : any
+>y : any
+>z : any
+}
+
+async function newExpression19() {
+>newExpression19 : () => Promise<void>
+
+    new x[a](await y, z);
+>new x[a](await y, z) : any
+>x[a] : any
+>x : any
+>a : any
+>await y : any
+>y : any
+>z : any
+}
+
+async function newExpression20() {
+>newExpression20 : () => Promise<void>
+
+    new x[a](y, await z);
+>new x[a](y, await z) : any
+>x[a] : any
+>x : any
+>a : any
+>y : any
+>await z : any
+>z : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionObjectLiterals.js b/tests/baselines/reference/es5-asyncFunctionObjectLiterals.js
new file mode 100644
index 00000000000..8bc90935d37
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionObjectLiterals.js
@@ -0,0 +1,177 @@
+//// [es5-asyncFunctionObjectLiterals.ts]
+declare var x, y, z, a, b, c;
+
+async function objectLiteral0() {
+    x = {
+        a: await y,
+        b: z
+    };
+}
+
+async function objectLiteral1() {
+    x = {
+        a: y,
+        b: await z
+    };
+}
+
+async function objectLiteral2() {
+    x = {
+        [await a]: y,
+        b: z
+    };
+}
+
+async function objectLiteral3() {
+    x = {
+        [a]: await y,
+        b: z
+    };
+}
+
+async function objectLiteral4() {
+    x = {
+        a: await y,
+        [b]: z
+    };
+}
+
+async function objectLiteral5() {
+    x = {
+        a: y,
+        [await b]: z
+    };
+}
+
+async function objectLiteral6() {
+    x = {
+        a: y,
+        [b]: await z
+    };
+}
+
+//// [es5-asyncFunctionObjectLiterals.js]
+function objectLiteral0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = {};
+                    return [4 /*yield*/, y];
+                case 1:
+                    x = (_a.a = _b.sent(),
+                        _a.b = z,
+                        _a);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function objectLiteral1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = {
+                        a: y
+                    };
+                    return [4 /*yield*/, z];
+                case 1:
+                    x = (_a.b = _b.sent(),
+                        _a);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function objectLiteral2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = {};
+                    return [4 /*yield*/, a];
+                case 1:
+                    x = (_a[_b.sent()] = y,
+                        _a.b = z,
+                        _a);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function objectLiteral3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _b = {};
+                    _a = a;
+                    return [4 /*yield*/, y];
+                case 1:
+                    x = (_b[_a] = _c.sent(),
+                        _b.b = z,
+                        _b);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function objectLiteral4() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = {};
+                    return [4 /*yield*/, y];
+                case 1:
+                    x = (_a.a = _b.sent(),
+                        _a[b] = z,
+                        _a);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function objectLiteral5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = {
+                            a: y
+                        };
+                    return [4 /*yield*/, b];
+                case 1:
+                    x = (_a[_b.sent()] = z,
+                        _a);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function objectLiteral6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _b = {
+                            a: y
+                        };
+                    _a = b;
+                    return [4 /*yield*/, z];
+                case 1:
+                    x = (_b[_a] = _c.sent(),
+                        _b);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionObjectLiterals.symbols b/tests/baselines/reference/es5-asyncFunctionObjectLiterals.symbols
new file mode 100644
index 00000000000..dd84a5c11f4
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionObjectLiterals.symbols
@@ -0,0 +1,127 @@
+=== tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 26))
+
+async function objectLiteral0() {
+>objectLiteral0 : Symbol(objectLiteral0, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 29))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        a: await y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 3, 9))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        b: z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 4, 19))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
+
+async function objectLiteral1() {
+>objectLiteral1 : Symbol(objectLiteral1, Decl(es5-asyncFunctionObjectLiterals.ts, 7, 1))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        a: y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 10, 9))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        b: await z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 11, 13))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
+
+async function objectLiteral2() {
+>objectLiteral2 : Symbol(objectLiteral2, Decl(es5-asyncFunctionObjectLiterals.ts, 14, 1))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        [await a]: y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        b: z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 18, 21))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
+
+async function objectLiteral3() {
+>objectLiteral3 : Symbol(objectLiteral3, Decl(es5-asyncFunctionObjectLiterals.ts, 21, 1))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        [a]: await y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 20))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        b: z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 25, 21))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
+
+async function objectLiteral4() {
+>objectLiteral4 : Symbol(objectLiteral4, Decl(es5-asyncFunctionObjectLiterals.ts, 28, 1))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        a: await y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 31, 9))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        [b]: z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 23))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
+
+async function objectLiteral5() {
+>objectLiteral5 : Symbol(objectLiteral5, Decl(es5-asyncFunctionObjectLiterals.ts, 35, 1))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        a: y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 38, 9))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        [await b]: z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 23))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
+
+async function objectLiteral6() {
+>objectLiteral6 : Symbol(objectLiteral6, Decl(es5-asyncFunctionObjectLiterals.ts, 42, 1))
+
+    x = {
+>x : Symbol(x, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 11))
+
+        a: y,
+>a : Symbol(a, Decl(es5-asyncFunctionObjectLiterals.ts, 45, 9))
+>y : Symbol(y, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 14))
+
+        [b]: await z
+>b : Symbol(b, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 23))
+>z : Symbol(z, Decl(es5-asyncFunctionObjectLiterals.ts, 0, 17))
+
+    };
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionObjectLiterals.types b/tests/baselines/reference/es5-asyncFunctionObjectLiterals.types
new file mode 100644
index 00000000000..d37dd8a6ceb
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionObjectLiterals.types
@@ -0,0 +1,148 @@
+=== tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function objectLiteral0() {
+>objectLiteral0 : () => Promise<void>
+
+    x = {
+>x = {        a: await y,        b: z    } : { a: any; b: any; }
+>x : any
+>{        a: await y,        b: z    } : { a: any; b: any; }
+
+        a: await y,
+>a : any
+>await y : any
+>y : any
+
+        b: z
+>b : any
+>z : any
+
+    };
+}
+
+async function objectLiteral1() {
+>objectLiteral1 : () => Promise<void>
+
+    x = {
+>x = {        a: y,        b: await z    } : { a: any; b: any; }
+>x : any
+>{        a: y,        b: await z    } : { a: any; b: any; }
+
+        a: y,
+>a : any
+>y : any
+
+        b: await z
+>b : any
+>await z : any
+>z : any
+
+    };
+}
+
+async function objectLiteral2() {
+>objectLiteral2 : () => Promise<void>
+
+    x = {
+>x = {        [await a]: y,        b: z    } : { [x: number]: any; b: any; }
+>x : any
+>{        [await a]: y,        b: z    } : { [x: number]: any; b: any; }
+
+        [await a]: y,
+>await a : any
+>a : any
+>y : any
+
+        b: z
+>b : any
+>z : any
+
+    };
+}
+
+async function objectLiteral3() {
+>objectLiteral3 : () => Promise<void>
+
+    x = {
+>x = {        [a]: await y,        b: z    } : { [x: number]: any; b: any; }
+>x : any
+>{        [a]: await y,        b: z    } : { [x: number]: any; b: any; }
+
+        [a]: await y,
+>a : any
+>await y : any
+>y : any
+
+        b: z
+>b : any
+>z : any
+
+    };
+}
+
+async function objectLiteral4() {
+>objectLiteral4 : () => Promise<void>
+
+    x = {
+>x = {        a: await y,        [b]: z    } : { [x: number]: any; a: any; }
+>x : any
+>{        a: await y,        [b]: z    } : { [x: number]: any; a: any; }
+
+        a: await y,
+>a : any
+>await y : any
+>y : any
+
+        [b]: z
+>b : any
+>z : any
+
+    };
+}
+
+async function objectLiteral5() {
+>objectLiteral5 : () => Promise<void>
+
+    x = {
+>x = {        a: y,        [await b]: z    } : { [x: number]: any; a: any; }
+>x : any
+>{        a: y,        [await b]: z    } : { [x: number]: any; a: any; }
+
+        a: y,
+>a : any
+>y : any
+
+        [await b]: z
+>await b : any
+>b : any
+>z : any
+
+    };
+}
+
+async function objectLiteral6() {
+>objectLiteral6 : () => Promise<void>
+
+    x = {
+>x = {        a: y,        [b]: await z    } : { [x: number]: any; a: any; }
+>x : any
+>{        a: y,        [b]: await z    } : { [x: number]: any; a: any; }
+
+        a: y,
+>a : any
+>y : any
+
+        [b]: await z
+>b : any
+>await z : any
+>z : any
+
+    };
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionPropertyAccess.js b/tests/baselines/reference/es5-asyncFunctionPropertyAccess.js
new file mode 100644
index 00000000000..436428a76c5
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionPropertyAccess.js
@@ -0,0 +1,52 @@
+//// [es5-asyncFunctionPropertyAccess.ts]
+declare var x, y, z, a, b, c;
+
+async function propertyAccess0() {
+    y = await x.a;
+}
+
+async function propertyAccess1() {
+    y = (await x).a;
+}
+
+async function callExpression0() {
+    await x(y, z);
+}
+
+//// [es5-asyncFunctionPropertyAccess.js]
+function propertyAccess0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x.a];
+                case 1:
+                    y = _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function propertyAccess1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    y = (_a.sent()).a;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function callExpression0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x(y, z)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionPropertyAccess.symbols b/tests/baselines/reference/es5-asyncFunctionPropertyAccess.symbols
new file mode 100644
index 00000000000..22f7bcc9546
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionPropertyAccess.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 26))
+
+async function propertyAccess0() {
+>propertyAccess0 : Symbol(propertyAccess0, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 29))
+
+    y = await x.a;
+>y : Symbol(y, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 14))
+>x : Symbol(x, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 11))
+}
+
+async function propertyAccess1() {
+>propertyAccess1 : Symbol(propertyAccess1, Decl(es5-asyncFunctionPropertyAccess.ts, 4, 1))
+
+    y = (await x).a;
+>y : Symbol(y, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 14))
+>x : Symbol(x, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 11))
+}
+
+async function callExpression0() {
+>callExpression0 : Symbol(callExpression0, Decl(es5-asyncFunctionPropertyAccess.ts, 8, 1))
+
+    await x(y, z);
+>x : Symbol(x, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionPropertyAccess.ts, 0, 17))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionPropertyAccess.types b/tests/baselines/reference/es5-asyncFunctionPropertyAccess.types
new file mode 100644
index 00000000000..a6f7980e8ba
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionPropertyAccess.types
@@ -0,0 +1,44 @@
+=== tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function propertyAccess0() {
+>propertyAccess0 : () => Promise<void>
+
+    y = await x.a;
+>y = await x.a : any
+>y : any
+>await x.a : any
+>x.a : any
+>x : any
+>a : any
+}
+
+async function propertyAccess1() {
+>propertyAccess1 : () => Promise<void>
+
+    y = (await x).a;
+>y = (await x).a : any
+>y : any
+>(await x).a : any
+>(await x) : any
+>await x : any
+>x : any
+>a : any
+}
+
+async function callExpression0() {
+>callExpression0 : () => Promise<void>
+
+    await x(y, z);
+>await x(y, z) : any
+>x(y, z) : any
+>x : any
+>y : any
+>z : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionReturnStatements.js b/tests/baselines/reference/es5-asyncFunctionReturnStatements.js
new file mode 100644
index 00000000000..7574da05a38
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionReturnStatements.js
@@ -0,0 +1,88 @@
+//// [es5-asyncFunctionReturnStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function returnStatement0(): Promise<any> {
+    return;
+}
+
+async function returnStatement1(): Promise<any> {
+    return x;
+}
+
+async function returnStatement2(): Promise<any> {
+    return await x;
+}
+
+async function returnStatement3(): Promise<any> {
+    { return; }
+}
+
+async function returnStatement4(): Promise<any> {
+    await x;
+    { return; }
+}
+
+async function returnStatement5(): Promise<any>{
+    { return await x; }
+}
+
+//// [es5-asyncFunctionReturnStatements.js]
+function returnStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
+function returnStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, x];
+        });
+    });
+}
+function returnStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}
+function returnStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            {
+                return [2 /*return*/];
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function returnStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    {
+                        return [2 /*return*/];
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function returnStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols b/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols
new file mode 100644
index 00000000000..651af244e70
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols
@@ -0,0 +1,56 @@
+=== tests/cases/compiler/es5-asyncFunctionReturnStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionReturnStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionReturnStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionReturnStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionReturnStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionReturnStatements.ts, 0, 26))
+
+async function returnStatement0(): Promise<any> {
+>returnStatement0 : Symbol(returnStatement0, Decl(es5-asyncFunctionReturnStatements.ts, 0, 29))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    return;
+}
+
+async function returnStatement1(): Promise<any> {
+>returnStatement1 : Symbol(returnStatement1, Decl(es5-asyncFunctionReturnStatements.ts, 4, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    return x;
+>x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11))
+}
+
+async function returnStatement2(): Promise<any> {
+>returnStatement2 : Symbol(returnStatement2, Decl(es5-asyncFunctionReturnStatements.ts, 8, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    return await x;
+>x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11))
+}
+
+async function returnStatement3(): Promise<any> {
+>returnStatement3 : Symbol(returnStatement3, Decl(es5-asyncFunctionReturnStatements.ts, 12, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    { return; }
+}
+
+async function returnStatement4(): Promise<any> {
+>returnStatement4 : Symbol(returnStatement4, Decl(es5-asyncFunctionReturnStatements.ts, 16, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    await x;
+>x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11))
+
+    { return; }
+}
+
+async function returnStatement5(): Promise<any>{
+>returnStatement5 : Symbol(returnStatement5, Decl(es5-asyncFunctionReturnStatements.ts, 21, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    { return await x; }
+>x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionReturnStatements.types b/tests/baselines/reference/es5-asyncFunctionReturnStatements.types
new file mode 100644
index 00000000000..486bc5c5566
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionReturnStatements.types
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/es5-asyncFunctionReturnStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function returnStatement0(): Promise<any> {
+>returnStatement0 : () => Promise<any>
+>Promise : Promise<T>
+
+    return;
+}
+
+async function returnStatement1(): Promise<any> {
+>returnStatement1 : () => Promise<any>
+>Promise : Promise<T>
+
+    return x;
+>x : any
+}
+
+async function returnStatement2(): Promise<any> {
+>returnStatement2 : () => Promise<any>
+>Promise : Promise<T>
+
+    return await x;
+>await x : any
+>x : any
+}
+
+async function returnStatement3(): Promise<any> {
+>returnStatement3 : () => Promise<any>
+>Promise : Promise<T>
+
+    { return; }
+}
+
+async function returnStatement4(): Promise<any> {
+>returnStatement4 : () => Promise<any>
+>Promise : Promise<T>
+
+    await x;
+>await x : any
+>x : any
+
+    { return; }
+}
+
+async function returnStatement5(): Promise<any>{
+>returnStatement5 : () => Promise<any>
+>Promise : Promise<T>
+
+    { return await x; }
+>await x : any
+>x : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionSwitchStatements.js b/tests/baselines/reference/es5-asyncFunctionSwitchStatements.js
new file mode 100644
index 00000000000..0af5f8e1c60
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionSwitchStatements.js
@@ -0,0 +1,289 @@
+//// [es5-asyncFunctionSwitchStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function switchStatement0() {
+    switch (x) {
+        case y: a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement1() {
+    switch (await x) {
+        case y: a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement2() {
+    switch (x) {
+        case await y: a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement3() {
+    switch (x) {
+        case y: await a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement4() {
+    switch (x) {
+        case y: a; break;
+        default: await b; break;
+    }
+}
+
+async function switchStatement5() {
+    switch (x) {
+        case y: a; break;
+        case await z: b; break;
+    }
+}
+
+async function switchStatement6() {
+    switch (x) {
+        default: c; break;
+        case await y: a; break;
+        case z: b; break;
+    }
+}
+
+async function switchStatement7() {
+    switch (x) {
+        default: c; break;
+        case y: a; break;
+        case await z: b; break;
+    }
+}
+
+async function switchStatement8() {
+    switch (x) {
+        default: c;
+        case y: a; break;
+        case await z: b; break;
+    }
+}
+
+//// [es5-asyncFunctionSwitchStatements.js]
+function switchStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (x) {
+                case y:
+                    a;
+                    break;
+                default:
+                    b;
+                    break;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function switchStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    switch (_a.sent()) {
+                        case y:
+                            a;
+                            break;
+                        default:
+                            b;
+                            break;
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    switch (_a) {
+                        case _b.sent(): return [3 /*break*/, 2];
+                    }
+                    return [3 /*break*/, 3];
+                case 2:
+                    a;
+                    return [3 /*break*/, 4];
+                case 3:
+                    b;
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    switch (_a) {
+                        case y: return [3 /*break*/, 1];
+                    }
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, a];
+                case 2:
+                    _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    b;
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    switch (_a) {
+                        case y: return [3 /*break*/, 1];
+                    }
+                    return [3 /*break*/, 2];
+                case 1:
+                    a;
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, b];
+                case 3:
+                    _b.sent();
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    switch (_a) {
+                        case y: return [3 /*break*/, 2];
+                    }
+                    return [4 /*yield*/, z];
+                case 1:
+                    switch (_a) {
+                        case _b.sent(): return [3 /*break*/, 3];
+                    }
+                    return [3 /*break*/, 4];
+                case 2:
+                    a;
+                    return [3 /*break*/, 4];
+                case 3:
+                    b;
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement6() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    return [4 /*yield*/, y];
+                case 1:
+                    switch (_a) {
+                        case _b.sent(): return [3 /*break*/, 3];
+                        case z: return [3 /*break*/, 4];
+                    }
+                    return [3 /*break*/, 2];
+                case 2:
+                    c;
+                    return [3 /*break*/, 5];
+                case 3:
+                    a;
+                    return [3 /*break*/, 5];
+                case 4:
+                    b;
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement7() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    switch (_a) {
+                        case y: return [3 /*break*/, 3];
+                    }
+                    return [4 /*yield*/, z];
+                case 1:
+                    switch (_a) {
+                        case _b.sent(): return [3 /*break*/, 4];
+                    }
+                    return [3 /*break*/, 2];
+                case 2:
+                    c;
+                    return [3 /*break*/, 5];
+                case 3:
+                    a;
+                    return [3 /*break*/, 5];
+                case 4:
+                    b;
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
+}
+function switchStatement8() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    switch (_a) {
+                        case y: return [3 /*break*/, 3];
+                    }
+                    return [4 /*yield*/, z];
+                case 1:
+                    switch (_a) {
+                        case _b.sent(): return [3 /*break*/, 4];
+                    }
+                    return [3 /*break*/, 2];
+                case 2:
+                    c;
+                    _b.label = 3;
+                case 3:
+                    a;
+                    return [3 /*break*/, 5];
+                case 4:
+                    b;
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionSwitchStatements.symbols b/tests/baselines/reference/es5-asyncFunctionSwitchStatements.symbols
new file mode 100644
index 00000000000..668339af576
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionSwitchStatements.symbols
@@ -0,0 +1,156 @@
+=== tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 26))
+
+async function switchStatement0() {
+>switchStatement0 : Symbol(switchStatement0, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 29))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        case y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        default: b; break;
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement1() {
+>switchStatement1 : Symbol(switchStatement1, Decl(es5-asyncFunctionSwitchStatements.ts, 7, 1))
+
+    switch (await x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        case y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        default: b; break;
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement2() {
+>switchStatement2 : Symbol(switchStatement2, Decl(es5-asyncFunctionSwitchStatements.ts, 14, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        case await y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        default: b; break;
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement3() {
+>switchStatement3 : Symbol(switchStatement3, Decl(es5-asyncFunctionSwitchStatements.ts, 21, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        case y: await a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        default: b; break;
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement4() {
+>switchStatement4 : Symbol(switchStatement4, Decl(es5-asyncFunctionSwitchStatements.ts, 28, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        case y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        default: await b; break;
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement5() {
+>switchStatement5 : Symbol(switchStatement5, Decl(es5-asyncFunctionSwitchStatements.ts, 35, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        case y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        case await z: b; break;
+>z : Symbol(z, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 17))
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement6() {
+>switchStatement6 : Symbol(switchStatement6, Decl(es5-asyncFunctionSwitchStatements.ts, 42, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        default: c; break;
+>c : Symbol(c, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 26))
+
+        case await y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        case z: b; break;
+>z : Symbol(z, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 17))
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement7() {
+>switchStatement7 : Symbol(switchStatement7, Decl(es5-asyncFunctionSwitchStatements.ts, 50, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        default: c; break;
+>c : Symbol(c, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 26))
+
+        case y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        case await z: b; break;
+>z : Symbol(z, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 17))
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
+
+async function switchStatement8() {
+>switchStatement8 : Symbol(switchStatement8, Decl(es5-asyncFunctionSwitchStatements.ts, 58, 1))
+
+    switch (x) {
+>x : Symbol(x, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 11))
+
+        default: c;
+>c : Symbol(c, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 26))
+
+        case y: a; break;
+>y : Symbol(y, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 14))
+>a : Symbol(a, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 20))
+
+        case await z: b; break;
+>z : Symbol(z, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 17))
+>b : Symbol(b, Decl(es5-asyncFunctionSwitchStatements.ts, 0, 23))
+    }
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionSwitchStatements.types b/tests/baselines/reference/es5-asyncFunctionSwitchStatements.types
new file mode 100644
index 00000000000..694e7cdc89d
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionSwitchStatements.types
@@ -0,0 +1,164 @@
+=== tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function switchStatement0() {
+>switchStatement0 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        case y: a; break;
+>y : any
+>a : any
+
+        default: b; break;
+>b : any
+    }
+}
+
+async function switchStatement1() {
+>switchStatement1 : () => Promise<void>
+
+    switch (await x) {
+>await x : any
+>x : any
+
+        case y: a; break;
+>y : any
+>a : any
+
+        default: b; break;
+>b : any
+    }
+}
+
+async function switchStatement2() {
+>switchStatement2 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        case await y: a; break;
+>await y : any
+>y : any
+>a : any
+
+        default: b; break;
+>b : any
+    }
+}
+
+async function switchStatement3() {
+>switchStatement3 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        case y: await a; break;
+>y : any
+>await a : any
+>a : any
+
+        default: b; break;
+>b : any
+    }
+}
+
+async function switchStatement4() {
+>switchStatement4 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        case y: a; break;
+>y : any
+>a : any
+
+        default: await b; break;
+>await b : any
+>b : any
+    }
+}
+
+async function switchStatement5() {
+>switchStatement5 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        case y: a; break;
+>y : any
+>a : any
+
+        case await z: b; break;
+>await z : any
+>z : any
+>b : any
+    }
+}
+
+async function switchStatement6() {
+>switchStatement6 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        default: c; break;
+>c : any
+
+        case await y: a; break;
+>await y : any
+>y : any
+>a : any
+
+        case z: b; break;
+>z : any
+>b : any
+    }
+}
+
+async function switchStatement7() {
+>switchStatement7 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        default: c; break;
+>c : any
+
+        case y: a; break;
+>y : any
+>a : any
+
+        case await z: b; break;
+>await z : any
+>z : any
+>b : any
+    }
+}
+
+async function switchStatement8() {
+>switchStatement8 : () => Promise<void>
+
+    switch (x) {
+>x : any
+
+        default: c;
+>c : any
+
+        case y: a; break;
+>y : any
+>a : any
+
+        case await z: b; break;
+>await z : any
+>z : any
+>b : any
+    }
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionTryStatements.js b/tests/baselines/reference/es5-asyncFunctionTryStatements.js
new file mode 100644
index 00000000000..c9c5507afa7
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionTryStatements.js
@@ -0,0 +1,334 @@
+//// [es5-asyncFunctionTryStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function tryCatch0() {
+    var x, y;
+    try {
+        x;
+    }
+    catch (e) {
+        y;
+    }
+}
+
+async function tryCatch1() {
+    var x, y;
+    try {
+        await x;
+    }
+    catch (e) {
+        y;
+    }
+}
+
+async function tryCatch2() {
+    var x, y;
+    try {
+        x;
+    }
+    catch (e) {
+        await y;
+    }
+}
+
+async function tryCatch3(): Promise<Function> {
+    var x, y;
+    try {
+        await x;
+    }
+    catch (e) {
+        return () => e;
+    }
+}
+async function tryFinally0() {
+    var x, y;
+    try {
+        x;
+    }
+    finally {
+        y;
+    }
+}
+
+async function tryFinally1() {
+    var x, y;
+    try {
+        await x;
+    }
+    finally {
+        y;
+    }
+}
+
+async function tryFinally2() {
+    var x, y;
+    try {
+        x;
+    }
+    finally {
+        await y;
+    }
+}
+
+async function tryCatchFinally0() {
+    var x, y, z;
+    try {
+        x;
+    }
+    catch (e) {
+        y;
+    }
+    finally {
+        z;
+    }
+}
+
+async function tryCatchFinally1() {
+    var x, y, z;
+    try {
+        await x;
+    }
+    catch (e) {
+        y;
+    }
+    finally {
+        z;
+    }
+}
+
+async function tryCatchFinally2() {
+    var x, y, z;
+    try {
+        x;
+    }
+    catch (e) {
+        await y;
+    }
+    finally {
+        z;
+    }
+}
+
+async function tryCatchFinally3() {
+    var x, y, z;
+    try {
+        x;
+    }
+    catch (e) {
+        y;
+    }
+    finally {
+        await z;
+    }
+}
+
+//// [es5-asyncFunctionTryStatements.js]
+function tryCatch0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y;
+        return __generator(this, function (_a) {
+            try {
+                x;
+            }
+            catch (e) {
+                y;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function tryCatch1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    e_1 = _a.sent();
+                    y;
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryCatch2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, e_2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 1, , 3]);
+                    x;
+                    return [3 /*break*/, 3];
+                case 1:
+                    e_2 = _a.sent();
+                    return [4 /*yield*/, y];
+                case 2:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryCatch3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, e_3;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    e_3 = _a.sent();
+                    return [2 /*return*/, function () { return e_3; }];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryFinally0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y;
+        return __generator(this, function (_a) {
+            try {
+                x;
+            }
+            finally {
+                y;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function tryFinally1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, , 2, 3]);
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    y;
+                    return [7 /*endfinally*/];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryFinally2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, , 1, 3]);
+                    x;
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, y];
+                case 2:
+                    _a.sent();
+                    return [7 /*endfinally*/];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryCatchFinally0() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, z;
+        return __generator(this, function (_a) {
+            try {
+                x;
+            }
+            catch (e) {
+                y;
+            }
+            finally {
+                z;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function tryCatchFinally1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, z, e_4;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, 3, 4]);
+                    return [4 /*yield*/, x];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 2:
+                    e_4 = _a.sent();
+                    y;
+                    return [3 /*break*/, 4];
+                case 3:
+                    z;
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryCatchFinally2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, z, e_5;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 1, 3, 4]);
+                    x;
+                    return [3 /*break*/, 4];
+                case 1:
+                    e_5 = _a.sent();
+                    return [4 /*yield*/, y];
+                case 2:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    z;
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function tryCatchFinally3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var x, y, z, e_6;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 1, 2, 4]);
+                    x;
+                    return [3 /*break*/, 4];
+                case 1:
+                    e_6 = _a.sent();
+                    y;
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, z];
+                case 3:
+                    _a.sent();
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols b/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols
new file mode 100644
index 00000000000..ecf8fbc505b
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols
@@ -0,0 +1,232 @@
+=== tests/cases/compiler/es5-asyncFunctionTryStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionTryStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionTryStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionTryStatements.ts, 0, 26))
+
+async function tryCatch0() {
+>tryCatch0 : Symbol(tryCatch0, Decl(es5-asyncFunctionTryStatements.ts, 0, 29))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 3, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 3, 10))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 3, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 7, 11))
+
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 3, 10))
+    }
+}
+
+async function tryCatch1() {
+>tryCatch1 : Symbol(tryCatch1, Decl(es5-asyncFunctionTryStatements.ts, 10, 1))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 13, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 13, 10))
+
+    try {
+        await x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 13, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 17, 11))
+
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 13, 10))
+    }
+}
+
+async function tryCatch2() {
+>tryCatch2 : Symbol(tryCatch2, Decl(es5-asyncFunctionTryStatements.ts, 20, 1))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 23, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 23, 10))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 23, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 27, 11))
+
+        await y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 23, 10))
+    }
+}
+
+async function tryCatch3(): Promise<Function> {
+>tryCatch3 : Symbol(tryCatch3, Decl(es5-asyncFunctionTryStatements.ts, 30, 1))
+>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 33, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 33, 10))
+
+    try {
+        await x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 33, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 37, 11))
+
+        return () => e;
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 37, 11))
+    }
+}
+async function tryFinally0() {
+>tryFinally0 : Symbol(tryFinally0, Decl(es5-asyncFunctionTryStatements.ts, 40, 1))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 42, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 42, 10))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 42, 7))
+    }
+    finally {
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 42, 10))
+    }
+}
+
+async function tryFinally1() {
+>tryFinally1 : Symbol(tryFinally1, Decl(es5-asyncFunctionTryStatements.ts, 49, 1))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 52, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 52, 10))
+
+    try {
+        await x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 52, 7))
+    }
+    finally {
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 52, 10))
+    }
+}
+
+async function tryFinally2() {
+>tryFinally2 : Symbol(tryFinally2, Decl(es5-asyncFunctionTryStatements.ts, 59, 1))
+
+    var x, y;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 62, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 62, 10))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 62, 7))
+    }
+    finally {
+        await y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 62, 10))
+    }
+}
+
+async function tryCatchFinally0() {
+>tryCatchFinally0 : Symbol(tryCatchFinally0, Decl(es5-asyncFunctionTryStatements.ts, 69, 1))
+
+    var x, y, z;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 72, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 72, 10))
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 72, 13))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 72, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 76, 11))
+
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 72, 10))
+    }
+    finally {
+        z;
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 72, 13))
+    }
+}
+
+async function tryCatchFinally1() {
+>tryCatchFinally1 : Symbol(tryCatchFinally1, Decl(es5-asyncFunctionTryStatements.ts, 82, 1))
+
+    var x, y, z;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 85, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 85, 10))
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 85, 13))
+
+    try {
+        await x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 85, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 89, 11))
+
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 85, 10))
+    }
+    finally {
+        z;
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 85, 13))
+    }
+}
+
+async function tryCatchFinally2() {
+>tryCatchFinally2 : Symbol(tryCatchFinally2, Decl(es5-asyncFunctionTryStatements.ts, 95, 1))
+
+    var x, y, z;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 98, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 98, 10))
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 98, 13))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 98, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 102, 11))
+
+        await y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 98, 10))
+    }
+    finally {
+        z;
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 98, 13))
+    }
+}
+
+async function tryCatchFinally3() {
+>tryCatchFinally3 : Symbol(tryCatchFinally3, Decl(es5-asyncFunctionTryStatements.ts, 108, 1))
+
+    var x, y, z;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 111, 7))
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 111, 10))
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 111, 13))
+
+    try {
+        x;
+>x : Symbol(x, Decl(es5-asyncFunctionTryStatements.ts, 111, 7))
+    }
+    catch (e) {
+>e : Symbol(e, Decl(es5-asyncFunctionTryStatements.ts, 115, 11))
+
+        y;
+>y : Symbol(y, Decl(es5-asyncFunctionTryStatements.ts, 111, 10))
+    }
+    finally {
+        await z;
+>z : Symbol(z, Decl(es5-asyncFunctionTryStatements.ts, 111, 13))
+    }
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionTryStatements.types b/tests/baselines/reference/es5-asyncFunctionTryStatements.types
new file mode 100644
index 00000000000..ab1cd845616
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionTryStatements.types
@@ -0,0 +1,241 @@
+=== tests/cases/compiler/es5-asyncFunctionTryStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function tryCatch0() {
+>tryCatch0 : () => Promise<void>
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        x;
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        y;
+>y : any
+    }
+}
+
+async function tryCatch1() {
+>tryCatch1 : () => Promise<void>
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        await x;
+>await x : any
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        y;
+>y : any
+    }
+}
+
+async function tryCatch2() {
+>tryCatch2 : () => Promise<void>
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        x;
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        await y;
+>await y : any
+>y : any
+    }
+}
+
+async function tryCatch3(): Promise<Function> {
+>tryCatch3 : () => Promise<Function>
+>Promise : Promise<T>
+>Function : Function
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        await x;
+>await x : any
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        return () => e;
+>() => e : () => any
+>e : any
+    }
+}
+async function tryFinally0() {
+>tryFinally0 : () => Promise<void>
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        x;
+>x : any
+    }
+    finally {
+        y;
+>y : any
+    }
+}
+
+async function tryFinally1() {
+>tryFinally1 : () => Promise<void>
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        await x;
+>await x : any
+>x : any
+    }
+    finally {
+        y;
+>y : any
+    }
+}
+
+async function tryFinally2() {
+>tryFinally2 : () => Promise<void>
+
+    var x, y;
+>x : any
+>y : any
+
+    try {
+        x;
+>x : any
+    }
+    finally {
+        await y;
+>await y : any
+>y : any
+    }
+}
+
+async function tryCatchFinally0() {
+>tryCatchFinally0 : () => Promise<void>
+
+    var x, y, z;
+>x : any
+>y : any
+>z : any
+
+    try {
+        x;
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        y;
+>y : any
+    }
+    finally {
+        z;
+>z : any
+    }
+}
+
+async function tryCatchFinally1() {
+>tryCatchFinally1 : () => Promise<void>
+
+    var x, y, z;
+>x : any
+>y : any
+>z : any
+
+    try {
+        await x;
+>await x : any
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        y;
+>y : any
+    }
+    finally {
+        z;
+>z : any
+    }
+}
+
+async function tryCatchFinally2() {
+>tryCatchFinally2 : () => Promise<void>
+
+    var x, y, z;
+>x : any
+>y : any
+>z : any
+
+    try {
+        x;
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        await y;
+>await y : any
+>y : any
+    }
+    finally {
+        z;
+>z : any
+    }
+}
+
+async function tryCatchFinally3() {
+>tryCatchFinally3 : () => Promise<void>
+
+    var x, y, z;
+>x : any
+>y : any
+>z : any
+
+    try {
+        x;
+>x : any
+    }
+    catch (e) {
+>e : any
+
+        y;
+>y : any
+    }
+    finally {
+        await z;
+>await z : any
+>z : any
+    }
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionWhileStatements.js b/tests/baselines/reference/es5-asyncFunctionWhileStatements.js
new file mode 100644
index 00000000000..c85aabb01e3
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionWhileStatements.js
@@ -0,0 +1,353 @@
+//// [es5-asyncFunctionWhileStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function whileStatement0() {
+    while (x) { y; }
+}
+
+async function whileStatement1() {
+    while (await x) { y; }
+}
+
+async function whileStatement2() {
+    while (x) { await y; }
+}
+
+async function whileStatement3() {
+    while (x) { continue; }
+}
+
+async function whileStatement4() {
+    while (await x) { continue; }
+}
+
+async function whileStatement5() {
+    while (x) { await y; continue; }
+}
+
+async function whileStatement6() {
+    while (x) { if (1) continue; await y; }
+}
+
+async function whileStatement7() {
+    A: while (x) { continue A; }
+}
+
+async function whileStatement8() {
+    B: while (await x) { continue B; }
+}
+
+async function whileStatement9() {
+    C: while (x) { await y; continue C; }
+}
+
+async function whileStatement10() {
+    D: while (x) { if (1) continue D; await y; }
+}
+
+async function whileStatement11() {
+    while (x) { break; }
+}
+
+async function whileStatement12() {
+    while (await x) { break; }
+}
+
+async function whileStatement13() {
+    while (x) { await y; break; }
+}
+
+async function whileStatement14() {
+    while (x) { if (1) break; await y; }
+}
+
+async function whileStatement15() {
+    E: while (x) { break E; }
+}
+
+async function whileStatement16() {
+    F: while (await x) { break F; }
+}
+
+async function whileStatement17() {
+    G: while (x) { await y; break G; }
+}
+
+async function whileStatement18() {
+    H: while (x) { if (1) break H; await y; }
+}
+
+//// [es5-asyncFunctionWhileStatements.js]
+function whileStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            while (x) {
+                y;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function whileStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    if (!_a.sent())
+                        return [3 /*break*/, 2];
+                    y;
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            while (x) {
+                continue;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function whileStatement4() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    if (!_a.sent())
+                        return [3 /*break*/, 2];
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement5() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement6() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    if (1)
+                        return [3 /*break*/, 0];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement7() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            A: while (x) {
+                continue A;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function whileStatement8() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    if (!_a.sent())
+                        return [3 /*break*/, 2];
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement9() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement10() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    if (1)
+                        return [3 /*break*/, 0];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement11() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            while (x) {
+                break;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function whileStatement12() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    if (!_a.sent())
+                        return [3 /*break*/, 2];
+                    return [3 /*break*/, 2];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement13() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 2];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement14() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    if (1)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement15() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            E: while (x) {
+                break E;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function whileStatement16() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    if (!_a.sent())
+                        return [3 /*break*/, 2];
+                    return [3 /*break*/, 2];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement17() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 2];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function whileStatement18() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!x)
+                        return [3 /*break*/, 2];
+                    if (1)
+                        return [3 /*break*/, 2];
+                    return [4 /*yield*/, y];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 0];
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionWhileStatements.symbols b/tests/baselines/reference/es5-asyncFunctionWhileStatements.symbols
new file mode 100644
index 00000000000..31c38da4693
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionWhileStatements.symbols
@@ -0,0 +1,152 @@
+=== tests/cases/compiler/es5-asyncFunctionWhileStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+>z : Symbol(z, Decl(es5-asyncFunctionWhileStatements.ts, 0, 17))
+>a : Symbol(a, Decl(es5-asyncFunctionWhileStatements.ts, 0, 20))
+>b : Symbol(b, Decl(es5-asyncFunctionWhileStatements.ts, 0, 23))
+>c : Symbol(c, Decl(es5-asyncFunctionWhileStatements.ts, 0, 26))
+
+async function whileStatement0() {
+>whileStatement0 : Symbol(whileStatement0, Decl(es5-asyncFunctionWhileStatements.ts, 0, 29))
+
+    while (x) { y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement1() {
+>whileStatement1 : Symbol(whileStatement1, Decl(es5-asyncFunctionWhileStatements.ts, 4, 1))
+
+    while (await x) { y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement2() {
+>whileStatement2 : Symbol(whileStatement2, Decl(es5-asyncFunctionWhileStatements.ts, 8, 1))
+
+    while (x) { await y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement3() {
+>whileStatement3 : Symbol(whileStatement3, Decl(es5-asyncFunctionWhileStatements.ts, 12, 1))
+
+    while (x) { continue; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement4() {
+>whileStatement4 : Symbol(whileStatement4, Decl(es5-asyncFunctionWhileStatements.ts, 16, 1))
+
+    while (await x) { continue; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement5() {
+>whileStatement5 : Symbol(whileStatement5, Decl(es5-asyncFunctionWhileStatements.ts, 20, 1))
+
+    while (x) { await y; continue; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement6() {
+>whileStatement6 : Symbol(whileStatement6, Decl(es5-asyncFunctionWhileStatements.ts, 24, 1))
+
+    while (x) { if (1) continue; await y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement7() {
+>whileStatement7 : Symbol(whileStatement7, Decl(es5-asyncFunctionWhileStatements.ts, 28, 1))
+
+    A: while (x) { continue A; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement8() {
+>whileStatement8 : Symbol(whileStatement8, Decl(es5-asyncFunctionWhileStatements.ts, 32, 1))
+
+    B: while (await x) { continue B; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement9() {
+>whileStatement9 : Symbol(whileStatement9, Decl(es5-asyncFunctionWhileStatements.ts, 36, 1))
+
+    C: while (x) { await y; continue C; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement10() {
+>whileStatement10 : Symbol(whileStatement10, Decl(es5-asyncFunctionWhileStatements.ts, 40, 1))
+
+    D: while (x) { if (1) continue D; await y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement11() {
+>whileStatement11 : Symbol(whileStatement11, Decl(es5-asyncFunctionWhileStatements.ts, 44, 1))
+
+    while (x) { break; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement12() {
+>whileStatement12 : Symbol(whileStatement12, Decl(es5-asyncFunctionWhileStatements.ts, 48, 1))
+
+    while (await x) { break; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement13() {
+>whileStatement13 : Symbol(whileStatement13, Decl(es5-asyncFunctionWhileStatements.ts, 52, 1))
+
+    while (x) { await y; break; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement14() {
+>whileStatement14 : Symbol(whileStatement14, Decl(es5-asyncFunctionWhileStatements.ts, 56, 1))
+
+    while (x) { if (1) break; await y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement15() {
+>whileStatement15 : Symbol(whileStatement15, Decl(es5-asyncFunctionWhileStatements.ts, 60, 1))
+
+    E: while (x) { break E; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement16() {
+>whileStatement16 : Symbol(whileStatement16, Decl(es5-asyncFunctionWhileStatements.ts, 64, 1))
+
+    F: while (await x) { break F; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+}
+
+async function whileStatement17() {
+>whileStatement17 : Symbol(whileStatement17, Decl(es5-asyncFunctionWhileStatements.ts, 68, 1))
+
+    G: while (x) { await y; break G; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
+
+async function whileStatement18() {
+>whileStatement18 : Symbol(whileStatement18, Decl(es5-asyncFunctionWhileStatements.ts, 72, 1))
+
+    H: while (x) { if (1) break H; await y; }
+>x : Symbol(x, Decl(es5-asyncFunctionWhileStatements.ts, 0, 11))
+>y : Symbol(y, Decl(es5-asyncFunctionWhileStatements.ts, 0, 14))
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionWhileStatements.types b/tests/baselines/reference/es5-asyncFunctionWhileStatements.types
new file mode 100644
index 00000000000..2410befa043
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionWhileStatements.types
@@ -0,0 +1,186 @@
+=== tests/cases/compiler/es5-asyncFunctionWhileStatements.ts ===
+declare var x, y, z, a, b, c;
+>x : any
+>y : any
+>z : any
+>a : any
+>b : any
+>c : any
+
+async function whileStatement0() {
+>whileStatement0 : () => Promise<void>
+
+    while (x) { y; }
+>x : any
+>y : any
+}
+
+async function whileStatement1() {
+>whileStatement1 : () => Promise<void>
+
+    while (await x) { y; }
+>await x : any
+>x : any
+>y : any
+}
+
+async function whileStatement2() {
+>whileStatement2 : () => Promise<void>
+
+    while (x) { await y; }
+>x : any
+>await y : any
+>y : any
+}
+
+async function whileStatement3() {
+>whileStatement3 : () => Promise<void>
+
+    while (x) { continue; }
+>x : any
+}
+
+async function whileStatement4() {
+>whileStatement4 : () => Promise<void>
+
+    while (await x) { continue; }
+>await x : any
+>x : any
+}
+
+async function whileStatement5() {
+>whileStatement5 : () => Promise<void>
+
+    while (x) { await y; continue; }
+>x : any
+>await y : any
+>y : any
+}
+
+async function whileStatement6() {
+>whileStatement6 : () => Promise<void>
+
+    while (x) { if (1) continue; await y; }
+>x : any
+>1 : number
+>await y : any
+>y : any
+}
+
+async function whileStatement7() {
+>whileStatement7 : () => Promise<void>
+
+    A: while (x) { continue A; }
+>A : any
+>x : any
+>A : any
+}
+
+async function whileStatement8() {
+>whileStatement8 : () => Promise<void>
+
+    B: while (await x) { continue B; }
+>B : any
+>await x : any
+>x : any
+>B : any
+}
+
+async function whileStatement9() {
+>whileStatement9 : () => Promise<void>
+
+    C: while (x) { await y; continue C; }
+>C : any
+>x : any
+>await y : any
+>y : any
+>C : any
+}
+
+async function whileStatement10() {
+>whileStatement10 : () => Promise<void>
+
+    D: while (x) { if (1) continue D; await y; }
+>D : any
+>x : any
+>1 : number
+>D : any
+>await y : any
+>y : any
+}
+
+async function whileStatement11() {
+>whileStatement11 : () => Promise<void>
+
+    while (x) { break; }
+>x : any
+}
+
+async function whileStatement12() {
+>whileStatement12 : () => Promise<void>
+
+    while (await x) { break; }
+>await x : any
+>x : any
+}
+
+async function whileStatement13() {
+>whileStatement13 : () => Promise<void>
+
+    while (x) { await y; break; }
+>x : any
+>await y : any
+>y : any
+}
+
+async function whileStatement14() {
+>whileStatement14 : () => Promise<void>
+
+    while (x) { if (1) break; await y; }
+>x : any
+>1 : number
+>await y : any
+>y : any
+}
+
+async function whileStatement15() {
+>whileStatement15 : () => Promise<void>
+
+    E: while (x) { break E; }
+>E : any
+>x : any
+>E : any
+}
+
+async function whileStatement16() {
+>whileStatement16 : () => Promise<void>
+
+    F: while (await x) { break F; }
+>F : any
+>await x : any
+>x : any
+>F : any
+}
+
+async function whileStatement17() {
+>whileStatement17 : () => Promise<void>
+
+    G: while (x) { await y; break G; }
+>G : any
+>x : any
+>await y : any
+>y : any
+>G : any
+}
+
+async function whileStatement18() {
+>whileStatement18 : () => Promise<void>
+
+    H: while (x) { if (1) break H; await y; }
+>H : any
+>x : any
+>1 : number
+>H : any
+>await y : any
+>y : any
+}
diff --git a/tests/baselines/reference/es5-asyncFunctionWithStatements.errors.txt b/tests/baselines/reference/es5-asyncFunctionWithStatements.errors.txt
new file mode 100644
index 00000000000..560612bc81e
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionWithStatements.errors.txt
@@ -0,0 +1,58 @@
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(4,5): error TS1300: 'with' statements are not allowed in an async function block.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(4,11): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(10,5): error TS1300: 'with' statements are not allowed in an async function block.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(10,11): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(16,5): error TS1300: 'with' statements are not allowed in an async function block.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(16,11): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(24,5): error TS1300: 'with' statements are not allowed in an async function block.
+tests/cases/compiler/es5-asyncFunctionWithStatements.ts(24,11): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+
+
+==== tests/cases/compiler/es5-asyncFunctionWithStatements.ts (8 errors) ====
+    declare var x, y, z, a, b, c;
+    
+    async function withStatement0() {
+        with (x) {
+        ~~~~
+!!! error TS1300: 'with' statements are not allowed in an async function block.
+              ~
+!!! error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+            y;
+        }
+    }
+    
+    async function withStatement1() {
+        with (await x) {
+        ~~~~
+!!! error TS1300: 'with' statements are not allowed in an async function block.
+              ~~~~~~~
+!!! error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+            y;
+        }
+    }
+    
+    async function withStatement2() {
+        with (x) {
+        ~~~~
+!!! error TS1300: 'with' statements are not allowed in an async function block.
+              ~
+!!! error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+            a;
+            await y;
+            b;
+        }
+    }
+    
+    async function withStatement3() {
+        with (x) {
+        ~~~~
+!!! error TS1300: 'with' statements are not allowed in an async function block.
+              ~
+!!! error TS2410: All symbols within a 'with' block will be resolved to 'any'.
+            with (z) {
+                a;
+                await y;
+                b;
+            }
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-asyncFunctionWithStatements.js b/tests/baselines/reference/es5-asyncFunctionWithStatements.js
new file mode 100644
index 00000000000..25ed4df5c11
--- /dev/null
+++ b/tests/baselines/reference/es5-asyncFunctionWithStatements.js
@@ -0,0 +1,118 @@
+//// [es5-asyncFunctionWithStatements.ts]
+declare var x, y, z, a, b, c;
+
+async function withStatement0() {
+    with (x) {
+        y;
+    }
+}
+
+async function withStatement1() {
+    with (await x) {
+        y;
+    }
+}
+
+async function withStatement2() {
+    with (x) {
+        a;
+        await y;
+        b;
+    }
+}
+
+async function withStatement3() {
+    with (x) {
+        with (z) {
+            a;
+            await y;
+            b;
+        }
+    }
+}
+
+//// [es5-asyncFunctionWithStatements.js]
+function withStatement0() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            with (x) {
+                y;
+            }
+            return [2 /*return*/];
+        });
+    });
+}
+function withStatement1() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, x];
+                case 1:
+                    _a = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    with (_a) {
+                        y;
+                    }
+                    _b.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function withStatement2() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = x;
+                    _b.label = 1;
+                case 1: with (_a) {
+                    a;
+                    return [4 /*yield*/, y];
+                }
+                case 2:
+                    with (_a) {
+                        _b.sent();
+                        b;
+                    }
+                    _b.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function withStatement3() {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _a = x;
+                    _c.label = 1;
+                case 1:
+                    with (_a) {
+                        _b = z;
+                    }
+                    _c.label = 2;
+                case 2: with (_a) {
+                    with (_b) {
+                        a;
+                        return [4 /*yield*/, y];
+                    }
+                }
+                case 3:
+                    with (_a) {
+                        with (_b) {
+                            _c.sent();
+                            b;
+                        }
+                    }
+                    _c.label = 4;
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
new file mode 100644
index 00000000000..0fcd8897018
--- /dev/null
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -0,0 +1,83 @@
+//// [tests/cases/compiler/es5-importHelpersAsyncFunctions.ts] ////
+
+//// [external.ts]
+export async function foo() {
+}
+
+//// [script.ts]
+async function foo() {
+}
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+export declare function __generator(body: Function): any;
+
+//// [external.js]
+"use strict";
+var tslib_1 = require("tslib");
+function foo() {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
+exports.foo = foo;
+//// [script.js]
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (sent[0] === 1) throw sent[1]; return sent[1]; }, trys: [], stack: [] }, sent, f;
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (1) {
+            if (_.done) switch (op[0]) {
+                case 0: return { value: void 0, done: true };
+                case 1: case 6: throw op[1];
+                case 2: return { value: op[1], done: true };
+            }
+            try {
+                switch (f = 1, op[0]) {
+                    case 0: case 1: sent = op; break;
+                    case 4: return _.label++, { value: op[1], done: false };
+                    case 7: op = _.stack.pop(), _.trys.pop(); continue;
+                    default:
+                        var r = _.trys.length > 0 && _.trys[_.trys.length - 1];
+                        if (!r && (op[0] === 6 || op[0] === 2)) { _.done = 1; continue; }
+                        if (op[0] === 3 && (!r || (op[1] > r[0] && op[1] < r[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < r[1]) { _.label = r[1], sent = op; break; }
+                        if (r && _.label < r[2]) { _.label = r[2], _.stack.push(op); break; }
+                        if (r[2]) { _.stack.pop(); }
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) { op = [6, e]; }
+            finally { f = 0, sent = void 0; }
+        }
+    }
+    return {
+        next: function (v) { return step([0, v]); },
+        "throw": function (v) { return step([1, v]); },
+        "return": function (v) { return step([2, v]); }
+    };
+};
+function foo() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/];
+        });
+    });
+}
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols b/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols
new file mode 100644
index 00000000000..89660cea722
--- /dev/null
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols
@@ -0,0 +1,58 @@
+=== tests/cases/compiler/external.ts ===
+export async function foo() {
+>foo : Symbol(foo, Decl(external.ts, 0, 0))
+}
+
+=== tests/cases/compiler/script.ts ===
+async function foo() {
+>foo : Symbol(foo, Decl(script.ts, 0, 0))
+}
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+export declare function __generator(body: Function): any;
+>__generator : Symbol(__generator, Decl(tslib.d.ts, --, --))
+>body : Symbol(body, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.types b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
new file mode 100644
index 00000000000..9ceeee92bc8
--- /dev/null
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
@@ -0,0 +1,58 @@
+=== tests/cases/compiler/external.ts ===
+export async function foo() {
+>foo : () => Promise<void>
+}
+
+=== tests/cases/compiler/script.ts ===
+async function foo() {
+>foo : () => Promise<void>
+}
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
+export declare function __generator(body: Function): any;
+>__generator : (body: Function) => any
+>body : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/es5-system.js b/tests/baselines/reference/es5-system.js
index 9cf5ea87f1f..1d59a05dcfa 100644
--- a/tests/baselines/reference/es5-system.js
+++ b/tests/baselines/reference/es5-system.js
@@ -15,13 +15,13 @@ export default class A
 
 
 //// [es5-system.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var A;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             A = (function () {
                 function A() {
                 }
@@ -32,5 +32,5 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("default", A);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index abc98aa77d6..592c5d63ffe 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -15,14 +15,14 @@ export class A
 
 
 //// [es5-umd2.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var A = (function () {
         function A() {
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 27e2e72aab4..7ac960d1d39 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -15,14 +15,14 @@ export default class A
 
 
 //// [es5-umd3.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var A = (function () {
         function A() {
diff --git a/tests/baselines/reference/es5-umd4.js b/tests/baselines/reference/es5-umd4.js
index 8ac60343759..b4034058dcd 100644
--- a/tests/baselines/reference/es5-umd4.js
+++ b/tests/baselines/reference/es5-umd4.js
@@ -17,14 +17,14 @@ export = A;
 
 
 //// [es5-umd4.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var A = (function () {
         function A() {
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
index f51ff27a412..936f381628d 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
@@ -6,9 +6,13 @@ tests/cases/compiler/es5ModuleInternalNamedImports.ts(27,5): error TS1194: Expor
 tests/cases/compiler/es5ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in a namespace.
 tests/cases/compiler/es5ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in a namespace.
 tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(31,25): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(32,20): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(33,32): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(35,16): error TS2307: Cannot find module 'M3'.
 
 
-==== tests/cases/compiler/es5ModuleInternalNamedImports.ts (8 errors) ====
+==== tests/cases/compiler/es5ModuleInternalNamedImports.ts (12 errors) ====
     
     export module M {
         // variable
@@ -55,5 +59,17 @@ tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Expor
         export {M_A as a};
         ~~~~~~~~~~~~~~~~~~
 !!! error TS1194: Export declarations are not permitted in a namespace.
+        import * as M2 from "M2";
+                            ~~~~
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
+        import M4 from "M4";
+                       ~~~~
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
+        export import M5 = require("M5");
+                                   ~~~~
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
     }
+    import M3 from "M3";
+                   ~~~~
+!!! error TS2307: Cannot find module 'M3'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index e8963b7db40..2fcbd5a53d8 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -29,7 +29,11 @@ export module M {
     export {M_F as f};
     export {M_E as e};
     export {M_A as a};
+    import * as M2 from "M2";
+    import M4 from "M4";
+    export import M5 = require("M5");
 }
+import M3 from "M3";
 
 
 //// [es5ModuleInternalNamedImports.js]
@@ -60,6 +64,5 @@ define(["require", "exports"], function (require, exports) {
         var M_E = M.M_E;
         // alias
         M.M_A = M_M;
-        // Reexports
     })(M = exports.M || (exports.M = {}));
 });
diff --git a/tests/baselines/reference/es5andes6module.js b/tests/baselines/reference/es5andes6module.js
index ae8c0ad87e2..148464a212a 100644
--- a/tests/baselines/reference/es5andes6module.js
+++ b/tests/baselines/reference/es5andes6module.js
@@ -23,4 +23,3 @@ var A = (function () {
     };
     return A;
 }());
-export default A;
diff --git a/tests/baselines/reference/es6-sourcemap-amd.js.map b/tests/baselines/reference/es6-sourcemap-amd.js.map
index 5c62572f0a6..d5229e3a28c 100644
--- a/tests/baselines/reference/es6-sourcemap-amd.js.map
+++ b/tests/baselines/reference/es6-sourcemap-amd.js.map
@@ -1,2 +1,2 @@
 //// [es6-sourcemap-amd.js.map]
-{"version":3,"file":"es6-sourcemap-amd.js","sourceRoot":"","sources":["es6-sourcemap-amd.ts"],"names":[],"mappings":"AACA;IAEI;IAGA,CAAC;IAEM,CAAC;QAEJ,MAAM,CAAC,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAAA"}
\ No newline at end of file
+{"version":3,"file":"es6-sourcemap-amd.js","sourceRoot":"","sources":["es6-sourcemap-amd.ts"],"names":[],"mappings":"AACA;IAEI;IAGA,CAAC;IAEM,CAAC;QAEJ,MAAM,CAAC,EAAE,CAAC;IACd,CAAC;CACJ"}
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt b/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt
index db329263ffa..a01507e964b 100644
--- a/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt
+++ b/tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt
@@ -75,17 +75,10 @@ sourceFile:es6-sourcemap-amd.ts
 2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0)
 ---
 >>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >
-2 >}
-1 >Emitted(7, 1) Source(13, 1) + SourceIndex(0)
-2 >Emitted(7, 2) Source(13, 2) + SourceIndex(0)
+  >}
+1 >Emitted(7, 2) Source(13, 2) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=es6-sourcemap-amd.js.map1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-1->Emitted(8, 1) Source(13, 2) + SourceIndex(0)
----
\ No newline at end of file
+>>>//# sourceMappingURL=es6-sourcemap-amd.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index 1270ee1df53..ed5ce4aacb8 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -14,14 +14,14 @@ export class A
 }
 
 //// [es6-umd2.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     class A {
         constructor() {
diff --git a/tests/baselines/reference/es6ClassTest.js b/tests/baselines/reference/es6ClassTest.js
index 365e91321a4..a722cce1670 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -113,9 +113,9 @@ var Foo = (function (_super) {
     }
     Foo.prototype.bar = function () { return 0; };
     Foo.prototype.boo = function (x) { return x; };
-    Foo.statVal = 0;
     return Foo;
 }(Bar));
+Foo.statVal = 0;
 var f = new Foo();
 //class GetSetMonster {
 //  // attack(target) {
diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js
index 86ff00121cf..1881e6b8c87 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -283,9 +283,9 @@ var Statics = (function () {
     Statics.baz = function () {
         return "";
     };
-    Statics.foo = 1;
     return Statics;
 }());
+Statics.foo = 1;
 var stat = new Statics();
 var ImplementsInterface = (function () {
     function ImplementsInterface() {
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index 94bc5d9281f..5add71a06f2 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -25,7 +25,7 @@ exports.foo = foo = 3;
 var baz = 3;
 exports.baz = baz;
 exports.quux = baz;
-exports.baz = exports.quux = baz = 4;
+exports.quux = exports.baz = baz = 4;
 var buzz = 10;
 exports.buzz = buzz;
 exports.buzz = buzz += 3;
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 6e9589acc9a..49a8a7e435a 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -295,7 +295,6 @@ var class_2 = require("class");
 exports.a9 = class_2.a;
 var class_module_2 = require("class-module");
 exports.a0 = class_module_2.a;
-// export-star
 __export(require("variable"));
 __export(require("interface-variable"));
 __export(require("module"));
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.js b/tests/baselines/reference/es6ModuleInternalNamedImports.js
index 98504601d02..22d15b9fd61 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports.js
@@ -55,11 +55,4 @@ export var M;
     var M_E = M.M_E;
     // alias
     M.M_A = M_M;
-    // Reexports
-    export { M_V as v };
-    export { M_C as c };
-    export { M_M as m };
-    export { M_F as f };
-    export { M_E as e };
-    export { M_A as a };
 })(M || (M = {}));
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.js b/tests/baselines/reference/es6ModuleInternalNamedImports2.js
index 98226a1e52b..35eabc9a65e 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports2.js
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.js
@@ -59,11 +59,4 @@ export var M;
     M.M_A = M_M;
 })(M || (M = {}));
 (function (M) {
-    // Reexports
-    export { M_V as v };
-    export { M_C as c };
-    export { M_M as m };
-    export { M_F as f };
-    export { M_E as e };
-    export { M_A as a };
 })(M || (M = {}));
diff --git a/tests/baselines/reference/es6modulekindWithES5Target.js b/tests/baselines/reference/es6modulekindWithES5Target.js
index cdd1bb018d4..560e401b312 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target.js
@@ -27,26 +27,27 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-export var C = (function () {
+var C = (function () {
     function C() {
         this.p = 1;
     }
     C.prototype.method = function () { };
-    C.s = 0;
     return C;
 }());
+C.s = 0;
 export { C as C2 };
-export var D = (function () {
+var D = (function () {
     function D() {
         this.p = 1;
     }
     D.prototype.method = function () { };
-    D.s = 0;
-    D = __decorate([
-        foo
-    ], D);
     return D;
 }());
+D.s = 0;
+D = __decorate([
+    foo
+], D);
+export { D };
 export { D as D2 };
 var E = (function () {
     function E() {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target11.js b/tests/baselines/reference/es6modulekindWithES5Target11.js
index 67196ba2054..1268c33697a 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target11.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target11.js
@@ -22,10 +22,10 @@ var C = (function () {
     }
     C.x = function () { return C.y; };
     C.prototype.method = function () { };
-    C.y = 1;
-    C = __decorate([
-        foo
-    ], C);
     return C;
 }());
+C.y = 1;
+C = __decorate([
+    foo
+], C);
 export default C;
diff --git a/tests/baselines/reference/es6modulekindWithES5Target2.js b/tests/baselines/reference/es6modulekindWithES5Target2.js
index 4cfe8bc6d4b..7025ac05105 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target2.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target2.js
@@ -13,7 +13,6 @@ var C = (function () {
         this.p = 1;
     }
     C.prototype.method = function () { };
-    C.s = 0;
     return C;
 }());
-export default C;
+C.s = 0;
diff --git a/tests/baselines/reference/es6modulekindWithES5Target3.js b/tests/baselines/reference/es6modulekindWithES5Target3.js
index bfe55d2a573..72e6f97a900 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target3.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target3.js
@@ -21,10 +21,10 @@ var D = (function () {
         this.p = 1;
     }
     D.prototype.method = function () { };
-    D.s = 0;
-    D = __decorate([
-        foo
-    ], D);
     return D;
 }());
+D.s = 0;
+D = __decorate([
+    foo
+], D);
 export default D;
diff --git a/tests/baselines/reference/es6modulekindWithES5Target6.js b/tests/baselines/reference/es6modulekindWithES5Target6.js
index d305c60e54e..6f8de9db816 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target6.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target6.js
@@ -11,15 +11,15 @@ export default function f3(d = 0) {
 
 
 //// [es6modulekindWithES5Target6.js]
-export function f1(d) {
+function f1(d) {
     if (d === void 0) { d = 0; }
 }
-export function f2() {
+function f2() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         arg[_i - 0] = arguments[_i];
     }
 }
-export default function f3(d) {
+function f3(d) {
     if (d === void 0) { d = 0; }
 }
diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js
index c1b5fe8ae09..b326dbf1ecc 100644
--- a/tests/baselines/reference/escapedIdentifiers.js
+++ b/tests/baselines/reference/escapedIdentifiers.js
@@ -143,7 +143,7 @@ var moduleType1;
 (function (moduleType1) {
 })(moduleType1 || (moduleType1 = {}));
 var moduleType\u0032;
-(function (moduleType2) {
+(function (moduleType\u0032) {
 })(moduleType\u0032 || (moduleType\u0032 = {}));
 moduleType1.baz1 = 3;
 moduleType\u0031.baz1 = 3;
diff --git a/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError1.js b/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError1.js
index cf97360b23a..8c6d9e011f6 100644
--- a/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError1.js
+++ b/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError1.js
@@ -37,17 +37,17 @@ var s;
 "" + (Math.pow(-t1, t2) - t1);
 "" + (Math.pow(-++t1, t2) - t1);
 "" + (Math.pow(-t1++, t2) - t1);
-"" + (Math.pow(!t1, Math.pow(t2, --t1)));
-"" + (Math.pow(typeof t1, Math.pow(t2, t1)));
+"" + Math.pow(!t1, Math.pow(t2, --t1));
+"" + Math.pow(typeof t1, Math.pow(t2, t1));
 "" + (Math.pow(-t1, t2) - t1) + (Math.pow(-t1, t2) - t1);
 "" + (Math.pow(-++t1, t2) - t1) + (Math.pow(-++t1, t2) - t1);
 "" + (Math.pow(-t1++, t2) - t1) + (Math.pow(-t1++, t2) - t1);
-"" + (Math.pow(!t1, Math.pow(t2, --t1))) + (Math.pow(!t1, Math.pow(t2, --t1)));
-"" + (Math.pow(typeof t1, Math.pow(t2, t1))) + (Math.pow(typeof t1, Math.pow(t2, t1)));
+"" + Math.pow(!t1, Math.pow(t2, --t1)) + Math.pow(!t1, Math.pow(t2, --t1));
+"" + Math.pow(typeof t1, Math.pow(t2, t1)) + Math.pow(typeof t1, Math.pow(t2, t1));
 "" + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + (1 + Math.pow(typeof t1, Math.pow(t2, t1)));
-(Math.pow(-t1, t2) - t1) + " hello world " + (Math.pow(-t1, t2) - t1);
-(Math.pow(-++t1, t2) - t1) + " hello world " + (Math.pow(-++t1, t2) - t1);
-(Math.pow(-t1++, t2) - t1) + " hello world " + (Math.pow(-t1++, t2) - t1);
-(Math.pow(!t1, Math.pow(t2, --t1))) + " hello world " + (Math.pow(!t1, Math.pow(t2, --t1)));
-(Math.pow(typeof t1, Math.pow(t2, t1))) + " hello world " + (Math.pow(typeof t1, Math.pow(t2, t1)));
-(1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " hello world " + (1 + Math.pow(typeof t1, Math.pow(t2, t1)));
+Math.pow(-t1, t2) - t1 + " hello world " + (Math.pow(-t1, t2) - t1);
+Math.pow(-++t1, t2) - t1 + " hello world " + (Math.pow(-++t1, t2) - t1);
+Math.pow(-t1++, t2) - t1 + " hello world " + (Math.pow(-t1++, t2) - t1);
+Math.pow(!t1, Math.pow(t2, --t1)) + " hello world " + Math.pow(!t1, Math.pow(t2, --t1));
+Math.pow(typeof t1, Math.pow(t2, t1)) + " hello world " + Math.pow(typeof t1, Math.pow(t2, t1));
+1 + Math.pow(typeof t1, Math.pow(t2, t1)) + " hello world " + (1 + Math.pow(typeof t1, Math.pow(t2, t1)));
diff --git a/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError2.js b/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError2.js
index 486c07f8af6..9ae2d727078 100644
--- a/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError2.js
+++ b/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError2.js
@@ -37,18 +37,18 @@ var s;
 "hello " + (Math.pow(-t1, t2) - t1);
 "hello " + (Math.pow(-++t1, t2) - t1);
 "hello " + (Math.pow(-t1++, t2) - t1);
-"hello " + (Math.pow(!t1, Math.pow(t2, --t1)));
-"hello " + (Math.pow(typeof t1, Math.pow(t2, t1)));
+"hello " + Math.pow(!t1, Math.pow(t2, --t1));
+"hello " + Math.pow(typeof t1, Math.pow(t2, t1));
 "hello " + (1 + Math.pow(typeof t1, Math.pow(t2, t1)));
 "hello " + (Math.pow(-t1, t2) - t1) + (Math.pow(-t1, t2) - t1);
 "hello " + (Math.pow(-++t1, t2) - t1) + (Math.pow(-++t1, t2) - t1);
 "hello " + (Math.pow(-t1++, t2) - t1) + (Math.pow(-t1++, t2) - t1);
-"hello " + (Math.pow(!t1, Math.pow(t2, --t1))) + (Math.pow(!t1, Math.pow(t2, --t1)));
-"hello " + (Math.pow(typeof t1, Math.pow(t2, t1))) + (Math.pow(typeof t1, Math.pow(t2, t1)));
+"hello " + Math.pow(!t1, Math.pow(t2, --t1)) + Math.pow(!t1, Math.pow(t2, --t1));
+"hello " + Math.pow(typeof t1, Math.pow(t2, t1)) + Math.pow(typeof t1, Math.pow(t2, t1));
 "hello " + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + (1 + Math.pow(typeof t1, Math.pow(t2, t1)));
 "hello " + (Math.pow(-t1, t2) - t1) + " hello world " + (Math.pow(-t1, t2) - t1);
 "hello " + (Math.pow(-++t1, t2) - t1) + " hello world " + (Math.pow(-++t1, t2) - t1);
 "hello " + (Math.pow(-t1++, t2) - t1) + " hello world " + (Math.pow(-t1++, t2) - t1);
-"hello " + (Math.pow(!t1, Math.pow(t2, --t1))) + " hello world " + (Math.pow(!t1, Math.pow(t2, --t1)));
-"hello " + (Math.pow(typeof t1, Math.pow(t2, t1))) + " hello world " + (Math.pow(typeof t1, Math.pow(t2, t1)));
+"hello " + Math.pow(!t1, Math.pow(t2, --t1)) + " hello world " + Math.pow(!t1, Math.pow(t2, --t1));
+"hello " + Math.pow(typeof t1, Math.pow(t2, t1)) + " hello world " + Math.pow(typeof t1, Math.pow(t2, t1));
 "hello " + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " hello world " + (1 + Math.pow(typeof t1, Math.pow(t2, t1)));
diff --git a/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError3.js b/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError3.js
index 1641c2bbb80..c3711ac281c 100644
--- a/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError3.js
+++ b/tests/baselines/reference/exponentiationOperatorInTemplateStringWithSyntaxError3.js
@@ -33,21 +33,21 @@ var t2 = 10;
 var s;
 // Error: early syntax error using ES7 SimpleUnaryExpression on left-hand side without ()
 // With TemplateTail
-(Math.pow(-t1, t2) - t1) + " world";
-(Math.pow(-++t1, t2) - t1) + " world";
-(Math.pow(-t1++, t2) - t1) + " world";
-(Math.pow(!t1, Math.pow(t2, --t1))) + " world";
-(Math.pow(typeof t1, Math.pow(t2, t1))) + " world";
-(1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " world";
+Math.pow(-t1, t2) - t1 + " world";
+Math.pow(-++t1, t2) - t1 + " world";
+Math.pow(-t1++, t2) - t1 + " world";
+Math.pow(!t1, Math.pow(t2, --t1)) + " world";
+Math.pow(typeof t1, Math.pow(t2, t1)) + " world";
+1 + Math.pow(typeof t1, Math.pow(t2, t1)) + " world";
 "" + (Math.pow(-t1, t2) - t1) + (Math.pow(-t1, t2) - t1) + " world";
 "" + (Math.pow(-++t1, t2) - t1) + (Math.pow(-++t1, t2) - t1) + " world";
 "" + (Math.pow(-t1++, t2) - t1) + (Math.pow(-t1++, t2) - t1) + " world";
-"" + (Math.pow(!t1, Math.pow(t2, --t1))) + (Math.pow(!t1, Math.pow(t2, --t1))) + " world";
-"" + (Math.pow(typeof t1, Math.pow(t2, t1))) + (Math.pow(typeof t1, Math.pow(t2, t1))) + " world";
+"" + Math.pow(!t1, Math.pow(t2, --t1)) + Math.pow(!t1, Math.pow(t2, --t1)) + " world";
+"" + Math.pow(typeof t1, Math.pow(t2, t1)) + Math.pow(typeof t1, Math.pow(t2, t1)) + " world";
 "" + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " world";
-(Math.pow(-t1, t2) - t1) + " hello world " + (Math.pow(-t1, t2) - t1) + " !!";
-(Math.pow(-++t1, t2) - t1) + " hello world " + (Math.pow(-++t1, t2) - t1) + " !!";
-(Math.pow(-t1++, t2) - t1) + " hello world " + (Math.pow(-t1++, t2) - t1) + " !!";
-(Math.pow(!t1, Math.pow(t2, --t1))) + " hello world " + (Math.pow(!t1, Math.pow(t2, --t1))) + " !!";
-(Math.pow(typeof t1, Math.pow(t2, t1))) + " hello world " + (Math.pow(typeof t1, Math.pow(t2, t1))) + " !!";
-(1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " hello world " + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " !!";
+Math.pow(-t1, t2) - t1 + " hello world " + (Math.pow(-t1, t2) - t1) + " !!";
+Math.pow(-++t1, t2) - t1 + " hello world " + (Math.pow(-++t1, t2) - t1) + " !!";
+Math.pow(-t1++, t2) - t1 + " hello world " + (Math.pow(-t1++, t2) - t1) + " !!";
+Math.pow(!t1, Math.pow(t2, --t1)) + " hello world " + Math.pow(!t1, Math.pow(t2, --t1)) + " !!";
+Math.pow(typeof t1, Math.pow(t2, t1)) + " hello world " + Math.pow(typeof t1, Math.pow(t2, t1)) + " !!";
+1 + Math.pow(typeof t1, Math.pow(t2, t1)) + " hello world " + (1 + Math.pow(typeof t1, Math.pow(t2, t1))) + " !!";
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index 39fd33b0131..c9c3ffa80c4 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -18,5 +18,5 @@ function x() {
 exports.x = x;
 //// [foo2.js]
 "use strict";
-var foo1 = require('./foo1');
+var foo1 = require("./foo1");
 module.exports = foo1.x;
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index 334f33fdc34..a469e90b619 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -22,10 +22,10 @@ function x() {
 exports.x = x;
 //// [foo2.js]
 "use strict";
-var foo1 = require('./foo1');
+var foo1 = require("./foo1");
 var x = foo1.x;
 module.exports = x;
 //// [foo3.js]
 "use strict";
-var foo2 = require('./foo2');
+var foo2 = require("./foo2");
 var x = foo2(); // should be boolean
diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js
index 60cf4e7eef5..02b34715483 100644
--- a/tests/baselines/reference/exportAssignTypes.js
+++ b/tests/baselines/reference/exportAssignTypes.js
@@ -85,17 +85,17 @@ function x(a) {
 module.exports = x;
 //// [consumer.js]
 "use strict";
-var iString = require('./expString');
+var iString = require("./expString");
 var v1 = iString;
-var iNumber = require('./expNumber');
+var iNumber = require("./expNumber");
 var v2 = iNumber;
-var iBoolean = require('./expBoolean');
+var iBoolean = require("./expBoolean");
 var v3 = iBoolean;
-var iArray = require('./expArray');
+var iArray = require("./expArray");
 var v4 = iArray;
-var iObject = require('./expObject');
+var iObject = require("./expObject");
 var v5 = iObject;
-var iAny = require('./expAny');
+var iAny = require("./expAny");
 var v6 = iAny;
-var iGeneric = require('./expGeneric');
+var iGeneric = require("./expGeneric");
 var v7 = iGeneric;
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.js b/tests/baselines/reference/exportAssignmentCircularModules.js
index 73338840590..696c746f104 100644
--- a/tests/baselines/reference/exportAssignmentCircularModules.js
+++ b/tests/baselines/reference/exportAssignmentCircularModules.js
@@ -32,7 +32,7 @@ define(["require", "exports", "./foo_2"], function (require, exports, foo2) {
     return Foo;
 });
 //// [foo_0.js]
-define(["require", "exports", './foo_1'], function (require, exports, foo1) {
+define(["require", "exports", "./foo_1"], function (require, exports, foo1) {
     "use strict";
     var Foo;
     (function (Foo) {
diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js
index ecd9d5adf4d..a9ea4bf5eda 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -53,7 +53,6 @@ var Bbb;
         return SomeType;
     }());
     Bbb.SomeType = SomeType;
-     // this line causes the nullref
 })(Bbb || (Bbb = {}));
 var a;
 
diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js
index af0f1b9eca1..419fecf42e0 100644
--- a/tests/baselines/reference/exportDeclaredModule.js
+++ b/tests/baselines/reference/exportDeclaredModule.js
@@ -17,5 +17,5 @@ var x: number = foo1.b();
 module.exports = M1;
 //// [foo2.js]
 "use strict";
-var foo1 = require('./foo1');
+var foo1 = require("./foo1");
 var x = foo1.b();
diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js
index 681c3ca4c19..9138da0d33d 100644
--- a/tests/baselines/reference/exportEqualCallable.js
+++ b/tests/baselines/reference/exportEqualCallable.js
@@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) {
     return server;
 });
 //// [exportEqualCallable_1.js]
-define(["require", "exports", 'exportEqualCallable_0'], function (require, exports, connect) {
+define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) {
     "use strict";
     connect();
 });
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index 653c7052153..aa715b7d9f2 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -28,7 +28,7 @@ define(["require", "exports"], function (require, exports) {
     return server;
 });
 //// [exportEqualErrorType_1.js]
-define(["require", "exports", 'exportEqualErrorType_0'], function (require, exports, connect) {
+define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
     "use strict";
     connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
 });
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index b25ef1d3083..39074e10372 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -28,5 +28,5 @@ module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 "use strict";
 ///<reference path='exportEqualMemberMissing_0.ts'/>
-var connect = require('./exportEqualMemberMissing_0');
+var connect = require("./exportEqualMemberMissing_0");
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
diff --git a/tests/baselines/reference/exportEqualsAmd.js b/tests/baselines/reference/exportEqualsAmd.js
index a0f029589d6..385012a6e0f 100644
--- a/tests/baselines/reference/exportEqualsAmd.js
+++ b/tests/baselines/reference/exportEqualsAmd.js
@@ -4,6 +4,6 @@ export = { ["hi"]: "there" };
 //// [exportEqualsAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    return (_a = {}, _a["hi"] = "there", _a);
+    return _a = {}, _a["hi"] = "there", _a;
     var _a;
 });
diff --git a/tests/baselines/reference/exportEqualsUmd.js b/tests/baselines/reference/exportEqualsUmd.js
index 615cc2cddbe..cd4c99f504d 100644
--- a/tests/baselines/reference/exportEqualsUmd.js
+++ b/tests/baselines/reference/exportEqualsUmd.js
@@ -2,15 +2,15 @@
 export = { ["hi"]: "there" };
 
 //// [exportEqualsUmd.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
-    return (_a = {}, _a["hi"] = "there", _a);
+    return _a = {}, _a["hi"] = "there", _a;
     var _a;
 });
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index eb0623efced..8f785282080 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -27,12 +27,12 @@ define(["require", "exports"], function (require, exports) {
     return Widget1;
 });
 //// [exporter.js]
-define(["require", "exports", './w1'], function (require, exports, w) {
+define(["require", "exports", "./w1"], function (require, exports, w) {
     "use strict";
     exports.w = w;
 });
 //// [consumer.js]
-define(["require", "exports", './exporter'], function (require, exports, e) {
+define(["require", "exports", "./exporter"], function (require, exports, e) {
     "use strict";
     function w() {
         return new e.w();
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 6a0bf61459e..345d2a6885a 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -25,7 +25,7 @@ define(["require", "exports", "exportImportMultipleFiles_math"], function (requi
     exports.math.add(3, 4); // OK
 });
 //// [exportImportMultipleFiles_userCode.js]
-define(["require", "exports", './exportImportMultipleFiles_library'], function (require, exports, lib) {
+define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) {
     "use strict";
     lib.math.add(3, 4); // Shouldnt be error
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js
index 2a8e2022c95..6c44da04802 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js
@@ -35,13 +35,13 @@ export let h1: D = new D;
 
 
 //// [exportNonInitializedVariablesSystem.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var a, b, c, d, A, e, f, B, C, a1, b1, c1, d1, D, e1, f1, g1, h1;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             let;
             A = (function () {
                 function A() {
@@ -69,5 +69,5 @@ System.register([], function(exports_1, context_1) {
             exports_1("g1", g1 = new D);
             exports_1("h1", h1 = new D);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 772f63205b6..5cbf6d381b0 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -35,14 +35,14 @@ export let h1: D = new D;
 
 
 //// [exportNonInitializedVariablesUMD.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var ;
     let;
diff --git a/tests/baselines/reference/exportStarForValues10.js b/tests/baselines/reference/exportStarForValues10.js
index d37ca3304f3..3da80002780 100644
--- a/tests/baselines/reference/exportStarForValues10.js
+++ b/tests/baselines/reference/exportStarForValues10.js
@@ -13,46 +13,48 @@ export * from "file1";
 var x = 1;
 
 //// [file0.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var v;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("v", v = 1);
         }
-    }
+    };
 });
 //// [file1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file2.js]
-System.register(["file0"], function(exports_1, context_1) {
+System.register(["file0"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x;
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default") exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default")
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (file0_1_1) {
                 exportStar_1(file0_1_1);
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             x = 1;
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/exportStarForValues6.js b/tests/baselines/reference/exportStarForValues6.js
index 8c31f6b4d16..dd17fbcddb2 100644
--- a/tests/baselines/reference/exportStarForValues6.js
+++ b/tests/baselines/reference/exportStarForValues6.js
@@ -9,24 +9,24 @@ export * from "file1"
 export var x = 1;
 
 //// [file1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file2.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = 1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.js b/tests/baselines/reference/exportStarForValuesInSystem.js
index 49c6877377a..4fbd3ca0066 100644
--- a/tests/baselines/reference/exportStarForValuesInSystem.js
+++ b/tests/baselines/reference/exportStarForValuesInSystem.js
@@ -9,24 +9,24 @@ export * from "file1"
 var x = 1;
 
 //// [file1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file2.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             x = 1;
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index 56b54d2821f..6532603b73c 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var foo1 = require('./foo1');
+var foo1 = require("./foo1");
 var x = foo1;
 var y = (function (_super) {
     __extends(y, _super);
diff --git a/tests/baselines/reference/externModule.js b/tests/baselines/reference/externModule.js
index d5684ea1f46..a7f58e4f30c 100644
--- a/tests/baselines/reference/externModule.js
+++ b/tests/baselines/reference/externModule.js
@@ -48,7 +48,6 @@ module;
         }
         return XDate;
     }());
-    exports.XDate = XDate;
 }
 var d = new XDate();
 d.getDay();
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index e621b7c930b..47958ddd2ff 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -57,7 +57,7 @@ define(["require", "exports"], function (require, exports) {
     return D;
 });
 //// [externalModuleAssignToVar_core.js]
-define(["require", "exports", 'externalModuleAssignToVar_core_require', 'externalModuleAssignToVar_core_require2', 'externalModuleAssignToVar_ext'], function (require, exports, ext, ext2, ext3) {
+define(["require", "exports", "externalModuleAssignToVar_core_require", "externalModuleAssignToVar_core_require2", "externalModuleAssignToVar_ext"], function (require, exports, ext, ext2, ext3) {
     "use strict";
     var y1 = ext;
     y1 = ext; // ok
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index c4b8556bb80..e327e17160e 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -25,7 +25,7 @@ var C = (function () {
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
 "use strict";
-var a = require('./externalModuleExportingGenericClass_file0');
+var a = require("./externalModuleExportingGenericClass_file0");
 var v; // this should report error
 var v2 = (new a()).foo;
 var v3 = (new a()).foo;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index 4193a71cc90..b50845024f4 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -57,7 +57,7 @@ exports.x = 1;
 //// [f2.js]
 "use strict";
 // all mutations below are illegal and should be fixed
-var stuff = require('./f1');
+var stuff = require("./f1");
 var n = 'baz';
 stuff.x = 0;
 stuff['x'] = 1;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index cdcc0842b08..8a25c3711b2 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -16,7 +16,7 @@ define(["require", "exports"], function (require, exports) {
     ;
 });
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js]
-define(["require", "exports", 'externalModuleReferenceOfImportDeclarationWithExportModifier_0'], function (require, exports, file1) {
+define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) {
     "use strict";
     exports.file1 = file1;
     exports.file1.foo();
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index 1b5d41d8be4..5b0de7324ac 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -26,6 +26,6 @@ exports.foo = foo;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
-var file1 = require('./externalModuleRefernceResolutionOrderInImportDeclaration_file1');
+var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1");
 file1.foo();
 file1.bar();
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 20dc7fa8dda..40b320ee37e 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -25,5 +25,5 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
-var x = require('./foo');
+var x = require("./foo");
 x.Y; // .ts should be picked
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 13560105544..44753c9f16d 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -26,5 +26,5 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
-var x = require('./foo');
+var x = require("./foo");
 x.X; // .ts should be picked
diff --git a/tests/baselines/reference/fixSignatureCaching.errors.txt b/tests/baselines/reference/fixSignatureCaching.errors.txt
new file mode 100644
index 00000000000..6677afc174a
--- /dev/null
+++ b/tests/baselines/reference/fixSignatureCaching.errors.txt
@@ -0,0 +1,2200 @@
+tests/cases/conformance/fixSignatureCaching.ts(3,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/fixSignatureCaching.ts(9,10): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(284,10): error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(293,10): error TS2339: Property 'FALLBACK_PHONE' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(294,10): error TS2339: Property 'FALLBACK_TABLET' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(295,10): error TS2339: Property 'FALLBACK_MOBILE' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(327,74): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(366,10): error TS2339: Property 'findMatch' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(384,10): error TS2339: Property 'findMatches' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(404,10): error TS2339: Property 'getVersionStr' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(405,26): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(428,10): error TS2339: Property 'getVersion' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(429,28): error TS2339: Property 'getVersionStr' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(430,31): error TS2339: Property 'prepareVersionNo' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(440,10): error TS2339: Property 'prepareVersionNo' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(455,10): error TS2339: Property 'isMobileFallback' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(456,21): error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(457,18): error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(460,10): error TS2339: Property 'isTabletFallback' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(461,21): error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(464,10): error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(471,23): error TS2339: Property 'findMatch' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(471,38): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(478,22): error TS2339: Property 'findMatch' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(478,37): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(486,18): error TS2339: Property 'isMobileFallback' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(487,39): error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+tests/cases/conformance/fixSignatureCaching.ts(489,37): error TS2339: Property 'FALLBACK_MOBILE' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(492,51): error TS2339: Property 'FALLBACK_PHONE' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(495,52): error TS2339: Property 'FALLBACK_TABLET' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(498,25): error TS2339: Property 'isTabletFallback' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(499,48): error TS2339: Property 'FALLBACK_TABLET' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(508,10): error TS2339: Property 'mobileGrade' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(633,10): error TS2339: Property 'detectOS' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(634,21): error TS2339: Property 'findMatch' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(634,36): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(635,18): error TS2339: Property 'findMatch' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(635,33): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(638,10): error TS2339: Property 'getDeviceSmallerSide' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(639,16): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(639,38): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(640,13): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(641,13): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(704,18): error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(734,18): error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(783,18): error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(805,46): error TS2339: Property 'findMatch' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(805,61): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(828,47): error TS2339: Property 'findMatches' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(828,64): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(845,39): error TS2339: Property 'detectOS' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(869,25): error TS2339: Property 'getVersion' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(890,25): error TS2339: Property 'getVersionStr' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(912,36): error TS2339: Property 'findMatches' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(912,53): error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(941,33): error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+tests/cases/conformance/fixSignatureCaching.ts(952,42): error TS2339: Property 'mobileGrade' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(959,16): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(959,42): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(960,22): error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+tests/cases/conformance/fixSignatureCaching.ts(961,57): error TS2339: Property 'getDeviceSmallerSide' does not exist on type '{}'.
+tests/cases/conformance/fixSignatureCaching.ts(964,22): error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+tests/cases/conformance/fixSignatureCaching.ts(968,18): error TS2339: Property '_impl' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+tests/cases/conformance/fixSignatureCaching.ts(970,18): error TS2339: Property 'version' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+tests/cases/conformance/fixSignatureCaching.ts(974,4): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/fixSignatureCaching.ts(975,16): error TS2304: Cannot find name 'module'.
+tests/cases/conformance/fixSignatureCaching.ts(975,42): error TS2304: Cannot find name 'module'.
+tests/cases/conformance/fixSignatureCaching.ts(976,37): error TS2304: Cannot find name 'module'.
+tests/cases/conformance/fixSignatureCaching.ts(977,23): error TS2304: Cannot find name 'define'.
+tests/cases/conformance/fixSignatureCaching.ts(977,48): error TS2304: Cannot find name 'define'.
+tests/cases/conformance/fixSignatureCaching.ts(978,16): error TS2304: Cannot find name 'define'.
+tests/cases/conformance/fixSignatureCaching.ts(979,23): error TS2304: Cannot find name 'window'.
+tests/cases/conformance/fixSignatureCaching.ts(980,37): error TS2304: Cannot find name 'window'.
+
+
+==== tests/cases/conformance/fixSignatureCaching.ts (73 errors) ====
+    // Repro from #10697
+    
+    (function (define, undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    define(function () {
+    ~~~~~~~~~~~~~~~~~~~~
+        'use strict';
+    ~~~~~~~~~~~~~~~~~
+    
+    
+        var impl = {};
+    ~~~~~~~~~~~~~~~~~~
+    
+    
+        impl.mobileDetectRules = {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+        "phones": {
+    ~~~~~~~~~~~~~~~
+            "iPhone": "\\biPhone\\b|\\biPod\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Asus": "Asus.*Galaxy|PadFone.*Mobile",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NokiaLumia": "Lumia [0-9]{3,4}",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Palm": "PalmSource|Palm",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Alcatel": "Alcatel",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Nintendo": "Nintendo 3DS",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Amoi": "Amoi",
+    ~~~~~~~~~~~~~~~~~~~~~~~
+            "INQ": "INQ",
+    ~~~~~~~~~~~~~~~~~~~~~
+            "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        },
+    ~~~~~~
+        "tablets": {
+    ~~~~~~~~~~~~~~~~
+            "iPad": "iPad|iPad.*Mobile",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BlackBerryTablet": "PlayBook|RIM Tablet",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "IRUTablet": "M702pro",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NokiaLumiaTablet": "Lumia 2520",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "FlyTablet": "IQ310|Fly Vision",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NecTablet": "\\bN-06D|\\bN-08D",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PantechTablet": "Pantech.*P4100",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NabiTablet": "Android.*\\bNabi",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PlaystationTablet": "Playstation.*(Portable|Vita)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "GalapadTablet": "Android.*\\bG1\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DPSTablet": "DPS Dream 9|DPS Dual 7",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iMobileTablet": "i-mobile i-note",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TolinoTablet": "tolino tab [0-9.]+|tolino shine",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AMPETablet": "Android.* A78 ",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TecnoTablet": "TECNO P9",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "FX2Tablet": "FX2 PAD7|FX2 PAD10",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "CaptivaTablet": "CAPTIVA PAD",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "JaytechTablet": "TPC-PA762",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "UbislateTablet": "UbiSlate[\\s]?7C",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PocketBookTablet": "Pocketbook",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "KocasoTablet": "\\b(TB-1207)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Hudl": "Hudl HT7S3|Hudl 2",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TelstraTablet": "T-Hub2",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        },
+    ~~~~~~
+        "oss": {
+    ~~~~~~~~~~~~
+            "AndroidOS": "Android",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MeeGoOS": "MeeGo",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MaemoOS": "Maemo",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "webOS": "webOS|hpwOS",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "badaOS": "\\bBada\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BREWOS": "BREW"
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+        },
+    ~~~~~~
+        "uas": {
+    ~~~~~~~~~~~~
+            "Vivaldi": "Vivaldi",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Dolfin": "\\bDolfin\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Skyfire": "Skyfire",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Edge": "Mobile Safari\/[.0-9]* Edge",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "IE": "IEMobile|MSIEMobile",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Bolt": "bolt",
+    ~~~~~~~~~~~~~~~~~~~~~~~
+            "TeaShark": "teashark",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Blazer": "Blazer",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Tizen": "Tizen",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+            "UCBrowser": "UC.*Browser|UCWEB",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "baiduboxapp": "baiduboxapp",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "baidubrowser": "baidubrowser",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DiigoBrowser": "DiigoBrowser",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Puffin": "Puffin",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Mercury": "\\bMercury\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "ObigoBrowser": "Obigo",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NetFront": "NF-Browser",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        },
+    ~~~~~~
+        "props": {
+    ~~~~~~~~~~~~~~
+            "Mobile": "Mobile\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Build": "Build\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Version": "Version\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "VendorID": "VendorID\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iPad": "iPad.*CPU[a-z ]+[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iPhone": "iPhone.*CPU[a-z ]+[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iPod": "iPod.*CPU[a-z ]+[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Kindle": "Kindle\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Chrome": [
+    ~~~~~~~~~~~~~~~~~~~
+                "Chrome\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "CriOS\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "CrMo\/[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "Coast": [
+    ~~~~~~~~~~~~~~~~~~
+                "Coast\/[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "Dolfin": "Dolfin\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Firefox": "Firefox\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Fennec": "Fennec\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Edge": "Edge\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "IE": [
+    ~~~~~~~~~~~~~~~
+                "IEMobile\/[VER];",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "IEMobile [VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "MSIE [VER];",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Trident\/[0-9.]+;.*rv:[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "NetFront": "NetFront\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "NokiaBrowser": "NokiaBrowser\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Opera": [
+    ~~~~~~~~~~~~~~~~~~
+                " OPR\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Opera Mini\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Version\/[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "Opera Mini": "Opera Mini\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Opera Mobi": "Version\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "UC Browser": "UC Browser[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MQQBrowser": "MQQBrowser\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MicroMessenger": "MicroMessenger\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "baiduboxapp": "baiduboxapp\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "baidubrowser": "baidubrowser\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Iron": "Iron\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Safari": [
+    ~~~~~~~~~~~~~~~~~~~
+                "Version\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Safari\/[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "Skyfire": "Skyfire\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Tizen": "Tizen\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Webkit": "webkit[ \/][VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "PaleMoon": "PaleMoon\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Gecko": "Gecko\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Trident": "Trident\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Presto": "Presto\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Goanna": "Goanna\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "iOS": " \\bi?OS\\b [VER][ ;]{1}",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Android": "Android [VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "BlackBerry": [
+    ~~~~~~~~~~~~~~~~~~~~~~~
+                "BlackBerry[\\w]+\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "BlackBerry.*Version\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Version\/[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "BREW": "BREW [VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Java": "Java\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Windows Phone OS": [
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Windows Phone OS [VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Windows Phone [VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "Windows Phone": "Windows Phone [VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Windows CE": "Windows CE\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Windows NT": "Windows NT [VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Symbian": [
+    ~~~~~~~~~~~~~~~~~~~~
+                "SymbianOS\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "Symbian\/[VER]"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ],
+    ~~~~~~~~~~
+            "webOS": [
+    ~~~~~~~~~~~~~~~~~~
+                "webOS\/[VER]",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                "hpwOS\/[VER];"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ]
+    ~~~~~~~~~
+        },
+    ~~~~~~
+        "utils": {
+    ~~~~~~~~~~~~~~
+            "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "DesktopMode": "WPDesktop",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "TV": "SonyDTV|HbbTV",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "WebKit": "(webkit)[ \/]([\\w.]+)",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            "Watch": "SM-V700"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+        }
+    ~~~~~
+    };
+    ~~
+    
+    
+        // following patterns come from http://detectmobilebrowsers.com/
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        impl.detectMobileBrowsers = {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+            fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            tabletPattern: /android|ipad|playbook|silk/i
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        var hasOwnProp = Object.prototype.hasOwnProperty,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            isArray;
+    ~~~~~~~~~~~~~~~~
+    
+    
+        impl.FALLBACK_PHONE = 'UnknownPhone';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_PHONE' does not exist on type '{}'.
+        impl.FALLBACK_TABLET = 'UnknownTablet';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_TABLET' does not exist on type '{}'.
+        impl.FALLBACK_MOBILE = 'UnknownMobile';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_MOBILE' does not exist on type '{}'.
+    
+    
+        isArray = ('isArray' in Array) ?
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; };
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+        function equalIC(a, b) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            return a != null && b != null && a.toLowerCase() === b.toLowerCase();
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        }
+    ~~~~~
+    
+    
+        function containsIC(array, value) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            var valueLC, i, len = array.length;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            if (!len || !value) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return false;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            valueLC = value.toLowerCase();
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            for (i = 0; i < len; ++i) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (valueLC === array[i].toLowerCase()) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    return true;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            return false;
+    ~~~~~~~~~~~~~~~~~~~~~
+        }
+    ~~~~~
+    
+    
+        function convertPropsToRegExp(object) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            for (var key in object) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (hasOwnProp.call(object, key)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    object[key] = new RegExp(object[key], 'i');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+        }
+    ~~~~~
+    
+    
+        (function init() {
+    ~~~~~~~~~~~~~~~~~~~~~~
+            var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                                             ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+            for (key in mobileDetectRules.props) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (hasOwnProp.call(mobileDetectRules.props, key)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    values = mobileDetectRules.props[key];
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    if (!isArray(values)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        values = [values];
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    }
+    ~~~~~~~~~~~~~~~~~
+                    len = values.length;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    for (i = 0; i < len; ++i) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        value = values[i];
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        verPos = value.indexOf('[VER]');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        if (verPos >= 0) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                            value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        }
+    ~~~~~~~~~~~~~~~~~~~~~
+                        values[i] = new RegExp(value, 'i');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    }
+    ~~~~~~~~~~~~~~~~~
+                    mobileDetectRules.props[key] = values;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            convertPropsToRegExp(mobileDetectRules.oss);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            convertPropsToRegExp(mobileDetectRules.phones);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            convertPropsToRegExp(mobileDetectRules.tablets);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            convertPropsToRegExp(mobileDetectRules.uas);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            convertPropsToRegExp(mobileDetectRules.utils);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+            // copy some patterns to oss0 which are tested first (see issue#15)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            mobileDetectRules.oss0 = {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            };
+    ~~~~~~~~~~
+        }());
+    ~~~~~~~~~
+    
+    
+        /**
+    ~~~~~~~
+         * Test userAgent string against a set of rules and find the first matched key.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {Object} rules (key is String, value is RegExp)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @returns {String|null} the matched key if found, otherwise <tt>null</tt>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @private
+    ~~~~~~~~~~~~~~~
+         */
+    ~~~~~~~
+        impl.findMatch = function(rules, userAgent) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~
+!!! error TS2339: Property 'findMatch' does not exist on type '{}'.
+            for (var key in rules) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (hasOwnProp.call(rules, key)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    if (rules[key].test(userAgent)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        return key;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    }
+    ~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            return null;
+    ~~~~~~~~~~~~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        /**
+    ~~~~~~~
+         * Test userAgent string against a set of rules and return an array of matched keys.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {Object} rules (key is String, value is RegExp)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @returns {Array} an array of matched keys, may be empty when there is no match, but not <tt>null</tt>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @private
+    ~~~~~~~~~~~~~~~
+         */
+    ~~~~~~~
+        impl.findMatches = function(rules, userAgent) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~
+!!! error TS2339: Property 'findMatches' does not exist on type '{}'.
+            var result = [];
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+            for (var key in rules) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (hasOwnProp.call(rules, key)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    if (rules[key].test(userAgent)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        result.push(key);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    }
+    ~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            return result;
+    ~~~~~~~~~~~~~~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        /**
+    ~~~~~~~
+         * Check the version of the given property in the User-Agent.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *
+    ~~~~~~
+         * @param {String} propertyName
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {String} userAgent
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @return {String} version or <tt>null</tt> if version not found
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @private
+    ~~~~~~~~~~~~~~~
+         */
+    ~~~~~~~
+        impl.getVersionStr = function (propertyName, userAgent) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~
+!!! error TS2339: Property 'getVersionStr' does not exist on type '{}'.
+            var props = impl.mobileDetectRules.props, patterns, i, len, match;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                             ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+            if (hasOwnProp.call(props, propertyName)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                patterns = props[propertyName];
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                len = patterns.length;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                for (i = 0; i < len; ++i) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    match = patterns[i].exec(userAgent);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    if (match !== null) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        return match[1];
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    }
+    ~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            return null;
+    ~~~~~~~~~~~~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        /**
+    ~~~~~~~
+         * Check the version of the given property in the User-Agent.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *
+    ~~~~~~
+         * @param {String} propertyName
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {String} userAgent
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @return {Number} version or <tt>NaN</tt> if version not found
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @private
+    ~~~~~~~~~~~~~~~
+         */
+    ~~~~~~~
+        impl.getVersion = function (propertyName, userAgent) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~
+!!! error TS2339: Property 'getVersion' does not exist on type '{}'.
+            var version = impl.getVersionStr(propertyName, userAgent);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'getVersionStr' does not exist on type '{}'.
+            return version ? impl.prepareVersionNo(version) : NaN;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                  ~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'prepareVersionNo' does not exist on type '{}'.
+        };
+    ~~~~~~
+    
+    
+        /**
+    ~~~~~~~
+         * Prepare the version number.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *
+    ~~~~~~
+         * @param {String} version
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @return {Number} the version number as a floating number
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @private
+    ~~~~~~~~~~~~~~~
+         */
+    ~~~~~~~
+        impl.prepareVersionNo = function (version) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'prepareVersionNo' does not exist on type '{}'.
+            var numbers;
+    ~~~~~~~~~~~~~~~~~~~~
+    
+    
+            numbers = version.split(/[a-z._ \/\-]/i);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            if (numbers.length === 1) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                version = numbers[0];
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            if (numbers.length > 1) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                version = numbers[0] + '.';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                numbers.shift();
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                version += numbers.join('');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            return Number(version);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        impl.isMobileFallback = function (userAgent) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'isMobileFallback' does not exist on type '{}'.
+            return impl.detectMobileBrowsers.fullPattern.test(userAgent) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+                impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4));
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+        };
+    ~~~~~~
+    
+    
+        impl.isTabletFallback = function (userAgent) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'isTabletFallback' does not exist on type '{}'.
+            return impl.detectMobileBrowsers.tabletPattern.test(userAgent);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'detectMobileBrowsers' does not exist on type '{}'.
+        };
+    ~~~~~~
+    
+    
+        impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+            if (cache.mobile !== undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return;
+    ~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+            var phone, tablet, phoneSized;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+            // first check for stronger tablet rules, then phone (see issue#5)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          ~~~~~~~~~
+!!! error TS2339: Property 'findMatch' does not exist on type '{}'.
+                                         ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+            if (tablet) {
+    ~~~~~~~~~~~~~~~~~~~~~
+                cache.mobile = cache.tablet = tablet;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                cache.phone = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return; // unambiguously identified as tablet
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+    
+    
+            phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         ~~~~~~~~~
+!!! error TS2339: Property 'findMatch' does not exist on type '{}'.
+                                        ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+            if (phone) {
+    ~~~~~~~~~~~~~~~~~~~~
+                cache.mobile = cache.phone = phone;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                cache.tablet = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return; // unambiguously identified as phone
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+    
+    
+            // our rules haven't found a match -> try more general fallback rules
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            if (impl.isMobileFallback(userAgent)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'isMobileFallback' does not exist on type '{}'.
+                phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                          ~~~~~~~~~~~~
+!!! error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+                if (phoneSized === undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    cache.mobile = impl.FALLBACK_MOBILE;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                        ~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_MOBILE' does not exist on type '{}'.
+                    cache.tablet = cache.phone = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                } else if (phoneSized) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    cache.mobile = cache.phone = impl.FALLBACK_PHONE;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                      ~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_PHONE' does not exist on type '{}'.
+                    cache.tablet = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                } else {
+    ~~~~~~~~~~~~~~~~~~~~
+                    cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                       ~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_TABLET' does not exist on type '{}'.
+                    cache.phone = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+            } else if (impl.isTabletFallback(userAgent)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                            ~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'isTabletFallback' does not exist on type '{}'.
+                cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                   ~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'FALLBACK_TABLET' does not exist on type '{}'.
+                cache.phone = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            } else {
+    ~~~~~~~~~~~~~~~~
+                // not mobile at all!
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                cache.mobile = cache.tablet = cache.phone = null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        // t is a reference to a MobileDetect instance
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        impl.mobileGrade = function (t) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~
+!!! error TS2339: Property 'mobileGrade' does not exist on type '{}'.
+            // impl note:
+    ~~~~~~~~~~~~~~~~~~~~~
+            // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            // When changes are made in Mobile_Detect.php, copy this method and replace:
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            //     $this-> / t.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            //     self::MOBILE_GRADE_(.) / '$1'
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            //     , self::VERSION_TYPE_FLOAT / (nothing)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            //     isIOS() / os('iOS')
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            //     [reg] / (nothing)   <-- jsdelivr complaining about unescaped unicode character U+00AE
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            var $isMobile = t.mobile() !== null;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+            if (
+    ~~~~~~~~~~~~
+                // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.os('iOS') && t.version('iPad')>=4.3 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.os('iOS') && t.version('iPhone')>=3.1 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.os('iOS') && t.version('iPod')>=3.1 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.version('Android')>2.1 && t.is('Webkit') ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('Windows Phone OS')>=7.0 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Blackberry 7 - Tested on BlackBerry Torch 9810
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.is('BlackBerry') && t.version('BlackBerry')>=6.0 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.match('Playbook.*Tablet') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Palm WebOS 3.0  - Tested on HP TouchPad
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.match('hp.*TouchPad') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Firefox Mobile (12 Beta) - Tested on Android 2.3 device
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.is('Firefox') && t.version('Firefox')>=12 ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Chrome for Android - Tested on Android 4.0, 4.1 device
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Skyfire 4.1 - Tested on Android 2.3 device
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Opera Mobile 11.5-12: Tested on Android 2.3
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Meego 1.2 - Tested on Nokia 950 and N9
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.is('MeeGoOS') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Tizen (pre-release) - Tested on early hardware
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.is('Tizen') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // @todo: more tests here!
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.is('Dolfin') && t.version('Bada')>=2.0 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // UC Browser - Tested on Android 2.3 device
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.match('Kindle Fire') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    t.is('Kindle') && t.version('Kindle')>=3.0 ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.is('AndroidOS') && t.is('NookTablet') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('Chrome')>=11 && !$isMobile ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('Safari')>=5.0 && !$isMobile ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('Firefox')>=4.0 && !$isMobile ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('MSIE')>=7.0 && !$isMobile ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // @reference: http://my.opera.com/community/openweb/idopera/
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('Opera')>=10 && !$isMobile
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                ){
+    ~~~~~~~~~~~~~~
+                return 'A';
+    ~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+    
+    
+            if (
+    ~~~~~~~~~~~~
+                t.os('iOS') && t.version('iPad')<4.3 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.os('iOS') && t.version('iPhone')<3.1 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.os('iOS') && t.version('iPod')<3.1 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 &&
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    (t.version('Android')>=2.3 || t.is('iOS')) ) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                // @todo: report this (tested on Nokia N71)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('Opera Mobi')>=11 && t.is('SymbianOS')
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ){
+    ~~~~~~~~~~~~~~
+                return 'B';
+    ~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+    
+    
+            if (
+    ~~~~~~~~~~~~
+            // Blackberry 4.x - Tested on the Curve 8330
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.version('BlackBerry')<5.0 ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+                ){
+    ~~~~~~~~~~~~~~
+                return 'C';
+    ~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+    
+    
+            //All older smartphone platforms and featurephones - Any device that doesn't support media queries
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            //will receive the basic, C grade experience.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            return 'C';
+    ~~~~~~~~~~~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        impl.detectOS = function (ua) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~
+!!! error TS2339: Property 'detectOS' does not exist on type '{}'.
+            return impl.findMatch(impl.mobileDetectRules.oss0, ua) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        ~~~~~~~~~
+!!! error TS2339: Property 'findMatch' does not exist on type '{}'.
+                                       ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+                impl.findMatch(impl.mobileDetectRules.oss, ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~~~
+!!! error TS2339: Property 'findMatch' does not exist on type '{}'.
+                                    ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+        };
+    ~~~~~~
+    
+    
+        impl.getDeviceSmallerSide = function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'getDeviceSmallerSide' does not exist on type '{}'.
+            return window.screen.width < window.screen.height ?
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+                                         ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+                window.screen.width :
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+                window.screen.height;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+        };
+    ~~~~~~
+    
+    
+        /**
+    ~~~~~~~
+         * Constructor for MobileDetect object.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * <br>
+    ~~~~~~~~~~~
+         * Such an object will keep a reference to the given user-agent string and cache most of the detect queries.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * <div style="background-color: #d9edf7; border: 1px solid #bce8f1; color: #3a87ad; padding: 14px; border-radius: 2px; margin-top: 20px">
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *     <strong>Find information how to download and install:</strong>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *     <a href="https://github.com/hgoebl/mobile-detect.js/">github.com/hgoebl/mobile-detect.js/</a>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * </div>
+    ~~~~~~~~~~~~~
+         *
+    ~~~~~~
+         * @example <pre>
+    ~~~~~~~~~~~~~~~~~~~~~
+         *     var md = new MobileDetect(window.navigator.userAgent);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *     if (md.mobile()) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *     }
+    ~~~~~~~~~~~~
+         * </pre>
+    ~~~~~~~~~~~~~
+         *
+    ~~~~~~
+         * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent']
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @param {number} [maxPhoneWidth=600] <strong>only for browsers</strong> specify a value for the maximum
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *        width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *        as phone.
+    ~~~~~~~~~~~~~~~~~~~~~~~
+         *        This is only used in cases where the device cannot be classified as phone or tablet.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *        See <a href="http://developer.android.com/guide/practices/screens_support.html">Declaring Tablet Layouts
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *        for Android</a>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *        If you provide a value < 0, then this "fuzzy" check is disabled.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * @constructor
+    ~~~~~~~~~~~~~~~~~~~
+         * @global
+    ~~~~~~~~~~~~~~
+         */
+    ~~~~~~~
+        function MobileDetect(userAgent, maxPhoneWidth) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            this.ua = userAgent || '';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            this._cache = {};
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+            //600dp is typical 7" tablet minimum width
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            this.maxPhoneWidth = maxPhoneWidth || 600;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        }
+    ~~~~~
+    
+    
+        MobileDetect.prototype = {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            constructor: MobileDetect,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns the detected phone or tablet type or <tt>null</tt> if it is not a mobile device.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * is positive, a value of <code>UnknownPhone</code>, <code>UnknownTablet</code> or
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <code>UnknownMobile</code> is returned.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * and <code>UnknownMobile</code>, so you will get <code>UnknownMobile</code> here.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * In most cases you will use the return value just as a boolean.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} the key for the phone family or tablet family, e.g. "Nexus".
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#mobile
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            mobile: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+                return this._cache.mobile;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns the detected phone type/family string or <tt>null</tt>.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * The returned tablet (family or producer) is one of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * is positive, a value of <code>UnknownPhone</code> or <code>UnknownMobile</code> is returned.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * will return <code>UnknownMobile</code>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * In most cases you will use the return value just as a boolean.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} the key of the phone family or producer, e.g. "iPhone"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#phone
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            phone: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+                return this._cache.phone;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns the detected tablet type/family string or <tt>null</tt>.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * The returned tablet (family or producer) is one of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * TelstraTablet, GenericTablet</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * is positive, a value of <code>UnknownTablet</code> or <code>UnknownMobile</code> is returned.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * will return <code>UnknownMobile</code>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * In most cases you will use the return value just as a boolean.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet"
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#tablet
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            tablet: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'prepareDetectionCache' does not exist on type '{}'.
+                return this._cache.tablet;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns the (first) detected user-agent string or <tt>null</tt>.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * The returned user-agent is one of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * cases where a mobile device pretends to be more than one particular browser. You can get the
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} the key for the detected user-agent or <tt>null</tt>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#userAgent
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            userAgent: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (this._cache.userAgent === undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                 ~~~~~~~~~
+!!! error TS2339: Property 'findMatch' does not exist on type '{}'.
+                                                                ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+                }
+    ~~~~~~~~~~~~~
+                return this._cache.userAgent;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns all detected user-agent strings.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * The array is empty or contains one or more of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * cases where a mobile device pretends to be more than one particular browser. You can get the
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {Array} the array of detected user-agent keys or <tt>[]</tt>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#userAgents
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            userAgents: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (this._cache.userAgents === undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                  ~~~~~~~~~~~
+!!! error TS2339: Property 'findMatches' does not exist on type '{}'.
+                                                                   ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+                }
+    ~~~~~~~~~~~~~
+                return this._cache.userAgents;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns the detected operating system string or <tt>null</tt>.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * The operating system is one of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} the key for the detected operating system.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#os
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            os: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (this._cache.os === undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    this._cache.os = impl.detectOS(this.ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                          ~~~~~~~~
+!!! error TS2339: Property 'detectOS' does not exist on type '{}'.
+                }
+    ~~~~~~~~~~~~~
+                return this._cache.os;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Get the version (as Number) of the given property in the User-Agent.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @param {String} key a key defining a thing which has a version.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        You can use one of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * CE, Windows NT, Symbian, webOS</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {Number} the version as float or <tt>NaN</tt> if User-Agent doesn't contain this version.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *          Be careful when comparing this value with '==' operator!
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#version
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            version: function (key) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return impl.getVersion(key, this.ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                            ~~~~~~~~~~
+!!! error TS2339: Property 'getVersion' does not exist on type '{}'.
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Get the version (as String) of the given property in the User-Agent.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @param {String} key a key defining a thing which has a version.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        You can use one of following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * CE, Windows NT, Symbian, webOS</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} the "raw" version as String or <tt>null</tt> if User-Agent doesn't contain this version.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @function MobileDetect#versionStr
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            versionStr: function (key) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return impl.getVersionStr(key, this.ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                            ~~~~~~~~~~~~~
+!!! error TS2339: Property 'getVersionStr' does not exist on type '{}'.
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        tablet family.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        For a complete list of possible values, see {@link MobileDetect#userAgent},
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        Additionally you have following keys:<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br><tt>Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch</tt><br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {boolean} <tt>true</tt> when the given key is one of the defined keys of userAgent, os, phone,
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *                    tablet or one of the listed additional keys, otherwise <tt>false</tt>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#is
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            is: function (key) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return containsIC(this.userAgents(), key) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       equalIC(key, this.os()) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       equalIC(key, this.phone()) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       equalIC(key, this.tablet()) ||
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                       ~~~~~~~~~~~
+!!! error TS2339: Property 'findMatches' does not exist on type '{}'.
+                                                        ~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'mobileDetectRules' does not exist on type '{}'.
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Do a quick test against navigator::userAgent.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @param {String|RegExp} pattern the pattern, either as String or RegExp
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *                        (a string will be converted to a case-insensitive RegExp).
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @returns {boolean} <tt>true</tt> when the pattern matches, otherwise <tt>false</tt>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#match
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            match: function (pattern) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (!(pattern instanceof RegExp)) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    pattern = new RegExp(pattern, 'i');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                }
+    ~~~~~~~~~~~~~
+                return pattern.test(this.ua);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Checks whether the mobile device can be considered as phone regarding <code>screen.width</code>.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * <br>
+    ~~~~~~~~~~~~~~~
+             * Obviously this method makes sense in browser environments only (not for Node.js)!
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *        The argument is optional and if not present or falsy, the value of the constructor is taken.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @returns {boolean|undefined} <code>undefined</code> if screen size wasn't detectable, else <code>true</code>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *          when screen.width is less or equal to maxPhoneWidth, otherwise <code>false</code>.<br>
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *          Will always return <code>undefined</code> server-side.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            isPhoneSized: function (maxPhoneWidth) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                    ~~~~~~~~~~~~
+!!! error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+            },
+    ~~~~~~~~~~
+    
+    
+            /**
+    ~~~~~~~~~~~
+             * Returns the mobile grade ('A', 'B', 'C').
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             *
+    ~~~~~~~~~~
+             * @returns {String} one of the mobile grades ('A', 'B', 'C').
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             * @function MobileDetect#mobileGrade
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+             */
+    ~~~~~~~~~~~
+            mobileGrade: function () {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                if (this._cache.grade === undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    this._cache.grade = impl.mobileGrade(this);
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                             ~~~~~~~~~~~
+!!! error TS2339: Property 'mobileGrade' does not exist on type '{}'.
+                }
+    ~~~~~~~~~~~~~
+                return this._cache.grade;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            }
+    ~~~~~~~~~
+        };
+    ~~~~~~
+    
+    
+        // environment-dependent
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        if (typeof window !== 'undefined' && window.screen) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+                                             ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+            MobileDetect.isPhoneSized = function (maxPhoneWidth) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         ~~~~~~~~~~~~
+!!! error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+                return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                            ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2339: Property 'getDeviceSmallerSide' does not exist on type '{}'.
+            };
+    ~~~~~~~~~~
+        } else {
+    ~~~~~~~~~~~~
+            MobileDetect.isPhoneSized = function () {};
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         ~~~~~~~~~~~~
+!!! error TS2339: Property 'isPhoneSized' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+        }
+    ~~~~~
+    
+    
+        // should not be replaced by a completely new object - just overwrite existing methods
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        MobileDetect._impl = impl;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~
+!!! error TS2339: Property '_impl' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+        
+    ~~~~
+        MobileDetect.version = '1.3.3 2016-07-31';
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     ~~~~~~~
+!!! error TS2339: Property 'version' does not exist on type '(userAgent: any, maxPhoneWidth: any) => void'.
+    
+    
+        return MobileDetect;
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+    }); // end of call of define()
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    })((function (undefined) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+       ~~~~~~~~~~~~~~~~~~~~~~~
+        if (typeof module !== 'undefined' && module.exports) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~~~~
+!!! error TS2304: Cannot find name 'module'.
+                                             ~~~~~~
+!!! error TS2304: Cannot find name 'module'.
+            return function (factory) { module.exports = factory(); };
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                        ~~~~~~
+!!! error TS2304: Cannot find name 'module'.
+        } else if (typeof define === 'function' && define.amd) {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          ~~~~~~
+!!! error TS2304: Cannot find name 'define'.
+                                                   ~~~~~~
+!!! error TS2304: Cannot find name 'define'.
+            return define;
+    ~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~
+                   ~~~~~~
+!!! error TS2304: Cannot find name 'define'.
+        } else if (typeof window !== 'undefined') {
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+            return function (factory) { window.MobileDetect = factory(); };
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                        ~~~~~~
+!!! error TS2304: Cannot find name 'window'.
+        } else {
+    ~~~~~~~~~~~~
+    ~~~~~~~~~~~~
+            // please file a bug if you get this error!
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            throw new Error('unknown environment');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        }
+    ~~~~~
+    ~~~~~
+    })());
+    ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    ~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/fixSignatureCaching.js b/tests/baselines/reference/fixSignatureCaching.js
new file mode 100644
index 00000000000..231c1308c55
--- /dev/null
+++ b/tests/baselines/reference/fixSignatureCaching.js
@@ -0,0 +1,1902 @@
+//// [fixSignatureCaching.ts]
+// Repro from #10697
+
+(function (define, undefined) {
+define(function () {
+    'use strict';
+
+    var impl = {};
+
+    impl.mobileDetectRules = {
+    "phones": {
+        "iPhone": "\\biPhone\\b|\\biPod\\b",
+        "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",
+        "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",
+        "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",
+        "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",
+        "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",
+        "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",
+        "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",
+        "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",
+        "Asus": "Asus.*Galaxy|PadFone.*Mobile",
+        "NokiaLumia": "Lumia [0-9]{3,4}",
+        "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",
+        "Palm": "PalmSource|Palm",
+        "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",
+        "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",
+        "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",
+        "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",
+        "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",
+        "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",
+        "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",
+        "Alcatel": "Alcatel",
+        "Nintendo": "Nintendo 3DS",
+        "Amoi": "Amoi",
+        "INQ": "INQ",
+        "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
+    },
+    "tablets": {
+        "iPad": "iPad|iPad.*Mobile",
+        "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",
+        "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",
+        "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",
+        "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",
+        "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",
+        "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",
+        "BlackBerryTablet": "PlayBook|RIM Tablet",
+        "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",
+        "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",
+        "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",
+        "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",
+        "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",
+        "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",
+        "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",
+        "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",
+        "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",
+        "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",
+        "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",
+        "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",
+        "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",
+        "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",
+        "IRUTablet": "M702pro",
+        "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",
+        "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",
+        "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",
+        "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",
+        "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",
+        "NokiaLumiaTablet": "Lumia 2520",
+        "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",
+        "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",
+        "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",
+        "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",
+        "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",
+        "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",
+        "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",
+        "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",
+        "FlyTablet": "IQ310|Fly Vision",
+        "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",
+        "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",
+        "NecTablet": "\\bN-06D|\\bN-08D",
+        "PantechTablet": "Pantech.*P4100",
+        "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",
+        "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",
+        "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",
+        "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",
+        "NabiTablet": "Android.*\\bNabi",
+        "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",
+        "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",
+        "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",
+        "PlaystationTablet": "Playstation.*(Portable|Vita)",
+        "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",
+        "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",
+        "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",
+        "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",
+        "GalapadTablet": "Android.*\\bG1\\b",
+        "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",
+        "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",
+        "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",
+        "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",
+        "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",
+        "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",
+        "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",
+        "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",
+        "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",
+        "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",
+        "DPSTablet": "DPS Dream 9|DPS Dual 7",
+        "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",
+        "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",
+        "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",
+        "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",
+        "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",
+        "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",
+        "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",
+        "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",
+        "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",
+        "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",
+        "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",
+        "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",
+        "iMobileTablet": "i-mobile i-note",
+        "TolinoTablet": "tolino tab [0-9.]+|tolino shine",
+        "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",
+        "AMPETablet": "Android.* A78 ",
+        "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",
+        "TecnoTablet": "TECNO P9",
+        "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",
+        "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",
+        "FX2Tablet": "FX2 PAD7|FX2 PAD10",
+        "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",
+        "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",
+        "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",
+        "CaptivaTablet": "CAPTIVA PAD",
+        "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",
+        "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",
+        "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",
+        "JaytechTablet": "TPC-PA762",
+        "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",
+        "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",
+        "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",
+        "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",
+        "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",
+        "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",
+        "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",
+        "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",
+        "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",
+        "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",
+        "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",
+        "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",
+        "UbislateTablet": "UbiSlate[\\s]?7C",
+        "PocketBookTablet": "Pocketbook",
+        "KocasoTablet": "\\b(TB-1207)\\b",
+        "Hudl": "Hudl HT7S3|Hudl 2",
+        "TelstraTablet": "T-Hub2",
+        "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
+    },
+    "oss": {
+        "AndroidOS": "Android",
+        "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",
+        "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",
+        "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",
+        "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",
+        "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",
+        "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",
+        "MeeGoOS": "MeeGo",
+        "MaemoOS": "Maemo",
+        "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",
+        "webOS": "webOS|hpwOS",
+        "badaOS": "\\bBada\\b",
+        "BREWOS": "BREW"
+    },
+    "uas": {
+        "Vivaldi": "Vivaldi",
+        "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",
+        "Dolfin": "\\bDolfin\\b",
+        "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",
+        "Skyfire": "Skyfire",
+        "Edge": "Mobile Safari\/[.0-9]* Edge",
+        "IE": "IEMobile|MSIEMobile",
+        "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",
+        "Bolt": "bolt",
+        "TeaShark": "teashark",
+        "Blazer": "Blazer",
+        "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",
+        "Tizen": "Tizen",
+        "UCBrowser": "UC.*Browser|UCWEB",
+        "baiduboxapp": "baiduboxapp",
+        "baidubrowser": "baidubrowser",
+        "DiigoBrowser": "DiigoBrowser",
+        "Puffin": "Puffin",
+        "Mercury": "\\bMercury\\b",
+        "ObigoBrowser": "Obigo",
+        "NetFront": "NF-Browser",
+        "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",
+        "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"
+    },
+    "props": {
+        "Mobile": "Mobile\/[VER]",
+        "Build": "Build\/[VER]",
+        "Version": "Version\/[VER]",
+        "VendorID": "VendorID\/[VER]",
+        "iPad": "iPad.*CPU[a-z ]+[VER]",
+        "iPhone": "iPhone.*CPU[a-z ]+[VER]",
+        "iPod": "iPod.*CPU[a-z ]+[VER]",
+        "Kindle": "Kindle\/[VER]",
+        "Chrome": [
+            "Chrome\/[VER]",
+            "CriOS\/[VER]",
+            "CrMo\/[VER]"
+        ],
+        "Coast": [
+            "Coast\/[VER]"
+        ],
+        "Dolfin": "Dolfin\/[VER]",
+        "Firefox": "Firefox\/[VER]",
+        "Fennec": "Fennec\/[VER]",
+        "Edge": "Edge\/[VER]",
+        "IE": [
+            "IEMobile\/[VER];",
+            "IEMobile [VER]",
+            "MSIE [VER];",
+            "Trident\/[0-9.]+;.*rv:[VER]"
+        ],
+        "NetFront": "NetFront\/[VER]",
+        "NokiaBrowser": "NokiaBrowser\/[VER]",
+        "Opera": [
+            " OPR\/[VER]",
+            "Opera Mini\/[VER]",
+            "Version\/[VER]"
+        ],
+        "Opera Mini": "Opera Mini\/[VER]",
+        "Opera Mobi": "Version\/[VER]",
+        "UC Browser": "UC Browser[VER]",
+        "MQQBrowser": "MQQBrowser\/[VER]",
+        "MicroMessenger": "MicroMessenger\/[VER]",
+        "baiduboxapp": "baiduboxapp\/[VER]",
+        "baidubrowser": "baidubrowser\/[VER]",
+        "Iron": "Iron\/[VER]",
+        "Safari": [
+            "Version\/[VER]",
+            "Safari\/[VER]"
+        ],
+        "Skyfire": "Skyfire\/[VER]",
+        "Tizen": "Tizen\/[VER]",
+        "Webkit": "webkit[ \/][VER]",
+        "PaleMoon": "PaleMoon\/[VER]",
+        "Gecko": "Gecko\/[VER]",
+        "Trident": "Trident\/[VER]",
+        "Presto": "Presto\/[VER]",
+        "Goanna": "Goanna\/[VER]",
+        "iOS": " \\bi?OS\\b [VER][ ;]{1}",
+        "Android": "Android [VER]",
+        "BlackBerry": [
+            "BlackBerry[\\w]+\/[VER]",
+            "BlackBerry.*Version\/[VER]",
+            "Version\/[VER]"
+        ],
+        "BREW": "BREW [VER]",
+        "Java": "Java\/[VER]",
+        "Windows Phone OS": [
+            "Windows Phone OS [VER]",
+            "Windows Phone [VER]"
+        ],
+        "Windows Phone": "Windows Phone [VER]",
+        "Windows CE": "Windows CE\/[VER]",
+        "Windows NT": "Windows NT [VER]",
+        "Symbian": [
+            "SymbianOS\/[VER]",
+            "Symbian\/[VER]"
+        ],
+        "webOS": [
+            "webOS\/[VER]",
+            "hpwOS\/[VER];"
+        ]
+    },
+    "utils": {
+        "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",
+        "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",
+        "DesktopMode": "WPDesktop",
+        "TV": "SonyDTV|HbbTV",
+        "WebKit": "(webkit)[ \/]([\\w.]+)",
+        "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",
+        "Watch": "SM-V700"
+    }
+};
+
+    // following patterns come from http://detectmobilebrowsers.com/
+    impl.detectMobileBrowsers = {
+        fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i,
+        shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i,
+        tabletPattern: /android|ipad|playbook|silk/i
+    };
+
+    var hasOwnProp = Object.prototype.hasOwnProperty,
+        isArray;
+
+    impl.FALLBACK_PHONE = 'UnknownPhone';
+    impl.FALLBACK_TABLET = 'UnknownTablet';
+    impl.FALLBACK_MOBILE = 'UnknownMobile';
+
+    isArray = ('isArray' in Array) ?
+        Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; };
+
+    function equalIC(a, b) {
+        return a != null && b != null && a.toLowerCase() === b.toLowerCase();
+    }
+
+    function containsIC(array, value) {
+        var valueLC, i, len = array.length;
+        if (!len || !value) {
+            return false;
+        }
+        valueLC = value.toLowerCase();
+        for (i = 0; i < len; ++i) {
+            if (valueLC === array[i].toLowerCase()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function convertPropsToRegExp(object) {
+        for (var key in object) {
+            if (hasOwnProp.call(object, key)) {
+                object[key] = new RegExp(object[key], 'i');
+            }
+        }
+    }
+
+    (function init() {
+        var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules;
+        for (key in mobileDetectRules.props) {
+            if (hasOwnProp.call(mobileDetectRules.props, key)) {
+                values = mobileDetectRules.props[key];
+                if (!isArray(values)) {
+                    values = [values];
+                }
+                len = values.length;
+                for (i = 0; i < len; ++i) {
+                    value = values[i];
+                    verPos = value.indexOf('[VER]');
+                    if (verPos >= 0) {
+                        value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5);
+                    }
+                    values[i] = new RegExp(value, 'i');
+                }
+                mobileDetectRules.props[key] = values;
+            }
+        }
+        convertPropsToRegExp(mobileDetectRules.oss);
+        convertPropsToRegExp(mobileDetectRules.phones);
+        convertPropsToRegExp(mobileDetectRules.tablets);
+        convertPropsToRegExp(mobileDetectRules.uas);
+        convertPropsToRegExp(mobileDetectRules.utils);
+
+        // copy some patterns to oss0 which are tested first (see issue#15)
+        mobileDetectRules.oss0 = {
+            WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS,
+            WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS
+        };
+    }());
+
+    /**
+     * Test userAgent string against a set of rules and find the first matched key.
+     * @param {Object} rules (key is String, value is RegExp)
+     * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+     * @returns {String|null} the matched key if found, otherwise <tt>null</tt>
+     * @private
+     */
+    impl.findMatch = function(rules, userAgent) {
+        for (var key in rules) {
+            if (hasOwnProp.call(rules, key)) {
+                if (rules[key].test(userAgent)) {
+                    return key;
+                }
+            }
+        }
+        return null;
+    };
+
+    /**
+     * Test userAgent string against a set of rules and return an array of matched keys.
+     * @param {Object} rules (key is String, value is RegExp)
+     * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+     * @returns {Array} an array of matched keys, may be empty when there is no match, but not <tt>null</tt>
+     * @private
+     */
+    impl.findMatches = function(rules, userAgent) {
+        var result = [];
+        for (var key in rules) {
+            if (hasOwnProp.call(rules, key)) {
+                if (rules[key].test(userAgent)) {
+                    result.push(key);
+                }
+            }
+        }
+        return result;
+    };
+
+    /**
+     * Check the version of the given property in the User-Agent.
+     *
+     * @param {String} propertyName
+     * @param {String} userAgent
+     * @return {String} version or <tt>null</tt> if version not found
+     * @private
+     */
+    impl.getVersionStr = function (propertyName, userAgent) {
+        var props = impl.mobileDetectRules.props, patterns, i, len, match;
+        if (hasOwnProp.call(props, propertyName)) {
+            patterns = props[propertyName];
+            len = patterns.length;
+            for (i = 0; i < len; ++i) {
+                match = patterns[i].exec(userAgent);
+                if (match !== null) {
+                    return match[1];
+                }
+            }
+        }
+        return null;
+    };
+
+    /**
+     * Check the version of the given property in the User-Agent.
+     * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+     *
+     * @param {String} propertyName
+     * @param {String} userAgent
+     * @return {Number} version or <tt>NaN</tt> if version not found
+     * @private
+     */
+    impl.getVersion = function (propertyName, userAgent) {
+        var version = impl.getVersionStr(propertyName, userAgent);
+        return version ? impl.prepareVersionNo(version) : NaN;
+    };
+
+    /**
+     * Prepare the version number.
+     *
+     * @param {String} version
+     * @return {Number} the version number as a floating number
+     * @private
+     */
+    impl.prepareVersionNo = function (version) {
+        var numbers;
+
+        numbers = version.split(/[a-z._ \/\-]/i);
+        if (numbers.length === 1) {
+            version = numbers[0];
+        }
+        if (numbers.length > 1) {
+            version = numbers[0] + '.';
+            numbers.shift();
+            version += numbers.join('');
+        }
+        return Number(version);
+    };
+
+    impl.isMobileFallback = function (userAgent) {
+        return impl.detectMobileBrowsers.fullPattern.test(userAgent) ||
+            impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4));
+    };
+
+    impl.isTabletFallback = function (userAgent) {
+        return impl.detectMobileBrowsers.tabletPattern.test(userAgent);
+    };
+
+    impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) {
+        if (cache.mobile !== undefined) {
+            return;
+        }
+        var phone, tablet, phoneSized;
+
+        // first check for stronger tablet rules, then phone (see issue#5)
+        tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent);
+        if (tablet) {
+            cache.mobile = cache.tablet = tablet;
+            cache.phone = null;
+            return; // unambiguously identified as tablet
+        }
+
+        phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent);
+        if (phone) {
+            cache.mobile = cache.phone = phone;
+            cache.tablet = null;
+            return; // unambiguously identified as phone
+        }
+
+        // our rules haven't found a match -> try more general fallback rules
+        if (impl.isMobileFallback(userAgent)) {
+            phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth);
+            if (phoneSized === undefined) {
+                cache.mobile = impl.FALLBACK_MOBILE;
+                cache.tablet = cache.phone = null;
+            } else if (phoneSized) {
+                cache.mobile = cache.phone = impl.FALLBACK_PHONE;
+                cache.tablet = null;
+            } else {
+                cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+                cache.phone = null;
+            }
+        } else if (impl.isTabletFallback(userAgent)) {
+            cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+            cache.phone = null;
+        } else {
+            // not mobile at all!
+            cache.mobile = cache.tablet = cache.phone = null;
+        }
+    };
+
+    // t is a reference to a MobileDetect instance
+    impl.mobileGrade = function (t) {
+        // impl note:
+        // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version.
+        // When changes are made in Mobile_Detect.php, copy this method and replace:
+        //     $this-> / t.
+        //     self::MOBILE_GRADE_(.) / '$1'
+        //     , self::VERSION_TYPE_FLOAT / (nothing)
+        //     isIOS() / os('iOS')
+        //     [reg] / (nothing)   <-- jsdelivr complaining about unescaped unicode character U+00AE
+        var $isMobile = t.mobile() !== null;
+
+        if (
+            // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1)
+            t.os('iOS') && t.version('iPad')>=4.3 ||
+            t.os('iOS') && t.version('iPhone')>=3.1 ||
+            t.os('iOS') && t.version('iPod')>=3.1 ||
+
+            // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+            // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
+            // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
+            // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
+            ( t.version('Android')>2.1 && t.is('Webkit') ) ||
+
+            // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800
+            t.version('Windows Phone OS')>=7.0 ||
+
+            // Blackberry 7 - Tested on BlackBerry Torch 9810
+            // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670
+            t.is('BlackBerry') && t.version('BlackBerry')>=6.0 ||
+            // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
+            t.match('Playbook.*Tablet') ||
+
+            // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)
+            ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) ||
+            // Palm WebOS 3.0  - Tested on HP TouchPad
+            t.match('hp.*TouchPad') ||
+
+            // Firefox Mobile (12 Beta) - Tested on Android 2.3 device
+            ( t.is('Firefox') && t.version('Firefox')>=12 ) ||
+
+            // Chrome for Android - Tested on Android 4.0, 4.1 device
+            ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) ||
+
+            // Skyfire 4.1 - Tested on Android 2.3 device
+            ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) ||
+
+            // Opera Mobile 11.5-12: Tested on Android 2.3
+            ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) ||
+
+            // Meego 1.2 - Tested on Nokia 950 and N9
+            t.is('MeeGoOS') ||
+
+            // Tizen (pre-release) - Tested on early hardware
+            t.is('Tizen') ||
+
+            // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
+            // @todo: more tests here!
+            t.is('Dolfin') && t.version('Bada')>=2.0 ||
+
+            // UC Browser - Tested on Android 2.3 device
+            ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) ||
+
+            // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
+            ( t.match('Kindle Fire') ||
+                t.is('Kindle') && t.version('Kindle')>=3.0 ) ||
+
+            // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
+            t.is('AndroidOS') && t.is('NookTablet') ||
+
+            // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7
+            t.version('Chrome')>=11 && !$isMobile ||
+
+            // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7
+            t.version('Safari')>=5.0 && !$isMobile ||
+
+            // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7
+            t.version('Firefox')>=4.0 && !$isMobile ||
+
+            // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
+            t.version('MSIE')>=7.0 && !$isMobile ||
+
+            // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
+            // @reference: http://my.opera.com/community/openweb/idopera/
+            t.version('Opera')>=10 && !$isMobile
+
+            ){
+            return 'A';
+        }
+
+        if (
+            t.os('iOS') && t.version('iPad')<4.3 ||
+            t.os('iOS') && t.version('iPhone')<3.1 ||
+            t.os('iOS') && t.version('iPod')<3.1 ||
+
+            // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
+            t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 ||
+
+            //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
+            ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 &&
+                (t.version('Android')>=2.3 || t.is('iOS')) ) ||
+
+            // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+            t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
+
+            // @todo: report this (tested on Nokia N71)
+            t.version('Opera Mobi')>=11 && t.is('SymbianOS')
+            ){
+            return 'B';
+        }
+
+        if (
+        // Blackberry 4.x - Tested on the Curve 8330
+            t.version('BlackBerry')<5.0 ||
+            // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
+            t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2
+
+            ){
+            return 'C';
+        }
+
+        //All older smartphone platforms and featurephones - Any device that doesn't support media queries
+        //will receive the basic, C grade experience.
+        return 'C';
+    };
+
+    impl.detectOS = function (ua) {
+        return impl.findMatch(impl.mobileDetectRules.oss0, ua) ||
+            impl.findMatch(impl.mobileDetectRules.oss, ua);
+    };
+
+    impl.getDeviceSmallerSide = function () {
+        return window.screen.width < window.screen.height ?
+            window.screen.width :
+            window.screen.height;
+    };
+
+    /**
+     * Constructor for MobileDetect object.
+     * <br>
+     * Such an object will keep a reference to the given user-agent string and cache most of the detect queries.<br>
+     * <div style="background-color: #d9edf7; border: 1px solid #bce8f1; color: #3a87ad; padding: 14px; border-radius: 2px; margin-top: 20px">
+     *     <strong>Find information how to download and install:</strong>
+     *     <a href="https://github.com/hgoebl/mobile-detect.js/">github.com/hgoebl/mobile-detect.js/</a>
+     * </div>
+     *
+     * @example <pre>
+     *     var md = new MobileDetect(window.navigator.userAgent);
+     *     if (md.mobile()) {
+     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';
+     *     }
+     * </pre>
+     *
+     * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent']
+     * @param {number} [maxPhoneWidth=600] <strong>only for browsers</strong> specify a value for the maximum
+     *        width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled
+     *        as phone.
+     *        This is only used in cases where the device cannot be classified as phone or tablet.<br>
+     *        See <a href="http://developer.android.com/guide/practices/screens_support.html">Declaring Tablet Layouts
+     *        for Android</a>.<br>
+     *        If you provide a value < 0, then this "fuzzy" check is disabled.
+     * @constructor
+     * @global
+     */
+    function MobileDetect(userAgent, maxPhoneWidth) {
+        this.ua = userAgent || '';
+        this._cache = {};
+        //600dp is typical 7" tablet minimum width
+        this.maxPhoneWidth = maxPhoneWidth || 600;
+    }
+
+    MobileDetect.prototype = {
+        constructor: MobileDetect,
+
+        /**
+         * Returns the detected phone or tablet type or <tt>null</tt> if it is not a mobile device.
+         * <br>
+         * For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.<br>
+         * <br>
+         * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+         * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+         * is positive, a value of <code>UnknownPhone</code>, <code>UnknownTablet</code> or
+         * <code>UnknownMobile</code> is returned.<br>
+         * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+         * <br>
+         * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+         * and <code>UnknownMobile</code>, so you will get <code>UnknownMobile</code> here.<br>
+         * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+         * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+         * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+         * <br>
+         * In most cases you will use the return value just as a boolean.
+         *
+         * @returns {String} the key for the phone family or tablet family, e.g. "Nexus".
+         * @function MobileDetect#mobile
+         */
+        mobile: function () {
+            impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+            return this._cache.mobile;
+        },
+
+        /**
+         * Returns the detected phone type/family string or <tt>null</tt>.
+         * <br>
+         * The returned tablet (family or producer) is one of following keys:<br>
+         * <br><tt>iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus,
+         * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley,
+         * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone</tt><br>
+         * <br>
+         * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+         * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+         * is positive, a value of <code>UnknownPhone</code> or <code>UnknownMobile</code> is returned.<br>
+         * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+         * <br>
+         * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+         * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+         * will return <code>UnknownMobile</code>.<br>
+         * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+         * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+         * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+         * <br>
+         * In most cases you will use the return value just as a boolean.
+         *
+         * @returns {String} the key of the phone family or producer, e.g. "iPhone"
+         * @function MobileDetect#phone
+         */
+        phone: function () {
+            impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+            return this._cache.phone;
+        },
+
+        /**
+         * Returns the detected tablet type/family string or <tt>null</tt>.
+         * <br>
+         * The returned tablet (family or producer) is one of following keys:<br>
+         * <br><tt>iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet,
+         * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet,
+         * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet,
+         * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet,
+         * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet,
+         * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet,
+         * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet,
+         * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet,
+         * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet,
+         * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet,
+         * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet,
+         * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet,
+         * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet,
+         * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet,
+         * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet,
+         * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet,
+         * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet,
+         * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet,
+         * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet,
+         * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet,
+         * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl,
+         * TelstraTablet, GenericTablet</tt><br>
+         * <br>
+         * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+         * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+         * is positive, a value of <code>UnknownTablet</code> or <code>UnknownMobile</code> is returned.<br>
+         * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+         * <br>
+         * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+         * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+         * will return <code>UnknownMobile</code>.<br>
+         * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+         * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+         * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+         * <br>
+         * In most cases you will use the return value just as a boolean.
+         *
+         * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet"
+         * @function MobileDetect#tablet
+         */
+        tablet: function () {
+            impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+            return this._cache.tablet;
+        },
+
+        /**
+         * Returns the (first) detected user-agent string or <tt>null</tt>.
+         * <br>
+         * The returned user-agent is one of following keys:<br>
+         * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+         * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+         * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+         * <br>
+         * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+         * cases where a mobile device pretends to be more than one particular browser. You can get the
+         * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+         * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+         *
+         * @returns {String} the key for the detected user-agent or <tt>null</tt>
+         * @function MobileDetect#userAgent
+         */
+        userAgent: function () {
+            if (this._cache.userAgent === undefined) {
+                this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua);
+            }
+            return this._cache.userAgent;
+        },
+
+        /**
+         * Returns all detected user-agent strings.
+         * <br>
+         * The array is empty or contains one or more of following keys:<br>
+         * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+         * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+         * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+         * <br>
+         * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+         * cases where a mobile device pretends to be more than one particular browser. You can get the
+         * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+         * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+         *
+         * @returns {Array} the array of detected user-agent keys or <tt>[]</tt>
+         * @function MobileDetect#userAgents
+         */
+        userAgents: function () {
+            if (this._cache.userAgents === undefined) {
+                this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua);
+            }
+            return this._cache.userAgents;
+        },
+
+        /**
+         * Returns the detected operating system string or <tt>null</tt>.
+         * <br>
+         * The operating system is one of following keys:<br>
+         * <br><tt>AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS,
+         * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS</tt><br>
+         *
+         * @returns {String} the key for the detected operating system.
+         * @function MobileDetect#os
+         */
+        os: function () {
+            if (this._cache.os === undefined) {
+                this._cache.os = impl.detectOS(this.ua);
+            }
+            return this._cache.os;
+        },
+
+        /**
+         * Get the version (as Number) of the given property in the User-Agent.
+         * <br>
+         * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+         *
+         * @param {String} key a key defining a thing which has a version.<br>
+         *        You can use one of following keys:<br>
+         * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+         * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+         * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+         * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+         * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+         * CE, Windows NT, Symbian, webOS</tt><br>
+         *
+         * @returns {Number} the version as float or <tt>NaN</tt> if User-Agent doesn't contain this version.
+         *          Be careful when comparing this value with '==' operator!
+         * @function MobileDetect#version
+         */
+        version: function (key) {
+            return impl.getVersion(key, this.ua);
+        },
+
+        /**
+         * Get the version (as String) of the given property in the User-Agent.
+         * <br>
+         *
+         * @param {String} key a key defining a thing which has a version.<br>
+         *        You can use one of following keys:<br>
+         * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+         * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+         * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+         * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+         * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+         * CE, Windows NT, Symbian, webOS</tt><br>
+         *
+         * @returns {String} the "raw" version as String or <tt>null</tt> if User-Agent doesn't contain this version.
+         *
+         * @function MobileDetect#versionStr
+         */
+        versionStr: function (key) {
+            return impl.getVersionStr(key, this.ua);
+        },
+
+        /**
+         * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string.
+         *
+         * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or
+         *        tablet family.<br>
+         *        For a complete list of possible values, see {@link MobileDetect#userAgent},
+         *        {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.<br>
+         *        Additionally you have following keys:<br>
+         * <br><tt>Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch</tt><br>
+         *
+         * @returns {boolean} <tt>true</tt> when the given key is one of the defined keys of userAgent, os, phone,
+         *                    tablet or one of the listed additional keys, otherwise <tt>false</tt>
+         * @function MobileDetect#is
+         */
+        is: function (key) {
+            return containsIC(this.userAgents(), key) ||
+                   equalIC(key, this.os()) ||
+                   equalIC(key, this.phone()) ||
+                   equalIC(key, this.tablet()) ||
+                   containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key);
+        },
+
+        /**
+         * Do a quick test against navigator::userAgent.
+         *
+         * @param {String|RegExp} pattern the pattern, either as String or RegExp
+         *                        (a string will be converted to a case-insensitive RegExp).
+         * @returns {boolean} <tt>true</tt> when the pattern matches, otherwise <tt>false</tt>
+         * @function MobileDetect#match
+         */
+        match: function (pattern) {
+            if (!(pattern instanceof RegExp)) {
+                pattern = new RegExp(pattern, 'i');
+            }
+            return pattern.test(this.ua);
+        },
+
+        /**
+         * Checks whether the mobile device can be considered as phone regarding <code>screen.width</code>.
+         * <br>
+         * Obviously this method makes sense in browser environments only (not for Node.js)!
+         * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.<br>
+         *        The argument is optional and if not present or falsy, the value of the constructor is taken.
+         * @returns {boolean|undefined} <code>undefined</code> if screen size wasn't detectable, else <code>true</code>
+         *          when screen.width is less or equal to maxPhoneWidth, otherwise <code>false</code>.<br>
+         *          Will always return <code>undefined</code> server-side.
+         */
+        isPhoneSized: function (maxPhoneWidth) {
+            return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth);
+        },
+
+        /**
+         * Returns the mobile grade ('A', 'B', 'C').
+         *
+         * @returns {String} one of the mobile grades ('A', 'B', 'C').
+         * @function MobileDetect#mobileGrade
+         */
+        mobileGrade: function () {
+            if (this._cache.grade === undefined) {
+                this._cache.grade = impl.mobileGrade(this);
+            }
+            return this._cache.grade;
+        }
+    };
+
+    // environment-dependent
+    if (typeof window !== 'undefined' && window.screen) {
+        MobileDetect.isPhoneSized = function (maxPhoneWidth) {
+            return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth;
+        };
+    } else {
+        MobileDetect.isPhoneSized = function () {};
+    }
+
+    // should not be replaced by a completely new object - just overwrite existing methods
+    MobileDetect._impl = impl;
+    
+    MobileDetect.version = '1.3.3 2016-07-31';
+
+    return MobileDetect;
+}); // end of call of define()
+})((function (undefined) {
+    if (typeof module !== 'undefined' && module.exports) {
+        return function (factory) { module.exports = factory(); };
+    } else if (typeof define === 'function' && define.amd) {
+        return define;
+    } else if (typeof window !== 'undefined') {
+        return function (factory) { window.MobileDetect = factory(); };
+    } else {
+        // please file a bug if you get this error!
+        throw new Error('unknown environment');
+    }
+})());
+
+//// [fixSignatureCaching.js]
+// Repro from #10697
+(function (define, undefined) {
+    define(function () {
+        'use strict';
+        var impl = {};
+        impl.mobileDetectRules = {
+            "phones": {
+                "iPhone": "\\biPhone\\b|\\biPod\\b",
+                "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",
+                "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",
+                "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",
+                "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",
+                "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",
+                "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",
+                "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",
+                "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",
+                "Asus": "Asus.*Galaxy|PadFone.*Mobile",
+                "NokiaLumia": "Lumia [0-9]{3,4}",
+                "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",
+                "Palm": "PalmSource|Palm",
+                "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",
+                "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",
+                "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",
+                "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",
+                "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",
+                "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",
+                "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",
+                "Alcatel": "Alcatel",
+                "Nintendo": "Nintendo 3DS",
+                "Amoi": "Amoi",
+                "INQ": "INQ",
+                "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
+            },
+            "tablets": {
+                "iPad": "iPad|iPad.*Mobile",
+                "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",
+                "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",
+                "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",
+                "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",
+                "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",
+                "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",
+                "BlackBerryTablet": "PlayBook|RIM Tablet",
+                "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",
+                "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",
+                "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",
+                "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",
+                "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",
+                "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",
+                "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",
+                "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",
+                "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",
+                "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",
+                "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",
+                "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",
+                "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",
+                "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",
+                "IRUTablet": "M702pro",
+                "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",
+                "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",
+                "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",
+                "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",
+                "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",
+                "NokiaLumiaTablet": "Lumia 2520",
+                "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",
+                "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",
+                "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",
+                "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",
+                "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",
+                "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",
+                "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",
+                "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",
+                "FlyTablet": "IQ310|Fly Vision",
+                "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",
+                "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",
+                "NecTablet": "\\bN-06D|\\bN-08D",
+                "PantechTablet": "Pantech.*P4100",
+                "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",
+                "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",
+                "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",
+                "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",
+                "NabiTablet": "Android.*\\bNabi",
+                "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",
+                "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",
+                "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",
+                "PlaystationTablet": "Playstation.*(Portable|Vita)",
+                "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",
+                "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",
+                "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",
+                "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",
+                "GalapadTablet": "Android.*\\bG1\\b",
+                "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",
+                "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",
+                "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",
+                "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",
+                "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",
+                "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",
+                "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",
+                "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",
+                "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",
+                "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",
+                "DPSTablet": "DPS Dream 9|DPS Dual 7",
+                "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",
+                "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",
+                "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",
+                "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",
+                "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",
+                "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",
+                "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",
+                "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",
+                "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",
+                "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",
+                "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",
+                "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",
+                "iMobileTablet": "i-mobile i-note",
+                "TolinoTablet": "tolino tab [0-9.]+|tolino shine",
+                "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",
+                "AMPETablet": "Android.* A78 ",
+                "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",
+                "TecnoTablet": "TECNO P9",
+                "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",
+                "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",
+                "FX2Tablet": "FX2 PAD7|FX2 PAD10",
+                "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",
+                "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",
+                "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",
+                "CaptivaTablet": "CAPTIVA PAD",
+                "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",
+                "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",
+                "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",
+                "JaytechTablet": "TPC-PA762",
+                "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",
+                "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",
+                "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",
+                "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",
+                "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",
+                "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",
+                "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",
+                "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",
+                "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",
+                "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",
+                "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",
+                "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",
+                "UbislateTablet": "UbiSlate[\\s]?7C",
+                "PocketBookTablet": "Pocketbook",
+                "KocasoTablet": "\\b(TB-1207)\\b",
+                "Hudl": "Hudl HT7S3|Hudl 2",
+                "TelstraTablet": "T-Hub2",
+                "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
+            },
+            "oss": {
+                "AndroidOS": "Android",
+                "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",
+                "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",
+                "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",
+                "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",
+                "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",
+                "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",
+                "MeeGoOS": "MeeGo",
+                "MaemoOS": "Maemo",
+                "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",
+                "webOS": "webOS|hpwOS",
+                "badaOS": "\\bBada\\b",
+                "BREWOS": "BREW"
+            },
+            "uas": {
+                "Vivaldi": "Vivaldi",
+                "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",
+                "Dolfin": "\\bDolfin\\b",
+                "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",
+                "Skyfire": "Skyfire",
+                "Edge": "Mobile Safari\/[.0-9]* Edge",
+                "IE": "IEMobile|MSIEMobile",
+                "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",
+                "Bolt": "bolt",
+                "TeaShark": "teashark",
+                "Blazer": "Blazer",
+                "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",
+                "Tizen": "Tizen",
+                "UCBrowser": "UC.*Browser|UCWEB",
+                "baiduboxapp": "baiduboxapp",
+                "baidubrowser": "baidubrowser",
+                "DiigoBrowser": "DiigoBrowser",
+                "Puffin": "Puffin",
+                "Mercury": "\\bMercury\\b",
+                "ObigoBrowser": "Obigo",
+                "NetFront": "NF-Browser",
+                "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",
+                "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"
+            },
+            "props": {
+                "Mobile": "Mobile\/[VER]",
+                "Build": "Build\/[VER]",
+                "Version": "Version\/[VER]",
+                "VendorID": "VendorID\/[VER]",
+                "iPad": "iPad.*CPU[a-z ]+[VER]",
+                "iPhone": "iPhone.*CPU[a-z ]+[VER]",
+                "iPod": "iPod.*CPU[a-z ]+[VER]",
+                "Kindle": "Kindle\/[VER]",
+                "Chrome": [
+                    "Chrome\/[VER]",
+                    "CriOS\/[VER]",
+                    "CrMo\/[VER]"
+                ],
+                "Coast": [
+                    "Coast\/[VER]"
+                ],
+                "Dolfin": "Dolfin\/[VER]",
+                "Firefox": "Firefox\/[VER]",
+                "Fennec": "Fennec\/[VER]",
+                "Edge": "Edge\/[VER]",
+                "IE": [
+                    "IEMobile\/[VER];",
+                    "IEMobile [VER]",
+                    "MSIE [VER];",
+                    "Trident\/[0-9.]+;.*rv:[VER]"
+                ],
+                "NetFront": "NetFront\/[VER]",
+                "NokiaBrowser": "NokiaBrowser\/[VER]",
+                "Opera": [
+                    " OPR\/[VER]",
+                    "Opera Mini\/[VER]",
+                    "Version\/[VER]"
+                ],
+                "Opera Mini": "Opera Mini\/[VER]",
+                "Opera Mobi": "Version\/[VER]",
+                "UC Browser": "UC Browser[VER]",
+                "MQQBrowser": "MQQBrowser\/[VER]",
+                "MicroMessenger": "MicroMessenger\/[VER]",
+                "baiduboxapp": "baiduboxapp\/[VER]",
+                "baidubrowser": "baidubrowser\/[VER]",
+                "Iron": "Iron\/[VER]",
+                "Safari": [
+                    "Version\/[VER]",
+                    "Safari\/[VER]"
+                ],
+                "Skyfire": "Skyfire\/[VER]",
+                "Tizen": "Tizen\/[VER]",
+                "Webkit": "webkit[ \/][VER]",
+                "PaleMoon": "PaleMoon\/[VER]",
+                "Gecko": "Gecko\/[VER]",
+                "Trident": "Trident\/[VER]",
+                "Presto": "Presto\/[VER]",
+                "Goanna": "Goanna\/[VER]",
+                "iOS": " \\bi?OS\\b [VER][ ;]{1}",
+                "Android": "Android [VER]",
+                "BlackBerry": [
+                    "BlackBerry[\\w]+\/[VER]",
+                    "BlackBerry.*Version\/[VER]",
+                    "Version\/[VER]"
+                ],
+                "BREW": "BREW [VER]",
+                "Java": "Java\/[VER]",
+                "Windows Phone OS": [
+                    "Windows Phone OS [VER]",
+                    "Windows Phone [VER]"
+                ],
+                "Windows Phone": "Windows Phone [VER]",
+                "Windows CE": "Windows CE\/[VER]",
+                "Windows NT": "Windows NT [VER]",
+                "Symbian": [
+                    "SymbianOS\/[VER]",
+                    "Symbian\/[VER]"
+                ],
+                "webOS": [
+                    "webOS\/[VER]",
+                    "hpwOS\/[VER];"
+                ]
+            },
+            "utils": {
+                "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",
+                "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",
+                "DesktopMode": "WPDesktop",
+                "TV": "SonyDTV|HbbTV",
+                "WebKit": "(webkit)[ \/]([\\w.]+)",
+                "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",
+                "Watch": "SM-V700"
+            }
+        };
+        // following patterns come from http://detectmobilebrowsers.com/
+        impl.detectMobileBrowsers = {
+            fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i,
+            shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i,
+            tabletPattern: /android|ipad|playbook|silk/i
+        };
+        var hasOwnProp = Object.prototype.hasOwnProperty, isArray;
+        impl.FALLBACK_PHONE = 'UnknownPhone';
+        impl.FALLBACK_TABLET = 'UnknownTablet';
+        impl.FALLBACK_MOBILE = 'UnknownMobile';
+        isArray = ('isArray' in Array) ?
+            Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; };
+        function equalIC(a, b) {
+            return a != null && b != null && a.toLowerCase() === b.toLowerCase();
+        }
+        function containsIC(array, value) {
+            var valueLC, i, len = array.length;
+            if (!len || !value) {
+                return false;
+            }
+            valueLC = value.toLowerCase();
+            for (i = 0; i < len; ++i) {
+                if (valueLC === array[i].toLowerCase()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function convertPropsToRegExp(object) {
+            for (var key in object) {
+                if (hasOwnProp.call(object, key)) {
+                    object[key] = new RegExp(object[key], 'i');
+                }
+            }
+        }
+        (function init() {
+            var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules;
+            for (key in mobileDetectRules.props) {
+                if (hasOwnProp.call(mobileDetectRules.props, key)) {
+                    values = mobileDetectRules.props[key];
+                    if (!isArray(values)) {
+                        values = [values];
+                    }
+                    len = values.length;
+                    for (i = 0; i < len; ++i) {
+                        value = values[i];
+                        verPos = value.indexOf('[VER]');
+                        if (verPos >= 0) {
+                            value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5);
+                        }
+                        values[i] = new RegExp(value, 'i');
+                    }
+                    mobileDetectRules.props[key] = values;
+                }
+            }
+            convertPropsToRegExp(mobileDetectRules.oss);
+            convertPropsToRegExp(mobileDetectRules.phones);
+            convertPropsToRegExp(mobileDetectRules.tablets);
+            convertPropsToRegExp(mobileDetectRules.uas);
+            convertPropsToRegExp(mobileDetectRules.utils);
+            // copy some patterns to oss0 which are tested first (see issue#15)
+            mobileDetectRules.oss0 = {
+                WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS,
+                WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS
+            };
+        }());
+        /**
+         * Test userAgent string against a set of rules and find the first matched key.
+         * @param {Object} rules (key is String, value is RegExp)
+         * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+         * @returns {String|null} the matched key if found, otherwise <tt>null</tt>
+         * @private
+         */
+        impl.findMatch = function (rules, userAgent) {
+            for (var key in rules) {
+                if (hasOwnProp.call(rules, key)) {
+                    if (rules[key].test(userAgent)) {
+                        return key;
+                    }
+                }
+            }
+            return null;
+        };
+        /**
+         * Test userAgent string against a set of rules and return an array of matched keys.
+         * @param {Object} rules (key is String, value is RegExp)
+         * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+         * @returns {Array} an array of matched keys, may be empty when there is no match, but not <tt>null</tt>
+         * @private
+         */
+        impl.findMatches = function (rules, userAgent) {
+            var result = [];
+            for (var key in rules) {
+                if (hasOwnProp.call(rules, key)) {
+                    if (rules[key].test(userAgent)) {
+                        result.push(key);
+                    }
+                }
+            }
+            return result;
+        };
+        /**
+         * Check the version of the given property in the User-Agent.
+         *
+         * @param {String} propertyName
+         * @param {String} userAgent
+         * @return {String} version or <tt>null</tt> if version not found
+         * @private
+         */
+        impl.getVersionStr = function (propertyName, userAgent) {
+            var props = impl.mobileDetectRules.props, patterns, i, len, match;
+            if (hasOwnProp.call(props, propertyName)) {
+                patterns = props[propertyName];
+                len = patterns.length;
+                for (i = 0; i < len; ++i) {
+                    match = patterns[i].exec(userAgent);
+                    if (match !== null) {
+                        return match[1];
+                    }
+                }
+            }
+            return null;
+        };
+        /**
+         * Check the version of the given property in the User-Agent.
+         * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+         *
+         * @param {String} propertyName
+         * @param {String} userAgent
+         * @return {Number} version or <tt>NaN</tt> if version not found
+         * @private
+         */
+        impl.getVersion = function (propertyName, userAgent) {
+            var version = impl.getVersionStr(propertyName, userAgent);
+            return version ? impl.prepareVersionNo(version) : NaN;
+        };
+        /**
+         * Prepare the version number.
+         *
+         * @param {String} version
+         * @return {Number} the version number as a floating number
+         * @private
+         */
+        impl.prepareVersionNo = function (version) {
+            var numbers;
+            numbers = version.split(/[a-z._ \/\-]/i);
+            if (numbers.length === 1) {
+                version = numbers[0];
+            }
+            if (numbers.length > 1) {
+                version = numbers[0] + '.';
+                numbers.shift();
+                version += numbers.join('');
+            }
+            return Number(version);
+        };
+        impl.isMobileFallback = function (userAgent) {
+            return impl.detectMobileBrowsers.fullPattern.test(userAgent) ||
+                impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0, 4));
+        };
+        impl.isTabletFallback = function (userAgent) {
+            return impl.detectMobileBrowsers.tabletPattern.test(userAgent);
+        };
+        impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) {
+            if (cache.mobile !== undefined) {
+                return;
+            }
+            var phone, tablet, phoneSized;
+            // first check for stronger tablet rules, then phone (see issue#5)
+            tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent);
+            if (tablet) {
+                cache.mobile = cache.tablet = tablet;
+                cache.phone = null;
+                return; // unambiguously identified as tablet
+            }
+            phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent);
+            if (phone) {
+                cache.mobile = cache.phone = phone;
+                cache.tablet = null;
+                return; // unambiguously identified as phone
+            }
+            // our rules haven't found a match -> try more general fallback rules
+            if (impl.isMobileFallback(userAgent)) {
+                phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth);
+                if (phoneSized === undefined) {
+                    cache.mobile = impl.FALLBACK_MOBILE;
+                    cache.tablet = cache.phone = null;
+                }
+                else if (phoneSized) {
+                    cache.mobile = cache.phone = impl.FALLBACK_PHONE;
+                    cache.tablet = null;
+                }
+                else {
+                    cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+                    cache.phone = null;
+                }
+            }
+            else if (impl.isTabletFallback(userAgent)) {
+                cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+                cache.phone = null;
+            }
+            else {
+                // not mobile at all!
+                cache.mobile = cache.tablet = cache.phone = null;
+            }
+        };
+        // t is a reference to a MobileDetect instance
+        impl.mobileGrade = function (t) {
+            // impl note:
+            // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version.
+            // When changes are made in Mobile_Detect.php, copy this method and replace:
+            //     $this-> / t.
+            //     self::MOBILE_GRADE_(.) / '$1'
+            //     , self::VERSION_TYPE_FLOAT / (nothing)
+            //     isIOS() / os('iOS')
+            //     [reg] / (nothing)   <-- jsdelivr complaining about unescaped unicode character U+00AE
+            var $isMobile = t.mobile() !== null;
+            if (
+            // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1)
+            t.os('iOS') && t.version('iPad') >= 4.3 ||
+                t.os('iOS') && t.version('iPhone') >= 3.1 ||
+                t.os('iOS') && t.version('iPod') >= 3.1 ||
+                // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+                // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
+                // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
+                // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
+                (t.version('Android') > 2.1 && t.is('Webkit')) ||
+                // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800
+                t.version('Windows Phone OS') >= 7.0 ||
+                // Blackberry 7 - Tested on BlackBerry Torch 9810
+                // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670
+                t.is('BlackBerry') && t.version('BlackBerry') >= 6.0 ||
+                // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
+                t.match('Playbook.*Tablet') ||
+                // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)
+                (t.version('webOS') >= 1.4 && t.match('Palm|Pre|Pixi')) ||
+                // Palm WebOS 3.0  - Tested on HP TouchPad
+                t.match('hp.*TouchPad') ||
+                // Firefox Mobile (12 Beta) - Tested on Android 2.3 device
+                (t.is('Firefox') && t.version('Firefox') >= 12) ||
+                // Chrome for Android - Tested on Android 4.0, 4.1 device
+                (t.is('Chrome') && t.is('AndroidOS') && t.version('Android') >= 4.0) ||
+                // Skyfire 4.1 - Tested on Android 2.3 device
+                (t.is('Skyfire') && t.version('Skyfire') >= 4.1 && t.is('AndroidOS') && t.version('Android') >= 2.3) ||
+                // Opera Mobile 11.5-12: Tested on Android 2.3
+                (t.is('Opera') && t.version('Opera Mobi') > 11 && t.is('AndroidOS')) ||
+                // Meego 1.2 - Tested on Nokia 950 and N9
+                t.is('MeeGoOS') ||
+                // Tizen (pre-release) - Tested on early hardware
+                t.is('Tizen') ||
+                // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
+                // @todo: more tests here!
+                t.is('Dolfin') && t.version('Bada') >= 2.0 ||
+                // UC Browser - Tested on Android 2.3 device
+                ((t.is('UC Browser') || t.is('Dolfin')) && t.version('Android') >= 2.3) ||
+                // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
+                (t.match('Kindle Fire') ||
+                    t.is('Kindle') && t.version('Kindle') >= 3.0) ||
+                // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
+                t.is('AndroidOS') && t.is('NookTablet') ||
+                // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7
+                t.version('Chrome') >= 11 && !$isMobile ||
+                // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7
+                t.version('Safari') >= 5.0 && !$isMobile ||
+                // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7
+                t.version('Firefox') >= 4.0 && !$isMobile ||
+                // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
+                t.version('MSIE') >= 7.0 && !$isMobile ||
+                // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
+                // @reference: http://my.opera.com/community/openweb/idopera/
+                t.version('Opera') >= 10 && !$isMobile) {
+                return 'A';
+            }
+            if (t.os('iOS') && t.version('iPad') < 4.3 ||
+                t.os('iOS') && t.version('iPhone') < 3.1 ||
+                t.os('iOS') && t.version('iPod') < 3.1 ||
+                // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
+                t.is('Blackberry') && t.version('BlackBerry') >= 5 && t.version('BlackBerry') < 6 ||
+                //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
+                (t.version('Opera Mini') >= 5.0 && t.version('Opera Mini') <= 6.5 &&
+                    (t.version('Android') >= 2.3 || t.is('iOS'))) ||
+                // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+                t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
+                // @todo: report this (tested on Nokia N71)
+                t.version('Opera Mobi') >= 11 && t.is('SymbianOS')) {
+                return 'B';
+            }
+            if (
+            // Blackberry 4.x - Tested on the Curve 8330
+            t.version('BlackBerry') < 5.0 ||
+                // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
+                t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile') <= 5.2) {
+                return 'C';
+            }
+            //All older smartphone platforms and featurephones - Any device that doesn't support media queries
+            //will receive the basic, C grade experience.
+            return 'C';
+        };
+        impl.detectOS = function (ua) {
+            return impl.findMatch(impl.mobileDetectRules.oss0, ua) ||
+                impl.findMatch(impl.mobileDetectRules.oss, ua);
+        };
+        impl.getDeviceSmallerSide = function () {
+            return window.screen.width < window.screen.height ?
+                window.screen.width :
+                window.screen.height;
+        };
+        /**
+         * Constructor for MobileDetect object.
+         * <br>
+         * Such an object will keep a reference to the given user-agent string and cache most of the detect queries.<br>
+         * <div style="background-color: #d9edf7; border: 1px solid #bce8f1; color: #3a87ad; padding: 14px; border-radius: 2px; margin-top: 20px">
+         *     <strong>Find information how to download and install:</strong>
+         *     <a href="https://github.com/hgoebl/mobile-detect.js/">github.com/hgoebl/mobile-detect.js/</a>
+         * </div>
+         *
+         * @example <pre>
+         *     var md = new MobileDetect(window.navigator.userAgent);
+         *     if (md.mobile()) {
+         *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';
+         *     }
+         * </pre>
+         *
+         * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent']
+         * @param {number} [maxPhoneWidth=600] <strong>only for browsers</strong> specify a value for the maximum
+         *        width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled
+         *        as phone.
+         *        This is only used in cases where the device cannot be classified as phone or tablet.<br>
+         *        See <a href="http://developer.android.com/guide/practices/screens_support.html">Declaring Tablet Layouts
+         *        for Android</a>.<br>
+         *        If you provide a value < 0, then this "fuzzy" check is disabled.
+         * @constructor
+         * @global
+         */
+        function MobileDetect(userAgent, maxPhoneWidth) {
+            this.ua = userAgent || '';
+            this._cache = {};
+            //600dp is typical 7" tablet minimum width
+            this.maxPhoneWidth = maxPhoneWidth || 600;
+        }
+        MobileDetect.prototype = {
+            constructor: MobileDetect,
+            /**
+             * Returns the detected phone or tablet type or <tt>null</tt> if it is not a mobile device.
+             * <br>
+             * For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.<br>
+             * <br>
+             * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+             * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+             * is positive, a value of <code>UnknownPhone</code>, <code>UnknownTablet</code> or
+             * <code>UnknownMobile</code> is returned.<br>
+             * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+             * <br>
+             * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+             * and <code>UnknownMobile</code>, so you will get <code>UnknownMobile</code> here.<br>
+             * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+             * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+             * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+             * <br>
+             * In most cases you will use the return value just as a boolean.
+             *
+             * @returns {String} the key for the phone family or tablet family, e.g. "Nexus".
+             * @function MobileDetect#mobile
+             */
+            mobile: function () {
+                impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+                return this._cache.mobile;
+            },
+            /**
+             * Returns the detected phone type/family string or <tt>null</tt>.
+             * <br>
+             * The returned tablet (family or producer) is one of following keys:<br>
+             * <br><tt>iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus,
+             * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley,
+             * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone</tt><br>
+             * <br>
+             * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+             * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+             * is positive, a value of <code>UnknownPhone</code> or <code>UnknownMobile</code> is returned.<br>
+             * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+             * <br>
+             * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+             * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+             * will return <code>UnknownMobile</code>.<br>
+             * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+             * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+             * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+             * <br>
+             * In most cases you will use the return value just as a boolean.
+             *
+             * @returns {String} the key of the phone family or producer, e.g. "iPhone"
+             * @function MobileDetect#phone
+             */
+            phone: function () {
+                impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+                return this._cache.phone;
+            },
+            /**
+             * Returns the detected tablet type/family string or <tt>null</tt>.
+             * <br>
+             * The returned tablet (family or producer) is one of following keys:<br>
+             * <br><tt>iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet,
+             * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet,
+             * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet,
+             * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet,
+             * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet,
+             * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet,
+             * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet,
+             * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet,
+             * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet,
+             * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet,
+             * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet,
+             * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet,
+             * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet,
+             * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet,
+             * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet,
+             * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet,
+             * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet,
+             * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet,
+             * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet,
+             * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet,
+             * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl,
+             * TelstraTablet, GenericTablet</tt><br>
+             * <br>
+             * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+             * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+             * is positive, a value of <code>UnknownTablet</code> or <code>UnknownMobile</code> is returned.<br>
+             * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+             * <br>
+             * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+             * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+             * will return <code>UnknownMobile</code>.<br>
+             * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+             * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+             * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+             * <br>
+             * In most cases you will use the return value just as a boolean.
+             *
+             * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet"
+             * @function MobileDetect#tablet
+             */
+            tablet: function () {
+                impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+                return this._cache.tablet;
+            },
+            /**
+             * Returns the (first) detected user-agent string or <tt>null</tt>.
+             * <br>
+             * The returned user-agent is one of following keys:<br>
+             * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+             * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+             * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+             * <br>
+             * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+             * cases where a mobile device pretends to be more than one particular browser. You can get the
+             * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+             * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+             *
+             * @returns {String} the key for the detected user-agent or <tt>null</tt>
+             * @function MobileDetect#userAgent
+             */
+            userAgent: function () {
+                if (this._cache.userAgent === undefined) {
+                    this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua);
+                }
+                return this._cache.userAgent;
+            },
+            /**
+             * Returns all detected user-agent strings.
+             * <br>
+             * The array is empty or contains one or more of following keys:<br>
+             * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+             * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+             * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+             * <br>
+             * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+             * cases where a mobile device pretends to be more than one particular browser. You can get the
+             * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+             * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+             *
+             * @returns {Array} the array of detected user-agent keys or <tt>[]</tt>
+             * @function MobileDetect#userAgents
+             */
+            userAgents: function () {
+                if (this._cache.userAgents === undefined) {
+                    this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua);
+                }
+                return this._cache.userAgents;
+            },
+            /**
+             * Returns the detected operating system string or <tt>null</tt>.
+             * <br>
+             * The operating system is one of following keys:<br>
+             * <br><tt>AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS,
+             * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS</tt><br>
+             *
+             * @returns {String} the key for the detected operating system.
+             * @function MobileDetect#os
+             */
+            os: function () {
+                if (this._cache.os === undefined) {
+                    this._cache.os = impl.detectOS(this.ua);
+                }
+                return this._cache.os;
+            },
+            /**
+             * Get the version (as Number) of the given property in the User-Agent.
+             * <br>
+             * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+             *
+             * @param {String} key a key defining a thing which has a version.<br>
+             *        You can use one of following keys:<br>
+             * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+             * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+             * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+             * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+             * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+             * CE, Windows NT, Symbian, webOS</tt><br>
+             *
+             * @returns {Number} the version as float or <tt>NaN</tt> if User-Agent doesn't contain this version.
+             *          Be careful when comparing this value with '==' operator!
+             * @function MobileDetect#version
+             */
+            version: function (key) {
+                return impl.getVersion(key, this.ua);
+            },
+            /**
+             * Get the version (as String) of the given property in the User-Agent.
+             * <br>
+             *
+             * @param {String} key a key defining a thing which has a version.<br>
+             *        You can use one of following keys:<br>
+             * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+             * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+             * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+             * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+             * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+             * CE, Windows NT, Symbian, webOS</tt><br>
+             *
+             * @returns {String} the "raw" version as String or <tt>null</tt> if User-Agent doesn't contain this version.
+             *
+             * @function MobileDetect#versionStr
+             */
+            versionStr: function (key) {
+                return impl.getVersionStr(key, this.ua);
+            },
+            /**
+             * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string.
+             *
+             * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or
+             *        tablet family.<br>
+             *        For a complete list of possible values, see {@link MobileDetect#userAgent},
+             *        {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.<br>
+             *        Additionally you have following keys:<br>
+             * <br><tt>Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch</tt><br>
+             *
+             * @returns {boolean} <tt>true</tt> when the given key is one of the defined keys of userAgent, os, phone,
+             *                    tablet or one of the listed additional keys, otherwise <tt>false</tt>
+             * @function MobileDetect#is
+             */
+            is: function (key) {
+                return containsIC(this.userAgents(), key) ||
+                    equalIC(key, this.os()) ||
+                    equalIC(key, this.phone()) ||
+                    equalIC(key, this.tablet()) ||
+                    containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key);
+            },
+            /**
+             * Do a quick test against navigator::userAgent.
+             *
+             * @param {String|RegExp} pattern the pattern, either as String or RegExp
+             *                        (a string will be converted to a case-insensitive RegExp).
+             * @returns {boolean} <tt>true</tt> when the pattern matches, otherwise <tt>false</tt>
+             * @function MobileDetect#match
+             */
+            match: function (pattern) {
+                if (!(pattern instanceof RegExp)) {
+                    pattern = new RegExp(pattern, 'i');
+                }
+                return pattern.test(this.ua);
+            },
+            /**
+             * Checks whether the mobile device can be considered as phone regarding <code>screen.width</code>.
+             * <br>
+             * Obviously this method makes sense in browser environments only (not for Node.js)!
+             * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.<br>
+             *        The argument is optional and if not present or falsy, the value of the constructor is taken.
+             * @returns {boolean|undefined} <code>undefined</code> if screen size wasn't detectable, else <code>true</code>
+             *          when screen.width is less or equal to maxPhoneWidth, otherwise <code>false</code>.<br>
+             *          Will always return <code>undefined</code> server-side.
+             */
+            isPhoneSized: function (maxPhoneWidth) {
+                return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth);
+            },
+            /**
+             * Returns the mobile grade ('A', 'B', 'C').
+             *
+             * @returns {String} one of the mobile grades ('A', 'B', 'C').
+             * @function MobileDetect#mobileGrade
+             */
+            mobileGrade: function () {
+                if (this._cache.grade === undefined) {
+                    this._cache.grade = impl.mobileGrade(this);
+                }
+                return this._cache.grade;
+            }
+        };
+        // environment-dependent
+        if (typeof window !== 'undefined' && window.screen) {
+            MobileDetect.isPhoneSized = function (maxPhoneWidth) {
+                return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth;
+            };
+        }
+        else {
+            MobileDetect.isPhoneSized = function () { };
+        }
+        // should not be replaced by a completely new object - just overwrite existing methods
+        MobileDetect._impl = impl;
+        MobileDetect.version = '1.3.3 2016-07-31';
+        return MobileDetect;
+    }); // end of call of define()
+})((function (undefined) {
+    if (typeof module !== 'undefined' && module.exports) {
+        return function (factory) { module.exports = factory(); };
+    }
+    else if (typeof define === 'function' && define.amd) {
+        return define;
+    }
+    else if (typeof window !== 'undefined') {
+        return function (factory) { window.MobileDetect = factory(); };
+    }
+    else {
+        // please file a bug if you get this error!
+        throw new Error('unknown environment');
+    }
+})());
diff --git a/tests/baselines/reference/functionExpressionInWithBlock.js b/tests/baselines/reference/functionExpressionInWithBlock.js
index f2353412d5c..2fae2384313 100644
--- a/tests/baselines/reference/functionExpressionInWithBlock.js
+++ b/tests/baselines/reference/functionExpressionInWithBlock.js
@@ -11,7 +11,8 @@ function x() {
 function x() {
     with ({}) {
         function f() {
-            (function () { return this; });
+            var _this = this;
+            (function () { return _this; });
         }
     }
 }
diff --git a/tests/baselines/reference/functionsWithModifiersInBlocks1.js b/tests/baselines/reference/functionsWithModifiersInBlocks1.js
index 757fe509747..3edd17321cb 100644
--- a/tests/baselines/reference/functionsWithModifiersInBlocks1.js
+++ b/tests/baselines/reference/functionsWithModifiersInBlocks1.js
@@ -8,5 +8,4 @@
 //// [functionsWithModifiersInBlocks1.js]
 {
     function f() { }
-    exports.f = f;
 }
diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js
index 8093c8bec41..e5488121d34 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -612,219 +612,219 @@ var x48 = (function () {
 var x49 = (function () {
     function x49() {
     }
-    x49.member = function () { return [d1, d2]; };
     return x49;
 }());
+x49.member = function () { return [d1, d2]; };
 var x50 = (function () {
     function x50() {
     }
-    x50.member = function () { return [d1, d2]; };
     return x50;
 }());
+x50.member = function () { return [d1, d2]; };
 var x51 = (function () {
     function x51() {
     }
-    x51.member = function named() { return [d1, d2]; };
     return x51;
 }());
+x51.member = function named() { return [d1, d2]; };
 var x52 = (function () {
     function x52() {
     }
-    x52.member = function () { return [d1, d2]; };
     return x52;
 }());
+x52.member = function () { return [d1, d2]; };
 var x53 = (function () {
     function x53() {
     }
-    x53.member = function () { return [d1, d2]; };
     return x53;
 }());
+x53.member = function () { return [d1, d2]; };
 var x54 = (function () {
     function x54() {
     }
-    x54.member = function named() { return [d1, d2]; };
     return x54;
 }());
+x54.member = function named() { return [d1, d2]; };
 var x55 = (function () {
     function x55() {
     }
-    x55.member = [d1, d2];
     return x55;
 }());
+x55.member = [d1, d2];
 var x56 = (function () {
     function x56() {
     }
-    x56.member = [d1, d2];
     return x56;
 }());
+x56.member = [d1, d2];
 var x57 = (function () {
     function x57() {
     }
-    x57.member = [d1, d2];
     return x57;
 }());
+x57.member = [d1, d2];
 var x58 = (function () {
     function x58() {
     }
-    x58.member = { n: [d1, d2] };
     return x58;
 }());
+x58.member = { n: [d1, d2] };
 var x59 = (function () {
     function x59() {
     }
-    x59.member = function (n) { var n; return null; };
     return x59;
 }());
+x59.member = function (n) { var n; return null; };
 var x60 = (function () {
     function x60() {
     }
-    x60.member = { func: function (n) { return [d1, d2]; } };
     return x60;
 }());
+x60.member = { func: function (n) { return [d1, d2]; } };
 var x61 = (function () {
     function x61() {
     }
-    x61.member = function () { return [d1, d2]; };
     return x61;
 }());
+x61.member = function () { return [d1, d2]; };
 var x62 = (function () {
     function x62() {
     }
-    x62.member = function () { return [d1, d2]; };
     return x62;
 }());
+x62.member = function () { return [d1, d2]; };
 var x63 = (function () {
     function x63() {
     }
-    x63.member = function named() { return [d1, d2]; };
     return x63;
 }());
+x63.member = function named() { return [d1, d2]; };
 var x64 = (function () {
     function x64() {
     }
-    x64.member = function () { return [d1, d2]; };
     return x64;
 }());
+x64.member = function () { return [d1, d2]; };
 var x65 = (function () {
     function x65() {
     }
-    x65.member = function () { return [d1, d2]; };
     return x65;
 }());
+x65.member = function () { return [d1, d2]; };
 var x66 = (function () {
     function x66() {
     }
-    x66.member = function named() { return [d1, d2]; };
     return x66;
 }());
+x66.member = function named() { return [d1, d2]; };
 var x67 = (function () {
     function x67() {
     }
-    x67.member = [d1, d2];
     return x67;
 }());
+x67.member = [d1, d2];
 var x68 = (function () {
     function x68() {
     }
-    x68.member = [d1, d2];
     return x68;
 }());
+x68.member = [d1, d2];
 var x69 = (function () {
     function x69() {
     }
-    x69.member = [d1, d2];
     return x69;
 }());
+x69.member = [d1, d2];
 var x70 = (function () {
     function x70() {
     }
-    x70.member = { n: [d1, d2] };
     return x70;
 }());
+x70.member = { n: [d1, d2] };
 var x71 = (function () {
     function x71() {
     }
-    x71.member = function (n) { var n; return null; };
     return x71;
 }());
+x71.member = function (n) { var n; return null; };
 var x72 = (function () {
     function x72() {
     }
-    x72.member = { func: function (n) { return [d1, d2]; } };
     return x72;
 }());
+x72.member = { func: function (n) { return [d1, d2]; } };
 var x73 = (function () {
     function x73() {
     }
-    x73.member = function () { return [d1, d2]; };
     return x73;
 }());
+x73.member = function () { return [d1, d2]; };
 var x74 = (function () {
     function x74() {
     }
-    x74.member = function () { return [d1, d2]; };
     return x74;
 }());
+x74.member = function () { return [d1, d2]; };
 var x75 = (function () {
     function x75() {
     }
-    x75.member = function named() { return [d1, d2]; };
     return x75;
 }());
+x75.member = function named() { return [d1, d2]; };
 var x76 = (function () {
     function x76() {
     }
-    x76.member = function () { return [d1, d2]; };
     return x76;
 }());
+x76.member = function () { return [d1, d2]; };
 var x77 = (function () {
     function x77() {
     }
-    x77.member = function () { return [d1, d2]; };
     return x77;
 }());
+x77.member = function () { return [d1, d2]; };
 var x78 = (function () {
     function x78() {
     }
-    x78.member = function named() { return [d1, d2]; };
     return x78;
 }());
+x78.member = function named() { return [d1, d2]; };
 var x79 = (function () {
     function x79() {
     }
-    x79.member = [d1, d2];
     return x79;
 }());
+x79.member = [d1, d2];
 var x80 = (function () {
     function x80() {
     }
-    x80.member = [d1, d2];
     return x80;
 }());
+x80.member = [d1, d2];
 var x81 = (function () {
     function x81() {
     }
-    x81.member = [d1, d2];
     return x81;
 }());
+x81.member = [d1, d2];
 var x82 = (function () {
     function x82() {
     }
-    x82.member = { n: [d1, d2] };
     return x82;
 }());
+x82.member = { n: [d1, d2] };
 var x83 = (function () {
     function x83() {
     }
-    x83.member = function (n) { var n; return null; };
     return x83;
 }());
+x83.member = function (n) { var n; return null; };
 var x84 = (function () {
     function x84() {
     }
-    x84.member = { func: function (n) { return [d1, d2]; } };
     return x84;
 }());
+x84.member = { func: function (n) { return [d1, d2]; } };
 var x85 = (function () {
     function x85(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
diff --git a/tests/baselines/reference/generatorTypeCheck55.js b/tests/baselines/reference/generatorTypeCheck55.js
index dd7cd33af29..4943791d354 100644
--- a/tests/baselines/reference/generatorTypeCheck55.js
+++ b/tests/baselines/reference/generatorTypeCheck55.js
@@ -6,6 +6,5 @@ function* g() {
 //// [generatorTypeCheck55.js]
 function* g() {
     var x = class C extends (yield) {
-    }
-    ;
+    };
 }
diff --git a/tests/baselines/reference/generatorTypeCheck56.js b/tests/baselines/reference/generatorTypeCheck56.js
index c1b0f98f5e7..9d8d00e01e7 100644
--- a/tests/baselines/reference/generatorTypeCheck56.js
+++ b/tests/baselines/reference/generatorTypeCheck56.js
@@ -13,6 +13,5 @@ function* g() {
         *[yield 0]() {
             yield 0;
         }
-    }
-    ;
+    };
 }
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js
index 2039e459572..053fa785ee0 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js
@@ -25,9 +25,9 @@ var Foo = (function () {
     Foo.f = function (xs) {
         return xs.reverse();
     };
-    Foo.a = function (n) { };
-    Foo.c = [];
-    Foo.d = false || (function (x) { return x || undefined; })(null);
-    Foo.e = function (x) { return null; };
     return Foo;
 }());
+Foo.a = function (n) { };
+Foo.c = [];
+Foo.d = false || (function (x) { return x || undefined; })(null);
+Foo.e = function (x) { return null; };
diff --git a/tests/baselines/reference/getEmitOutput-pp.baseline b/tests/baselines/reference/getEmitOutput-pp.baseline
index d6952e4537d..683b454a275 100644
--- a/tests/baselines/reference/getEmitOutput-pp.baseline
+++ b/tests/baselines/reference/getEmitOutput-pp.baseline
@@ -1,12 +1,12 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/shims-pp/inputFile1.js
+FileName : /tests/cases/fourslash/shims-pp/inputFile1.js
 var x = 5;
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
 }());
-FileName : tests/cases/fourslash/shims-pp/inputFile1.d.ts
+FileName : /tests/cases/fourslash/shims-pp/inputFile1.d.ts
 declare var x: number;
 declare class Bar {
     x: string;
@@ -14,14 +14,14 @@ declare class Bar {
 }
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/shims-pp/inputFile2.js
+FileName : /tests/cases/fourslash/shims-pp/inputFile2.js
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
-FileName : tests/cases/fourslash/shims-pp/inputFile2.d.ts
+FileName : /tests/cases/fourslash/shims-pp/inputFile2.d.ts
 declare var x1: string;
 declare class Foo {
     x: string;
diff --git a/tests/baselines/reference/getEmitOutput.baseline b/tests/baselines/reference/getEmitOutput.baseline
index 52c7d8a7aae..8251850e1bb 100644
--- a/tests/baselines/reference/getEmitOutput.baseline
+++ b/tests/baselines/reference/getEmitOutput.baseline
@@ -1,12 +1,12 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/shims/inputFile1.js
+FileName : /tests/cases/fourslash/shims/inputFile1.js
 var x = 5;
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
 }());
-FileName : tests/cases/fourslash/shims/inputFile1.d.ts
+FileName : /tests/cases/fourslash/shims/inputFile1.d.ts
 declare var x: number;
 declare class Bar {
     x: string;
@@ -14,14 +14,14 @@ declare class Bar {
 }
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/shims/inputFile2.js
+FileName : /tests/cases/fourslash/shims/inputFile2.js
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
-FileName : tests/cases/fourslash/shims/inputFile2.d.ts
+FileName : /tests/cases/fourslash/shims/inputFile2.d.ts
 declare var x1: string;
 declare class Foo {
     x: string;
diff --git a/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline b/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline
index 5a6fb434b1f..56eb932fb5d 100644
--- a/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline
+++ b/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline
@@ -1,12 +1,12 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js
 var x = 5;
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
 }());
-FileName : tests/cases/fourslash/inputFile1.d.ts
+FileName : /tests/cases/fourslash/inputFile1.d.ts
 declare var x: number;
 declare class Bar {
     x: string;
@@ -14,14 +14,14 @@ declare class Bar {
 }
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.js
+FileName : /tests/cases/fourslash/inputFile2.js
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
-FileName : tests/cases/fourslash/inputFile2.d.ts
+FileName : /tests/cases/fourslash/inputFile2.d.ts
 declare var x1: string;
 declare class Foo {
     x: string;
diff --git a/tests/baselines/reference/getEmitOutputNoErrors.baseline b/tests/baselines/reference/getEmitOutputNoErrors.baseline
index 461cba4ea05..6469ab3d1a7 100644
--- a/tests/baselines/reference/getEmitOutputNoErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputNoErrors.baseline
@@ -1,5 +1,5 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js
 var x;
 var M = (function () {
     function M() {
diff --git a/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline b/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline
index 4d1c88e45b4..dbcfe28afaa 100644
--- a/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline
+++ b/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline
@@ -1,5 +1,5 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.js
+FileName : /tests/cases/fourslash/inputFile2.js
 var x;
 var Foo = (function () {
     function Foo() {
diff --git a/tests/baselines/reference/getEmitOutputSingleFile2.baseline b/tests/baselines/reference/getEmitOutputSingleFile2.baseline
index 2a7b4ac367e..a756897fffb 100644
--- a/tests/baselines/reference/getEmitOutputSingleFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputSingleFile2.baseline
@@ -23,8 +23,4 @@ declare class Foo {
     x: string;
     y: number;
 }
-declare module "inputFile3" {
-    export var foo: number;
-    export var bar: string;
-}
 
diff --git a/tests/baselines/reference/getEmitOutputSourceMap.baseline b/tests/baselines/reference/getEmitOutputSourceMap.baseline
index 65257d63607..25667b8b701 100644
--- a/tests/baselines/reference/getEmitOutputSourceMap.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceMap.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile.js.map
-{"version":3,"file":"inputFile.js","sourceRoot":"","sources":["inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js.map
+{"version":3,"file":"inputFile.js","sourceRoot":"","sources":["inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : /tests/cases/fourslash/inputFile.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {
diff --git a/tests/baselines/reference/getEmitOutputSourceRoot.baseline b/tests/baselines/reference/getEmitOutputSourceRoot.baseline
index d38078a08e3..5881a61f22a 100644
--- a/tests/baselines/reference/getEmitOutputSourceRoot.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceRoot.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile.js.map
-{"version":3,"file":"inputFile.js","sourceRoot":"sourceRootDir/","sources":["inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js.map
+{"version":3,"file":"inputFile.js","sourceRoot":"sourceRootDir/","sources":["inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : /tests/cases/fourslash/inputFile.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {
diff --git a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline
index 50a6ad68605..62e3f2eb7e5 100644
--- a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"sourceRootDir/","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js.map
+{"version":3,"file":"inputFile1.js","sourceRoot":"sourceRootDir/","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : /tests/cases/fourslash/inputFile1.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {
@@ -10,8 +10,8 @@ var M = (function () {
 }());
 //# sourceMappingURL=inputFile1.js.map
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.js.map
-{"version":3,"file":"inputFile2.js","sourceRoot":"sourceRootDir/","sources":["inputFile2.ts"],"names":[],"mappings":"AAAA,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACnC;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile2.js
+FileName : /tests/cases/fourslash/inputFile2.js.map
+{"version":3,"file":"inputFile2.js","sourceRoot":"sourceRootDir/","sources":["inputFile2.ts"],"names":[],"mappings":"AAAA,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACnC;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : /tests/cases/fourslash/inputFile2.js
 var bar = "hello world Typescript";
 var C = (function () {
     function C() {
diff --git a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline
index bebd1ff1dd1..015ddba07d9 100644
--- a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline
+++ b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js.map
+{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC"}FileName : /tests/cases/fourslash/inputFile1.js
 // regular ts file
 var t = 5;
 var Bar = (function () {
@@ -8,7 +8,7 @@ var Bar = (function () {
     }
     return Bar;
 }());
-//# sourceMappingURL=inputFile1.js.mapFileName : tests/cases/fourslash/inputFile1.d.ts
+//# sourceMappingURL=inputFile1.js.mapFileName : /tests/cases/fourslash/inputFile1.d.ts
 declare var t: number;
 declare class Bar {
     x: string;
@@ -16,11 +16,11 @@ declare class Bar {
 }
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.jsx.map
-{"version":3,"file":"inputFile2.jsx","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.jsx
+FileName : /tests/cases/fourslash/inputFile2.jsx.map
+{"version":3,"file":"inputFile2.jsx","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC,EAAG,CAAA"}FileName : /tests/cases/fourslash/inputFile2.jsx
 var y = "my div";
 var x = <div name={y}/>;
-//# sourceMappingURL=inputFile2.jsx.mapFileName : tests/cases/fourslash/inputFile2.d.ts
+//# sourceMappingURL=inputFile2.jsx.mapFileName : /tests/cases/fourslash/inputFile2.d.ts
 declare var y: string;
 declare var x: any;
 
diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
index 5b668fd65e8..b139e9c1ca0 100644
--- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
+++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js.map
+{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC"}FileName : /tests/cases/fourslash/inputFile1.js
 // regular ts file
 var t = 5;
 var Bar = (function () {
@@ -8,7 +8,7 @@ var Bar = (function () {
     }
     return Bar;
 }());
-//# sourceMappingURL=inputFile1.js.mapFileName : tests/cases/fourslash/inputFile1.d.ts
+//# sourceMappingURL=inputFile1.js.mapFileName : /tests/cases/fourslash/inputFile1.d.ts
 declare var t: number;
 declare class Bar {
     x: string;
@@ -16,11 +16,11 @@ declare class Bar {
 }
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.js.map
-{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,qBAAC,GAAG,IAAC,IAAI,EAAG,CAAE,EAAG,CAAA"}FileName : tests/cases/fourslash/inputFile2.js
+FileName : /tests/cases/fourslash/inputFile2.js.map
+{"version":3,"file":"inputFile2.js","sourceRoot":"","sources":["inputFile2.tsx"],"names":[],"mappings":"AACA,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjB,IAAI,CAAC,GAAG,6BAAK,IAAI,EAAG,CAAC,GAAI,CAAA"}FileName : /tests/cases/fourslash/inputFile2.js
 var y = "my div";
-var x = React.createElement("div", {name: y});
-//# sourceMappingURL=inputFile2.js.mapFileName : tests/cases/fourslash/inputFile2.d.ts
+var x = React.createElement("div", { name: y });
+//# sourceMappingURL=inputFile2.js.mapFileName : /tests/cases/fourslash/inputFile2.d.ts
 declare var React: any;
 declare var y: string;
 declare var x: any;
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline
index af4ccd10580..a10ef5967b0 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline
@@ -1,7 +1,7 @@
 EmitSkipped: false
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.js
+FileName : /tests/cases/fourslash/inputFile2.js
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 8e43219e005..5c865321691 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -1,7 +1,7 @@
 EmitSkipped: false
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile2.js
+FileName : /tests/cases/fourslash/inputFile2.js
 "use strict";
 var Foo = (function () {
     function Foo() {
@@ -11,6 +11,6 @@ var Foo = (function () {
 exports.Foo = Foo;
 
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile3.js
+FileName : /tests/cases/fourslash/inputFile3.js
 var x = "hello";
 
diff --git a/tests/baselines/reference/getEmitOutputWithEarlySyntacticErrors.baseline b/tests/baselines/reference/getEmitOutputWithEarlySyntacticErrors.baseline
index 9e2e9978f46..6609554a299 100644
--- a/tests/baselines/reference/getEmitOutputWithEarlySyntacticErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEarlySyntacticErrors.baseline
@@ -1,5 +1,5 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js
 // File contains early errors. All outputs should be skipped.
 var uninitialized_const_error;
 
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
index 8ba493e04b7..326d547ae1b 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
@@ -1,7 +1,7 @@
 EmitSkipped: true
 Diagnostics:
   Exported variable 'foo' has or is using private name 'C'.
-FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js
 var M;
 (function (M) {
     var C = (function () {
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index bf12bd35548..a181526eb27 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -1,7 +1,7 @@
 EmitSkipped: true
 Diagnostics:
   Exported variable 'foo' has or is using private name 'C'.
-FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var C = (function () {
diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrors.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrors.baseline
index b6249822131..55a58ea041f 100644
--- a/tests/baselines/reference/getEmitOutputWithSemanticErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputWithSemanticErrors.baseline
@@ -1,4 +1,4 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js
 var x = "hello world";
 
diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline
index 396e220bdb6..b5848da3457 100644
--- a/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline
@@ -1,6 +1,6 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js
 var x = "hello world";
-FileName : tests/cases/fourslash/inputFile.d.ts
+FileName : /tests/cases/fourslash/inputFile.d.ts
 declare var x: number;
 
diff --git a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles.baseline b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles.baseline
index 7f012b6a546..4c22a7e3f93 100644
--- a/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles.baseline
+++ b/tests/baselines/reference/getEmitOutputWithSemanticErrorsForMultipleFiles.baseline
@@ -1,8 +1,8 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js
 // File to emit, does not contain semantic errors
 // expected to be emitted correctelly regardless of the semantic errors in the other file
 var noErrors = true;
-FileName : tests/cases/fourslash/inputFile1.d.ts
+FileName : /tests/cases/fourslash/inputFile1.d.ts
 declare var noErrors: boolean;
 
diff --git a/tests/baselines/reference/getEmitOutputWithSyntacticErrorsForMultipleFiles.baseline b/tests/baselines/reference/getEmitOutputWithSyntacticErrorsForMultipleFiles.baseline
index 701b275eb31..f51782cc75d 100644
--- a/tests/baselines/reference/getEmitOutputWithSyntacticErrorsForMultipleFiles.baseline
+++ b/tests/baselines/reference/getEmitOutputWithSyntacticErrorsForMultipleFiles.baseline
@@ -1,5 +1,5 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile1.js
+FileName : /tests/cases/fourslash/inputFile1.js
 // File to emit, does not contain syntactic errors
 // expected to be emitted correctelly regardless of the syntactic errors in the other file
 var noErrors = true;
diff --git a/tests/baselines/reference/getEmitOutputWithSyntaxErrors.baseline b/tests/baselines/reference/getEmitOutputWithSyntaxErrors.baseline
index 2c341821fb0..8aa81ba60ce 100644
--- a/tests/baselines/reference/getEmitOutputWithSyntaxErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputWithSyntaxErrors.baseline
@@ -1,4 +1,4 @@
 EmitSkipped: false
-FileName : tests/cases/fourslash/inputFile.js
+FileName : /tests/cases/fourslash/inputFile.js
 var x;
 
diff --git a/tests/baselines/reference/gettersAndSetters.js b/tests/baselines/reference/gettersAndSetters.js
index 16d66c7dc71..265a1210b16 100644
--- a/tests/baselines/reference/gettersAndSetters.js
+++ b/tests/baselines/reference/gettersAndSetters.js
@@ -65,9 +65,9 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    C.barBack = "";
     return C;
 }());
+C.barBack = "";
 var c = new C();
 var foo = c.Foo;
 c.Foo = "foov";
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index 94c084df512..c7dd59f9ab7 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -23,7 +23,7 @@ var m;
 })(m = exports.m || (exports.m = {}));
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
-var r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
+var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0");
 var m_private;
 (function (m_private) {
     //import r2 = require('m'); // would be error
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
new file mode 100644
index 00000000000..f850b5cf177
--- /dev/null
+++ b/tests/baselines/reference/importHelpers.js
@@ -0,0 +1,116 @@
+//// [tests/cases/compiler/importHelpers.ts] ////
+
+//// [external.ts]
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [script.ts]
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [external.js]
+"use strict";
+var tslib_1 = require("tslib");
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
+var B = (function (_super) {
+    tslib_1.__extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+exports.B = B;
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+tslib_1.__decorate([
+    tslib_1.__param(0, dec),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Number]),
+    tslib_1.__metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = tslib_1.__decorate([
+    dec,
+    tslib_1.__metadata("design:paramtypes", [])
+], C);
+//// [script.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+__decorate([
+    __param(0, dec),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = __decorate([
+    dec,
+    __metadata("design:paramtypes", [])
+], C);
diff --git a/tests/baselines/reference/importHelpers.symbols b/tests/baselines/reference/importHelpers.symbols
new file mode 100644
index 00000000000..55ca5153e32
--- /dev/null
+++ b/tests/baselines/reference/importHelpers.symbols
@@ -0,0 +1,91 @@
+=== tests/cases/compiler/external.ts ===
+export class A { }
+>A : Symbol(A, Decl(external.ts, 0, 0))
+
+export class B extends A { }
+>B : Symbol(B, Decl(external.ts, 0, 18))
+>A : Symbol(A, Decl(external.ts, 0, 0))
+
+declare var dec: any;
+>dec : Symbol(dec, Decl(external.ts, 3, 11))
+
+@dec
+>dec : Symbol(dec, Decl(external.ts, 3, 11))
+
+class C {
+>C : Symbol(C, Decl(external.ts, 3, 21))
+
+    method(@dec x: number) {
+>method : Symbol(C.method, Decl(external.ts, 6, 9))
+>dec : Symbol(dec, Decl(external.ts, 3, 11))
+>x : Symbol(x, Decl(external.ts, 7, 11))
+    }
+}
+
+=== tests/cases/compiler/script.ts ===
+class A { }
+>A : Symbol(A, Decl(script.ts, 0, 0))
+
+class B extends A { }
+>B : Symbol(B, Decl(script.ts, 0, 11))
+>A : Symbol(A, Decl(script.ts, 0, 0))
+
+declare var dec: any;
+>dec : Symbol(dec, Decl(script.ts, 3, 11))
+
+@dec
+>dec : Symbol(dec, Decl(script.ts, 3, 11))
+
+class C {
+>C : Symbol(C, Decl(script.ts, 3, 21))
+
+    method(@dec x: number) {
+>method : Symbol(C.method, Decl(script.ts, 6, 9))
+>dec : Symbol(dec, Decl(script.ts, 3, 11))
+>x : Symbol(x, Decl(script.ts, 7, 11))
+    }
+}
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/importHelpers.types b/tests/baselines/reference/importHelpers.types
new file mode 100644
index 00000000000..0ab8d40ee85
--- /dev/null
+++ b/tests/baselines/reference/importHelpers.types
@@ -0,0 +1,91 @@
+=== tests/cases/compiler/external.ts ===
+export class A { }
+>A : A
+
+export class B extends A { }
+>B : B
+>A : A
+
+declare var dec: any;
+>dec : any
+
+@dec
+>dec : any
+
+class C {
+>C : C
+
+    method(@dec x: number) {
+>method : (x: number) => void
+>dec : any
+>x : number
+    }
+}
+
+=== tests/cases/compiler/script.ts ===
+class A { }
+>A : A
+
+class B extends A { }
+>B : B
+>A : A
+
+declare var dec: any;
+>dec : any
+
+@dec
+>dec : any
+
+class C {
+>C : C
+
+    method(@dec x: number) {
+>method : (x: number) => void
+>dec : any
+>x : number
+    }
+}
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
new file mode 100644
index 00000000000..bb02cbf0417
--- /dev/null
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -0,0 +1,40 @@
+//// [tests/cases/compiler/importHelpersAmd.ts] ////
+
+//// [a.ts]
+export class A { }
+
+//// [b.ts]
+import { A } from "./a";
+export class B extends A { }
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
+//// [b.js]
+define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
+    "use strict";
+    var B = (function (_super) {
+        tslib_1.__extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    }(a_1.A));
+    exports.B = B;
+});
diff --git a/tests/baselines/reference/importHelpersAmd.symbols b/tests/baselines/reference/importHelpersAmd.symbols
new file mode 100644
index 00000000000..47528a8bba6
--- /dev/null
+++ b/tests/baselines/reference/importHelpersAmd.symbols
@@ -0,0 +1,55 @@
+=== tests/cases/compiler/a.ts ===
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import { A } from "./a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 24))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/importHelpersAmd.types b/tests/baselines/reference/importHelpersAmd.types
new file mode 100644
index 00000000000..9ff756ffaab
--- /dev/null
+++ b/tests/baselines/reference/importHelpersAmd.types
@@ -0,0 +1,55 @@
+=== tests/cases/compiler/a.ts ===
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import { A } from "./a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/importHelpersES6.js b/tests/baselines/reference/importHelpersES6.js
new file mode 100644
index 00000000000..209f3c34588
--- /dev/null
+++ b/tests/baselines/reference/importHelpersES6.js
@@ -0,0 +1,25 @@
+//// [tests/cases/compiler/importHelpersES6.ts] ////
+
+//// [a.ts]
+declare var dec: any;
+@dec export class A {
+
+}
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+import * as tslib_1 from "tslib";
+let A = class A {
+};
+A = tslib_1.__decorate([
+    dec
+], A);
+export { A };
diff --git a/tests/baselines/reference/importHelpersES6.symbols b/tests/baselines/reference/importHelpersES6.symbols
new file mode 100644
index 00000000000..284a2251a6b
--- /dev/null
+++ b/tests/baselines/reference/importHelpersES6.symbols
@@ -0,0 +1,53 @@
+=== tests/cases/compiler/a.ts ===
+declare var dec: any;
+>dec : Symbol(dec, Decl(a.ts, 0, 11))
+
+@dec export class A {
+>dec : Symbol(dec, Decl(a.ts, 0, 11))
+>A : Symbol(A, Decl(a.ts, 0, 21))
+
+}
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+
diff --git a/tests/baselines/reference/importHelpersES6.types b/tests/baselines/reference/importHelpersES6.types
new file mode 100644
index 00000000000..ebfd5a5a2a5
--- /dev/null
+++ b/tests/baselines/reference/importHelpersES6.types
@@ -0,0 +1,53 @@
+=== tests/cases/compiler/a.ts ===
+declare var dec: any;
+>dec : any
+
+@dec export class A {
+>dec : any
+>A : A
+
+}
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.errors.txt b/tests/baselines/reference/importHelpersInIsolatedModules.errors.txt
new file mode 100644
index 00000000000..7a53c1c8c99
--- /dev/null
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.errors.txt
@@ -0,0 +1,37 @@
+tests/cases/compiler/script.ts(1,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided.
+
+
+==== tests/cases/compiler/external.ts (0 errors) ====
+    export class A { }
+    export class B extends A { }
+    
+    declare var dec: any;
+    
+    @dec
+    class C {
+        method(@dec x: number) {
+        }
+    }
+    
+==== tests/cases/compiler/script.ts (1 errors) ====
+    class A { }
+    ~~~~~
+!!! error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided.
+    class B extends A { }
+    
+    declare var dec: any;
+    
+    @dec
+    class C {
+        method(@dec x: number) {
+        }
+    }
+    
+==== tests/cases/compiler/tslib.d.ts (0 errors) ====
+    export declare function __extends(d: Function, b: Function): void;
+    export declare function __assign(t: any, ...sources: any[]): any;
+    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+    export declare function __param(paramIndex: number, decorator: Function): Function;
+    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
new file mode 100644
index 00000000000..a5929bc152c
--- /dev/null
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -0,0 +1,101 @@
+//// [tests/cases/compiler/importHelpersInIsolatedModules.ts] ////
+
+//// [external.ts]
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [script.ts]
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [external.js]
+"use strict";
+var tslib_1 = require("tslib");
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
+var B = (function (_super) {
+    tslib_1.__extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+exports.B = B;
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+tslib_1.__decorate([
+    tslib_1.__param(0, dec),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Number]),
+    tslib_1.__metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = tslib_1.__decorate([
+    dec,
+    tslib_1.__metadata("design:paramtypes", [])
+], C);
+//// [script.js]
+"use strict";
+var tslib_1 = require("tslib");
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+var B = (function (_super) {
+    tslib_1.__extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+tslib_1.__decorate([
+    tslib_1.__param(0, dec),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Number]),
+    tslib_1.__metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = tslib_1.__decorate([
+    dec,
+    tslib_1.__metadata("design:paramtypes", [])
+], C);
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
new file mode 100644
index 00000000000..29e43e191e8
--- /dev/null
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -0,0 +1,35 @@
+//// [tests/cases/compiler/importHelpersInTsx.tsx] ////
+
+//// [external.tsx]
+declare var React: any;
+declare var o: any;
+export const x = <span {...o} />
+
+//// [script.tsx]
+declare var React: any;
+declare var o: any;
+const x = <span {...o} />
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [external.js]
+"use strict";
+var tslib_1 = require("tslib");
+exports.x = React.createElement("span", tslib_1.__assign({}, o));
+//// [script.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var x = React.createElement("span", __assign({}, o));
diff --git a/tests/baselines/reference/importHelpersInTsx.symbols b/tests/baselines/reference/importHelpersInTsx.symbols
new file mode 100644
index 00000000000..465ce502385
--- /dev/null
+++ b/tests/baselines/reference/importHelpersInTsx.symbols
@@ -0,0 +1,67 @@
+=== tests/cases/compiler/external.tsx ===
+declare var React: any;
+>React : Symbol(React, Decl(external.tsx, 0, 11))
+
+declare var o: any;
+>o : Symbol(o, Decl(external.tsx, 1, 11))
+
+export const x = <span {...o} />
+>x : Symbol(x, Decl(external.tsx, 2, 12))
+>span : Symbol(unknown)
+>o : Symbol(o, Decl(external.tsx, 1, 11))
+
+=== tests/cases/compiler/script.tsx ===
+declare var React: any;
+>React : Symbol(React, Decl(script.tsx, 0, 11))
+
+declare var o: any;
+>o : Symbol(o, Decl(script.tsx, 1, 11))
+
+const x = <span {...o} />
+>x : Symbol(x, Decl(script.tsx, 2, 5))
+>span : Symbol(unknown)
+>o : Symbol(o, Decl(script.tsx, 1, 11))
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/importHelpersInTsx.types b/tests/baselines/reference/importHelpersInTsx.types
new file mode 100644
index 00000000000..a6ae6e95f86
--- /dev/null
+++ b/tests/baselines/reference/importHelpersInTsx.types
@@ -0,0 +1,69 @@
+=== tests/cases/compiler/external.tsx ===
+declare var React: any;
+>React : any
+
+declare var o: any;
+>o : any
+
+export const x = <span {...o} />
+>x : any
+><span {...o} /> : any
+>span : any
+>o : any
+
+=== tests/cases/compiler/script.tsx ===
+declare var React: any;
+>React : any
+
+declare var o: any;
+>o : any
+
+const x = <span {...o} />
+>x : any
+><span {...o} /> : any
+>span : any
+>o : any
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/importHelpersNoHelpers.errors.txt b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
new file mode 100644
index 00000000000..ebb25dbd7c9
--- /dev/null
+++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
@@ -0,0 +1,36 @@
+error TS2305: Module 'tslib' has no exported member '__decorate'.
+error TS2305: Module 'tslib' has no exported member '__extends'.
+error TS2305: Module 'tslib' has no exported member '__metadata'.
+error TS2305: Module 'tslib' has no exported member '__param'.
+
+
+!!! error TS2305: Module 'tslib' has no exported member '__decorate'.
+!!! error TS2305: Module 'tslib' has no exported member '__extends'.
+!!! error TS2305: Module 'tslib' has no exported member '__metadata'.
+!!! error TS2305: Module 'tslib' has no exported member '__param'.
+==== tests/cases/compiler/external.ts (0 errors) ====
+    export class A { }
+    export class B extends A { }
+    
+    declare var dec: any;
+    
+    @dec
+    class C {
+        method(@dec x: number) {
+        }
+    }
+    
+==== tests/cases/compiler/script.ts (0 errors) ====
+    class A { }
+    class B extends A { }
+    
+    declare var dec: any;
+    
+    @dec
+    class C {
+        method(@dec x: number) {
+        }
+    }
+    
+==== tests/cases/compiler/tslib.d.ts (0 errors) ====
+    export {}
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
new file mode 100644
index 00000000000..8c5afc99ece
--- /dev/null
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -0,0 +1,110 @@
+//// [tests/cases/compiler/importHelpersNoHelpers.ts] ////
+
+//// [external.ts]
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [script.ts]
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [tslib.d.ts]
+export {}
+
+//// [external.js]
+"use strict";
+var tslib_1 = require("tslib");
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
+var B = (function (_super) {
+    tslib_1.__extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+exports.B = B;
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+tslib_1.__decorate([
+    tslib_1.__param(0, dec),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Number]),
+    tslib_1.__metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = tslib_1.__decorate([
+    dec,
+    tslib_1.__metadata("design:paramtypes", [])
+], C);
+//// [script.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+__decorate([
+    __param(0, dec),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = __decorate([
+    dec,
+    __metadata("design:paramtypes", [])
+], C);
diff --git a/tests/baselines/reference/importHelpersNoModule.errors.txt b/tests/baselines/reference/importHelpersNoModule.errors.txt
new file mode 100644
index 00000000000..d59fd0537ca
--- /dev/null
+++ b/tests/baselines/reference/importHelpersNoModule.errors.txt
@@ -0,0 +1,28 @@
+error TS2307: Cannot find module 'tslib'.
+
+
+!!! error TS2307: Cannot find module 'tslib'.
+==== tests/cases/compiler/external.ts (0 errors) ====
+    export class A { }
+    export class B extends A { }
+    
+    declare var dec: any;
+    
+    @dec
+    class C {
+        method(@dec x: number) {
+        }
+    }
+    
+==== tests/cases/compiler/script.ts (0 errors) ====
+    class A { }
+    class B extends A { }
+    
+    declare var dec: any;
+    
+    @dec
+    class C {
+        method(@dec x: number) {
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
new file mode 100644
index 00000000000..36bc0c5f76b
--- /dev/null
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -0,0 +1,108 @@
+//// [tests/cases/compiler/importHelpersNoModule.ts] ////
+
+//// [external.ts]
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+//// [script.ts]
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+
+//// [external.js]
+"use strict";
+var tslib_1 = require("tslib");
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
+var B = (function (_super) {
+    tslib_1.__extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+exports.B = B;
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+tslib_1.__decorate([
+    tslib_1.__param(0, dec),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Number]),
+    tslib_1.__metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = tslib_1.__decorate([
+    dec,
+    tslib_1.__metadata("design:paramtypes", [])
+], C);
+//// [script.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(A));
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (x) {
+    };
+    return C;
+}());
+__decorate([
+    __param(0, dec),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", void 0)
+], C.prototype, "method", null);
+C = __decorate([
+    dec,
+    __metadata("design:paramtypes", [])
+], C);
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
new file mode 100644
index 00000000000..cb50330c20c
--- /dev/null
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -0,0 +1,54 @@
+//// [tests/cases/compiler/importHelpersOutFile.ts] ////
+
+//// [a.ts]
+export class A { }
+
+//// [b.ts]
+import { A } from "./a";
+export class B extends A { }
+
+//// [c.ts]
+import { A } from "./a";
+export class C extends A { }
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [out.js]
+define("a", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
+define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
+    "use strict";
+    var B = (function (_super) {
+        tslib_1.__extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    }(a_1.A));
+    exports.B = B;
+});
+define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
+    "use strict";
+    var C = (function (_super) {
+        tslib_2.__extends(C, _super);
+        function C() {
+            _super.apply(this, arguments);
+        }
+        return C;
+    }(a_2.A));
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/importHelpersOutFile.symbols b/tests/baselines/reference/importHelpersOutFile.symbols
new file mode 100644
index 00000000000..086f3f9995e
--- /dev/null
+++ b/tests/baselines/reference/importHelpersOutFile.symbols
@@ -0,0 +1,63 @@
+=== tests/cases/compiler/a.ts ===
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import { A } from "./a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 24))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+=== tests/cases/compiler/c.ts ===
+import { A } from "./a";
+>A : Symbol(A, Decl(c.ts, 0, 8))
+
+export class C extends A { }
+>C : Symbol(C, Decl(c.ts, 0, 24))
+>A : Symbol(A, Decl(c.ts, 0, 8))
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/importHelpersOutFile.types b/tests/baselines/reference/importHelpersOutFile.types
new file mode 100644
index 00000000000..96adc466d65
--- /dev/null
+++ b/tests/baselines/reference/importHelpersOutFile.types
@@ -0,0 +1,63 @@
+=== tests/cases/compiler/a.ts ===
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import { A } from "./a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
+=== tests/cases/compiler/c.ts ===
+import { A } from "./a";
+>A : typeof A
+
+export class C extends A { }
+>C : C
+>A : A
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/importHelpersSystem.js b/tests/baselines/reference/importHelpersSystem.js
new file mode 100644
index 00000000000..3c1ee19ec48
--- /dev/null
+++ b/tests/baselines/reference/importHelpersSystem.js
@@ -0,0 +1,61 @@
+//// [tests/cases/compiler/importHelpersSystem.ts] ////
+
+//// [a.ts]
+export class A { }
+
+//// [b.ts]
+import { A } from "./a";
+export class B extends A { }
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var A;
+    return {
+        setters: [],
+        execute: function () {
+            A = (function () {
+                function A() {
+                }
+                return A;
+            }());
+            exports_1("A", A);
+        }
+    };
+});
+//// [b.js]
+System.register(["tslib", "./a"], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var tslib_1, a_1, B;
+    return {
+        setters: [
+            function (tslib_1_1) {
+                tslib_1 = tslib_1_1;
+            },
+            function (a_1_1) {
+                a_1 = a_1_1;
+            }
+        ],
+        execute: function () {
+            B = (function (_super) {
+                tslib_1.__extends(B, _super);
+                function B() {
+                    _super.apply(this, arguments);
+                }
+                return B;
+            }(a_1.A));
+            exports_1("B", B);
+        }
+    };
+});
diff --git a/tests/baselines/reference/importHelpersSystem.symbols b/tests/baselines/reference/importHelpersSystem.symbols
new file mode 100644
index 00000000000..47528a8bba6
--- /dev/null
+++ b/tests/baselines/reference/importHelpersSystem.symbols
@@ -0,0 +1,55 @@
+=== tests/cases/compiler/a.ts ===
+export class A { }
+>A : Symbol(A, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import { A } from "./a";
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+export class B extends A { }
+>B : Symbol(B, Decl(b.ts, 0, 24))
+>A : Symbol(A, Decl(b.ts, 0, 8))
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/importHelpersSystem.types b/tests/baselines/reference/importHelpersSystem.types
new file mode 100644
index 00000000000..9ff756ffaab
--- /dev/null
+++ b/tests/baselines/reference/importHelpersSystem.types
@@ -0,0 +1,55 @@
+=== tests/cases/compiler/a.ts ===
+export class A { }
+>A : A
+
+=== tests/cases/compiler/b.ts ===
+import { A } from "./a";
+>A : typeof A
+
+export class B extends A { }
+>B : B
+>A : A
+
+=== tests/cases/compiler/tslib.d.ts ===
+export declare function __extends(d: Function, b: Function): void;
+>__extends : (d: Function, b: Function) => void
+>d : Function
+>Function : Function
+>b : Function
+>Function : Function
+
+export declare function __assign(t: any, ...sources: any[]): any;
+>__assign : (t: any, ...sources: any[]) => any
+>t : any
+>sources : any[]
+
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+>__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
+>decorators : Function[]
+>Function : Function
+>target : any
+>key : string | symbol
+>desc : any
+
+export declare function __param(paramIndex: number, decorator: Function): Function;
+>__param : (paramIndex: number, decorator: Function) => Function
+>paramIndex : number
+>decorator : Function
+>Function : Function
+>Function : Function
+
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+>__metadata : (metadataKey: any, metadataValue: any) => Function
+>metadataKey : any
+>metadataValue : any
+>Function : Function
+
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+>__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
+>thisArg : any
+>_arguments : any
+>P : Function
+>Function : Function
+>generator : Function
+>Function : Function
+
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 7b41e4400c5..38ffc08d65e 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -22,10 +22,10 @@ define(["require", "exports"], function (require, exports) {
         function C1() {
             this.m1 = 42;
         }
-        C1.s1 = true;
         return C1;
     }());
     exports.C1 = C1;
+    C1.s1 = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/importShadowsGlobalName.js b/tests/baselines/reference/importShadowsGlobalName.js
index dbbf1710632..316a94d9069 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-define(["require", "exports", 'Foo'], function (require, exports, Error) {
+define(["require", "exports", "Foo"], function (require, exports, Error) {
     "use strict";
     var Bar = (function (_super) {
         __extends(Bar, _super);
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index 1d242a53023..b9827d5bc93 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 ///<reference path='importUsedInExtendsList1_require.ts'/>
-var foo = require('./importUsedInExtendsList1_require');
+var foo = require("./importUsedInExtendsList1_require");
 var Sub = (function (_super) {
     __extends(Sub, _super);
     function Sub() {
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index a74bf59df44..a3fa5226830 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -53,8 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 class BrokenClass {
-    constructor() {
-    }
+    constructor() { }
     brokenMethod(field, value) {
         return new Promise((resolve, reject) => {
             let result = [];
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.js b/tests/baselines/reference/instanceAndStaticDeclarations1.js
index 093e9c15cc8..bf9b6963bb2 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.js
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.js
@@ -25,6 +25,6 @@ var Point = (function () {
         return Math.sqrt(dx * dx + dy * dy);
     };
     Point.distance = function (p1, p2) { return p1.distance(p2); };
-    Point.origin = new Point(0, 0);
     return Point;
 }());
+Point.origin = new Point(0, 0);
diff --git a/tests/baselines/reference/invalidLetInForOfAndForIn_ES5.js b/tests/baselines/reference/invalidLetInForOfAndForIn_ES5.js
index 729cb246a85..b9f4c126015 100644
--- a/tests/baselines/reference/invalidLetInForOfAndForIn_ES5.js
+++ b/tests/baselines/reference/invalidLetInForOfAndForIn_ES5.js
@@ -14,5 +14,5 @@ for (let in [1,2,3]) {}
 // This should be an error
 // More details: http://www.ecma-international.org/ecma-262/6.0/#sec-iteration-statements
 var let = 10;
-for (let of = [1, 2, 3], {  }; ; )
-    for ( in [1, 2, 3]) { }
+for (let of = [1, 2, 3], {}; ; )
+    for (let  in [1, 2, 3]) { }
diff --git a/tests/baselines/reference/invalidLetInForOfAndForIn_ES6.js b/tests/baselines/reference/invalidLetInForOfAndForIn_ES6.js
index 93258d6b225..be59a37d1a8 100644
--- a/tests/baselines/reference/invalidLetInForOfAndForIn_ES6.js
+++ b/tests/baselines/reference/invalidLetInForOfAndForIn_ES6.js
@@ -14,5 +14,5 @@ for (let in [1,2,3]) {}
 // This should be an error
 // More details: http://www.ecma-international.org/ecma-262/6.0/#sec-iteration-statements
 var let = 10;
-for (let of = [1, 2, 3], {  }; ; )
-    for ( in [1, 2, 3]) { }
+for (let of = [1, 2, 3], {}; ; )
+    for (let  in [1, 2, 3]) { }
diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.js b/tests/baselines/reference/invalidModuleWithVarStatements.js
index caa6b24f00f..ce5fbd54ed1 100644
--- a/tests/baselines/reference/invalidModuleWithVarStatements.js
+++ b/tests/baselines/reference/invalidModuleWithVarStatements.js
@@ -39,11 +39,11 @@ var Y2;
 })(Y2 || (Y2 = {}));
 var Y4;
 (function (Y4) {
-    var x = 0;
+    static var x = 0;
 })(Y4 || (Y4 = {}));
 var YY;
 (function (YY) {
-    function fn(x) { }
+    static function fn(x) { }
 })(YY || (YY = {}));
 var YY2;
 (function (YY2) {
diff --git a/tests/baselines/reference/invalidStaticField.js b/tests/baselines/reference/invalidStaticField.js
index dc582e830c7..08a06d5ee27 100644
--- a/tests/baselines/reference/invalidStaticField.js
+++ b/tests/baselines/reference/invalidStaticField.js
@@ -12,6 +12,6 @@ var A = (function () {
 var B = (function () {
     function B() {
     }
-    B.NOT_NULL = new B();
     return B;
 }());
+B.NOT_NULL = new B();
diff --git a/tests/baselines/reference/invalidTryStatements2.js b/tests/baselines/reference/invalidTryStatements2.js
index 1b2976dc4e7..118b607817a 100644
--- a/tests/baselines/reference/invalidTryStatements2.js
+++ b/tests/baselines/reference/invalidTryStatements2.js
@@ -44,7 +44,7 @@ function fn2() {
     }
     finally { } // error missing try
     try {
-    } // error missing try
+    }
     catch (x) { } // error missing try
     // no error
     try {
diff --git a/tests/baselines/reference/invalidTypeOfTarget.js b/tests/baselines/reference/invalidTypeOfTarget.js
index 52b39f3c76a..9945af643e6 100644
--- a/tests/baselines/reference/invalidTypeOfTarget.js
+++ b/tests/baselines/reference/invalidTypeOfTarget.js
@@ -10,7 +10,7 @@ var x8: typeof /123/;
 
 //// [invalidTypeOfTarget.js]
 var x1 = {};
-var x2 = ;
+var x2 = function () { return ; };
 var x3 = 1;
 var x4 = '';
 var x5;
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-System.js b/tests/baselines/reference/isolatedModulesPlainFile-System.js
index 39320759740..39b648e071a 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-System.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-System.js
@@ -5,13 +5,13 @@ run(1);
 
 
 //// [isolatedModulesPlainFile-System.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             run(1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index 08ec75c48f0..ecc8ade69b7 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -5,14 +5,14 @@ run(1);
 
 
 //// [isolatedModulesPlainFile-UMD.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     run(1);
 });
diff --git a/tests/baselines/reference/isolatedModulesSourceMap.js.map b/tests/baselines/reference/isolatedModulesSourceMap.js.map
index a6778476dda..6c99c273797 100644
--- a/tests/baselines/reference/isolatedModulesSourceMap.js.map
+++ b/tests/baselines/reference/isolatedModulesSourceMap.js.map
@@ -1,2 +1,2 @@
 //// [file1.js.map]
-{"version":3,"file":"file1.js","sourceRoot":"","sources":["file1.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"file1.js","sourceRoot":"","sources":["file1.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt b/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt
index 57f604125d3..a9b2d98d967 100644
--- a/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt
+++ b/tests/baselines/reference/isolatedModulesSourceMap.sourcemap.txt
@@ -10,27 +10,30 @@ sourceFile:file1.ts
 -------------------------------------------------------------------
 >>>export var x = 1;
 1 >
-2 >^^^^^^^
-3 >       ^^^^
-4 >           ^
-5 >            ^^^
-6 >               ^
-7 >                ^
-8 >                 ^^^^^^^^^^^^^^^->
+2 >^^^^^^
+3 >      ^
+4 >       ^^^^
+5 >           ^
+6 >            ^^^
+7 >               ^
+8 >                ^
+9 >                 ^^^^^^^^^^^^^^^->
 1 >
   >
-2 >export 
-3 >       var 
-4 >           x
-5 >             = 
-6 >               1
-7 >                ;
+2 >export
+3 >       
+4 >       var 
+5 >           x
+6 >             = 
+7 >               1
+8 >                ;
 1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 8) Source(2, 8) + SourceIndex(0)
-3 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
-4 >Emitted(1, 13) Source(2, 13) + SourceIndex(0)
-5 >Emitted(1, 16) Source(2, 16) + SourceIndex(0)
-6 >Emitted(1, 17) Source(2, 17) + SourceIndex(0)
-7 >Emitted(1, 18) Source(2, 18) + SourceIndex(0)
+2 >Emitted(1, 7) Source(2, 7) + SourceIndex(0)
+3 >Emitted(1, 8) Source(2, 8) + SourceIndex(0)
+4 >Emitted(1, 12) Source(2, 12) + SourceIndex(0)
+5 >Emitted(1, 13) Source(2, 13) + SourceIndex(0)
+6 >Emitted(1, 16) Source(2, 16) + SourceIndex(0)
+7 >Emitted(1, 17) Source(2, 17) + SourceIndex(0)
+8 >Emitted(1, 18) Source(2, 18) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=file1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/iteratorSpreadInCall12.js b/tests/baselines/reference/iteratorSpreadInCall12.js
index 90b9d9b900b..b138192826d 100644
--- a/tests/baselines/reference/iteratorSpreadInCall12.js
+++ b/tests/baselines/reference/iteratorSpreadInCall12.js
@@ -34,8 +34,7 @@ class StringIterator {
 //// [iteratorSpreadInCall12.js]
 new Foo(...[...new SymbolIterator, ...[...new StringIterator]]);
 class Foo {
-    constructor(...s) {
-    }
+    constructor(...s) { }
 }
 class SymbolIterator {
     next() {
diff --git a/tests/baselines/reference/iteratorSpreadInCall8.js b/tests/baselines/reference/iteratorSpreadInCall8.js
index ac22bbcf5a3..3871ff83bc6 100644
--- a/tests/baselines/reference/iteratorSpreadInCall8.js
+++ b/tests/baselines/reference/iteratorSpreadInCall8.js
@@ -34,8 +34,7 @@ class StringIterator {
 //// [iteratorSpreadInCall8.js]
 new Foo(...new SymbolIterator, ...new StringIterator);
 class Foo {
-    constructor(...s) {
-    }
+    constructor(...s) { }
 }
 class SymbolIterator {
     next() {
diff --git a/tests/baselines/reference/iteratorSpreadInCall9.js b/tests/baselines/reference/iteratorSpreadInCall9.js
index 2a73ee29c34..da80c461b1b 100644
--- a/tests/baselines/reference/iteratorSpreadInCall9.js
+++ b/tests/baselines/reference/iteratorSpreadInCall9.js
@@ -34,8 +34,7 @@ class StringIterator {
 //// [iteratorSpreadInCall9.js]
 new Foo(...new SymbolIterator, ...[...new StringIterator]);
 class Foo {
-    constructor(...s) {
-    }
+    constructor(...s) { }
 }
 class SymbolIterator {
     next() {
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index 552c7e26f12..c204ea7880d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -17,6 +17,6 @@ let x = Test; // emit test_1.default
 //// [consumer.jsx]
 "use strict";
 /// <reference path="component.d.ts" />
-var Test_1 = require('Test');
+var Test_1 = require("Test");
 var x = Test_1["default"]; // emit test_1.default
 <anything attr={Test_1["default"]}/>; // ?
diff --git a/tests/baselines/reference/jsxReactTestSuite.js b/tests/baselines/reference/jsxReactTestSuite.js
index 18013d4be9b..392f1736407 100644
--- a/tests/baselines/reference/jsxReactTestSuite.js
+++ b/tests/baselines/reference/jsxReactTestSuite.js
@@ -148,7 +148,10 @@ var x = <div attr1={"foo" + "bar"} attr2={"foo" + "bar" +
     
     
   </div>);
-(<div attr1="foo">
+(<div 
+/* a multi-line
+   comment */
+attr1="foo">
     <span // a double-slash comment
  attr2="bar"/>
   </div>);
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index ba8efc9e7ab..63c84090c9c 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 /// <reference path="component.d.ts" />
-var BaseComponent = require('BaseComponent');
+var BaseComponent = require("BaseComponent");
 var TestComponent = (function (_super) {
     __extends(TestComponent, _super);
     function TestComponent() {
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.js b/tests/baselines/reference/keywordInJsxIdentifier.js
index 39f33449dad..6009e1980e6 100644
--- a/tests/baselines/reference/keywordInJsxIdentifier.js
+++ b/tests/baselines/reference/keywordInJsxIdentifier.js
@@ -8,7 +8,7 @@ declare var React: any;
 
 
 //// [keywordInJsxIdentifier.js]
-React.createElement("foo", {"class-id": true});
-React.createElement("foo", {class: true});
-React.createElement("foo", {"class-id": "1"});
-React.createElement("foo", {class: "1"});
+React.createElement("foo", { "class-id": true });
+React.createElement("foo", { class: true });
+React.createElement("foo", { "class-id": "1" });
+React.createElement("foo", { class: "1" });
diff --git a/tests/baselines/reference/library-reference-11.trace.json b/tests/baselines/reference/library-reference-11.trace.json
index 365fe3ce72d..e0af1e39c5a 100644
--- a/tests/baselines/reference/library-reference-11.trace.json
+++ b/tests/baselines/reference/library-reference-11.trace.json
@@ -1,8 +1,6 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory '/node_modules/@types'. ========",
-    "Resolving with primary search path '/node_modules/@types'",
-    "File '/node_modules/@types/jquery/package.json' does not exist.",
-    "File '/node_modules/@types/jquery/index.d.ts' does not exist.",
+    "======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/a/b'",
     "File '/a/b/node_modules/jquery.ts' does not exist.",
     "File '/a/b/node_modules/jquery.d.ts' does not exist.",
diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json
index 84144f82729..2cdf1f5f20a 100644
--- a/tests/baselines/reference/library-reference-12.trace.json
+++ b/tests/baselines/reference/library-reference-12.trace.json
@@ -1,8 +1,6 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory '/node_modules/@types'. ========",
-    "Resolving with primary search path '/node_modules/@types'",
-    "File '/node_modules/@types/jquery/package.json' does not exist.",
-    "File '/node_modules/@types/jquery/index.d.ts' does not exist.",
+    "======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/a/b'",
     "File '/a/b/node_modules/jquery.ts' does not exist.",
     "File '/a/b/node_modules/jquery.d.ts' does not exist.",
diff --git a/tests/baselines/reference/library-reference-3.trace.json b/tests/baselines/reference/library-reference-3.trace.json
index 730835c65e9..419fe6d055d 100644
--- a/tests/baselines/reference/library-reference-3.trace.json
+++ b/tests/baselines/reference/library-reference-3.trace.json
@@ -1,8 +1,6 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory '/src/node_modules/@types'. ========",
-    "Resolving with primary search path '/src/node_modules/@types'",
-    "File '/src/node_modules/@types/jquery/package.json' does not exist.",
-    "File '/src/node_modules/@types/jquery/index.d.ts' does not exist.",
+    "======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/src'",
     "File '/src/node_modules/jquery.ts' does not exist.",
     "File '/src/node_modules/jquery.d.ts' does not exist.",
diff --git a/tests/baselines/reference/library-reference-7.trace.json b/tests/baselines/reference/library-reference-7.trace.json
index b681ea312a8..419fe6d055d 100644
--- a/tests/baselines/reference/library-reference-7.trace.json
+++ b/tests/baselines/reference/library-reference-7.trace.json
@@ -1,8 +1,6 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory '/node_modules/@types'. ========",
-    "Resolving with primary search path '/node_modules/@types'",
-    "File '/node_modules/@types/jquery/package.json' does not exist.",
-    "File '/node_modules/@types/jquery/index.d.ts' does not exist.",
+    "======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/src'",
     "File '/src/node_modules/jquery.ts' does not exist.",
     "File '/src/node_modules/jquery.d.ts' does not exist.",
diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js
index 82a6367e5d2..77eb70c2396 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.js
+++ b/tests/baselines/reference/literalsInComputedProperties1.js
@@ -58,8 +58,7 @@ var x = (_a = {
     _a[2] = 1,
     _a["3"] = 1,
     _a["4"] = 1,
-    _a
-);
+    _a);
 x[1].toExponential();
 x[2].toExponential();
 x[3].toExponential();
@@ -81,7 +80,7 @@ z[3].toExponential();
 z[4].toExponential();
 var X;
 (function (X) {
-    X[X["1"] = 1] = "1";
+    X[X[1] = 1] = 1;
     X[X[2] = 2] = 2;
     X[X["3"] = 3] = "3";
     X[X["4"] = 4] = "4";
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index 4a8c519dc77..46ca09c2caa 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -23,5 +23,5 @@ module.exports = server;
 //// [localAliasExportAssignment_1.js]
 "use strict";
 ///<reference path='localAliasExportAssignment_0.ts'/>
-var connect = require('./localAliasExportAssignment_0');
+var connect = require("./localAliasExportAssignment_0");
 connect();
diff --git a/tests/baselines/reference/localClassesInLoop.js b/tests/baselines/reference/localClassesInLoop.js
index 0090ada863d..d01d86da8d1 100644
--- a/tests/baselines/reference/localClassesInLoop.js
+++ b/tests/baselines/reference/localClassesInLoop.js
@@ -13,7 +13,7 @@ use(data[0]() === data[1]());
 //// [localClassesInLoop.js]
 "use strict";
 var data = [];
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     var C = (function () {
         function C() {
         }
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index 0071d0dfef0..00f913219a4 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -28,7 +28,7 @@ define(["require", "exports"], function (require, exports) {
     exports.Promise = Promise;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
-define(["require", "exports", 'memberAccessMustUseModuleInstances_0'], function (require, exports, WinJS) {
+define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
     "use strict";
     WinJS.Promise.timeout(10);
 });
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 696ad27b2a6..2ff9d3e6604 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-define(["require", "exports", './a'], function (require, exports, a_1) {
+define(["require", "exports", "./a"], function (require, exports, a_1) {
     "use strict";
     var B = (function (_super) {
         __extends(B, _super);
diff --git a/tests/baselines/reference/missingDecoratorType.js b/tests/baselines/reference/missingDecoratorType.js
index 7356be39798..1dcbb3febc5 100644
--- a/tests/baselines/reference/missingDecoratorType.js
+++ b/tests/baselines/reference/missingDecoratorType.js
@@ -33,8 +33,8 @@ var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
-    __decorate([
-        dec
-    ], C.prototype, "method", null);
     return C;
 }());
+__decorate([
+    dec
+], C.prototype, "method", null);
diff --git a/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js b/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js
index 70eea5b2c5c..211c80bcce8 100644
--- a/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js
+++ b/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js
@@ -10,14 +10,16 @@ function g() {
 
 //// [modifierOnClassExpressionMemberInFunction.js]
 function g() {
-    var x = (function () {
-        function C() {
-            this.prop1 = 1;
-        }
-        C.prototype.foo = function () { };
-        C.prop2 = 43;
-        return C;
-    }());
+    var x = (_a = (function () {
+            function C() {
+                this.prop1 = 1;
+            }
+            C.prototype.foo = function () { };
+            return C;
+        }()),
+        _a.prop2 = 43,
+        _a);
+    var _a;
 }
 
 
diff --git a/tests/baselines/reference/modifierOnParameter1.js b/tests/baselines/reference/modifierOnParameter1.js
index 7b76a805c99..dd800aeb886 100644
--- a/tests/baselines/reference/modifierOnParameter1.js
+++ b/tests/baselines/reference/modifierOnParameter1.js
@@ -5,7 +5,7 @@ class C {
 
 //// [modifierOnParameter1.js]
 var C = (function () {
-    function C() {
+    function C(p) {
     }
     return C;
 }());
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index 3706eae6ae2..b75161da458 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -19,7 +19,7 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
 });
 //// [moduleAliasAsFunctionArgument_1.js]
-define(["require", "exports", 'moduleAliasAsFunctionArgument_0'], function (require, exports, a) {
+define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
     "use strict";
     function fn(arg) {
     }
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 1d64c0490c5..1da296d7d12 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -77,4 +77,3 @@ var Utensils = exports.Utensils;
 (function (Utensils) {
     Utensils[Utensils["Spork"] = 3] = "Spork";
 })(exports.Utensils || (exports.Utensils = {}));
-var Utensils = exports.Utensils;
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext.errors.txt
index 4ab5c5b42c0..0ab411e03c4 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.errors.txt
+++ b/tests/baselines/reference/moduleElementsInWrongContext.errors.txt
@@ -6,7 +6,6 @@ tests/cases/compiler/moduleElementsInWrongContext.ts(13,5): error TS1231: An exp
 tests/cases/compiler/moduleElementsInWrongContext.ts(17,5): error TS1233: An export declaration can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext.ts(18,5): error TS1233: An export declaration can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext.ts(19,5): error TS1233: An export declaration can only be used in a module.
-tests/cases/compiler/moduleElementsInWrongContext.ts(19,14): error TS2305: Module '"ambient"' has no exported member 'baz'.
 tests/cases/compiler/moduleElementsInWrongContext.ts(20,5): error TS1231: An export assignment can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext.ts(21,5): error TS1184: Modifiers cannot appear here.
 tests/cases/compiler/moduleElementsInWrongContext.ts(22,5): error TS1184: Modifiers cannot appear here.
@@ -18,7 +17,7 @@ tests/cases/compiler/moduleElementsInWrongContext.ts(27,5): error TS1232: An imp
 tests/cases/compiler/moduleElementsInWrongContext.ts(28,5): error TS1232: An import declaration can only be used in a namespace or module.
 
 
-==== tests/cases/compiler/moduleElementsInWrongContext.ts (18 errors) ====
+==== tests/cases/compiler/moduleElementsInWrongContext.ts (17 errors) ====
     {
         module M { }
         ~~~~~~
@@ -54,8 +53,6 @@ tests/cases/compiler/moduleElementsInWrongContext.ts(28,5): error TS1232: An imp
         export { baz as b } from "ambient";
         ~~~~~~
 !!! error TS1233: An export declaration can only be used in a module.
-                 ~~~
-!!! error TS2305: Module '"ambient"' has no exported member 'baz'.
         export default v;
         ~~~~~~
 !!! error TS1231: An export assignment can only be used in a module.
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js
index 0f898ce3818..7cd2af405e2 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext.js
@@ -32,17 +32,22 @@
 
 //// [moduleElementsInWrongContext.js]
 {
+    export = M;
     var v;
     function foo() { }
-    var ambient_2 = require("ambient");
-    exports.b = ambient_2.baz;
-    exports["default"] = v;
+    export * from "ambient";
+    export { foo };
+    export { baz as b } from "ambient";
+    export default v;
     var C = (function () {
         function C() {
         }
         return C;
     }());
-    exports["default"] = C;
     function bee() { }
-    exports.bee = bee;
+    import I2 = require("foo");
+    import * as Foo from "ambient";
+    import bar from "ambient";
+    import { baz } from "ambient";
+    import "ambient";
 }
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt
index d6611e71831..223f14684fe 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt
@@ -6,7 +6,6 @@ tests/cases/compiler/moduleElementsInWrongContext2.ts(13,5): error TS1231: An ex
 tests/cases/compiler/moduleElementsInWrongContext2.ts(17,5): error TS1233: An export declaration can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext2.ts(18,5): error TS1233: An export declaration can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext2.ts(19,5): error TS1233: An export declaration can only be used in a module.
-tests/cases/compiler/moduleElementsInWrongContext2.ts(19,30): error TS2307: Cannot find module 'ambient'.
 tests/cases/compiler/moduleElementsInWrongContext2.ts(20,5): error TS1231: An export assignment can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext2.ts(21,5): error TS1184: Modifiers cannot appear here.
 tests/cases/compiler/moduleElementsInWrongContext2.ts(22,5): error TS1184: Modifiers cannot appear here.
@@ -18,7 +17,7 @@ tests/cases/compiler/moduleElementsInWrongContext2.ts(27,5): error TS1232: An im
 tests/cases/compiler/moduleElementsInWrongContext2.ts(28,5): error TS1232: An import declaration can only be used in a namespace or module.
 
 
-==== tests/cases/compiler/moduleElementsInWrongContext2.ts (18 errors) ====
+==== tests/cases/compiler/moduleElementsInWrongContext2.ts (17 errors) ====
     function blah () {
         module M { }
         ~~~~~~
@@ -54,8 +53,6 @@ tests/cases/compiler/moduleElementsInWrongContext2.ts(28,5): error TS1232: An im
         export { baz as b } from "ambient";
         ~~~~~~
 !!! error TS1233: An export declaration can only be used in a module.
-                                 ~~~~~~~~~
-!!! error TS2307: Cannot find module 'ambient'.
         export default v;
         ~~~~~~
 !!! error TS1231: An export assignment can only be used in a module.
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js
index f5810d15dc7..55dd133ec95 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.js
@@ -32,17 +32,22 @@ function blah () {
 
 //// [moduleElementsInWrongContext2.js]
 function blah() {
+    export = M;
     var v;
     function foo() { }
-    var ambient_2 = require("ambient");
-    exports.b = ambient_2.baz;
-    exports["default"] = v;
+    export * from "ambient";
+    export { foo };
+    export { baz as b } from "ambient";
+    export default v;
     var C = (function () {
         function C() {
         }
         return C;
     }());
-    exports["default"] = C;
     function bee() { }
-    exports.bee = bee;
+    import I2 = require("foo");
+    import * as Foo from "ambient";
+    import bar from "ambient";
+    import { baz } from "ambient";
+    import "ambient";
 }
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt
index f5361319b68..5d4b190bb65 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt
@@ -6,7 +6,6 @@ tests/cases/compiler/moduleElementsInWrongContext3.ts(14,9): error TS1231: An ex
 tests/cases/compiler/moduleElementsInWrongContext3.ts(18,9): error TS1233: An export declaration can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext3.ts(19,9): error TS1233: An export declaration can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext3.ts(20,9): error TS1233: An export declaration can only be used in a module.
-tests/cases/compiler/moduleElementsInWrongContext3.ts(20,34): error TS2307: Cannot find module 'ambient'.
 tests/cases/compiler/moduleElementsInWrongContext3.ts(21,9): error TS1231: An export assignment can only be used in a module.
 tests/cases/compiler/moduleElementsInWrongContext3.ts(22,9): error TS1184: Modifiers cannot appear here.
 tests/cases/compiler/moduleElementsInWrongContext3.ts(23,9): error TS1184: Modifiers cannot appear here.
@@ -18,7 +17,7 @@ tests/cases/compiler/moduleElementsInWrongContext3.ts(28,9): error TS1232: An im
 tests/cases/compiler/moduleElementsInWrongContext3.ts(29,9): error TS1232: An import declaration can only be used in a namespace or module.
 
 
-==== tests/cases/compiler/moduleElementsInWrongContext3.ts (18 errors) ====
+==== tests/cases/compiler/moduleElementsInWrongContext3.ts (17 errors) ====
     module P {
         {
             module M { }
@@ -55,8 +54,6 @@ tests/cases/compiler/moduleElementsInWrongContext3.ts(29,9): error TS1232: An im
             export { baz as b } from "ambient";
             ~~~~~~
 !!! error TS1233: An export declaration can only be used in a module.
-                                     ~~~~~~~~~
-!!! error TS2307: Cannot find module 'ambient'.
             export default v;
             ~~~~~~
 !!! error TS1231: An export assignment can only be used in a module.
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js
index 11e3637041a..76220eab251 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.js
@@ -35,18 +35,25 @@ module P {
 var P;
 (function (P) {
     {
+        export = M;
         var v;
         function foo() { }
-        var ambient_2 = require("ambient");
-        P.b = ambient_2.baz;
-        P["default"] = v;
+        export * from "ambient";
+        export { foo };
+        export { baz as b } from "ambient";
+        export default v;
         var C = (function () {
             function C() {
             }
             return C;
         }());
-        exports["default"] = C;
+        P.C = C;
         function bee() { }
         P.bee = bee;
+        import I2 = require("foo");
+        import * as Foo from "ambient";
+        import bar from "ambient";
+        import { baz } from "ambient";
+        import "ambient";
     }
 })(P || (P = {}));
diff --git a/tests/baselines/reference/modulePrologueSystem.js b/tests/baselines/reference/modulePrologueSystem.js
index 13f7d35b001..c3919669a8d 100644
--- a/tests/baselines/reference/modulePrologueSystem.js
+++ b/tests/baselines/reference/modulePrologueSystem.js
@@ -4,13 +4,13 @@
 export class Foo {}
 
 //// [modulePrologueSystem.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var Foo;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             Foo = (function () {
                 function Foo() {
                 }
@@ -18,5 +18,5 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("Foo", Foo);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index a573559b7e9..fb366945d66 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -4,14 +4,14 @@
 export class Foo {}
 
 //// [modulePrologueUmd.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var Foo = (function () {
         function Foo() {
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index adfcd3673a8..f987c0c652d 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -33,7 +33,7 @@ exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
 //// [file4.js]
 "use strict";
-var file3 = require('./file3');
+var file3 = require("./file3");
 var t1 = v1;
 var t2 = v2;
 var t3 = file3.v3;
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index 34832c93966..2cd5440ce6e 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -37,17 +37,17 @@ var Adder = (function () {
 module.exports = Adder;
 //// [Math.js]
 "use strict";
-var Adder = require('./Adder');
+var Adder = require("./Adder");
 var Math = {
     Adder: Adder
 };
 module.exports = Math;
 //// [Drawing.js]
 "use strict";
-exports.Math = require('./Math/Math');
+exports.Math = require("./Math/Math");
 //// [consumer.js]
 "use strict";
-var Drawing = require('./Drawing');
+var Drawing = require("./Drawing");
 var addr = new Drawing.Math.Adder();
 
 
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js
index 4821f1fe69c..2ada9f1bb52 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js
@@ -6,8 +6,9 @@ return this.edit(role)
 
 
 //// [multiLinePropertyAccessAndArrowFunctionIndent1.js]
+var _this = this;
 return this.edit(role)
     .then(function (role) {
-    return this.roleService.add(role)
+    return _this.roleService.add(role)
         .then(function (data) { return data.data; });
 });
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 6d00b54d69b..93cf4e29d49 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -13,5 +13,5 @@ var x = foo.foo + 42;
 exports.foo = 42;
 //// [foo_1.js]
 "use strict";
-var foo = require('./test/foo_0');
+var foo = require("./test/foo_0");
 var x = foo.foo + 42;
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index 8a7506c2d42..156d1b03a1a 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -13,5 +13,5 @@ var x = foo.foo + 42;
 exports.foo = 42;
 //// [foo_1.js]
 "use strict";
-var foo = require('./foo_0.js');
+var foo = require("./foo_0.js");
 var x = foo.foo + 42;
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index e348c5b1ced..d8b0eed43cf 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -40,9 +40,9 @@ var M2;
 })(M2 = exports.M2 || (exports.M2 = {}));
 //// [foo_3.js]
 "use strict";
-var foo0 = require('../foo_0');
-var foo1 = require('./test/foo_1');
-var foo2 = require('./.././test/foo_2');
+var foo0 = require("../foo_0");
+var foo1 = require("./test/foo_1");
+var foo2 = require("./.././test/foo_2");
 if (foo2.M2.x) {
     var x = foo0.foo + foo1.f();
 }
diff --git a/tests/baselines/reference/nestedBlockScopedBindings13.js b/tests/baselines/reference/nestedBlockScopedBindings13.js
index 86e5635df68..6100e24ac09 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings13.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings13.js
@@ -10,7 +10,7 @@ for (; false;) {
 }
 
 //// [nestedBlockScopedBindings13.js]
-var _loop_1 = function() {
+var _loop_1 = function () {
     var x;
     (function () { return x; });
 };
diff --git a/tests/baselines/reference/nestedBlockScopedBindings14.js b/tests/baselines/reference/nestedBlockScopedBindings14.js
index 1180f587420..1aaa29abd3c 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings14.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings14.js
@@ -13,7 +13,7 @@ for (; false;) {
 
 //// [nestedBlockScopedBindings14.js]
 var x;
-var _loop_1 = function() {
+var _loop_1 = function () {
     var x_1;
     (function () { return x_1; });
 };
diff --git a/tests/baselines/reference/nestedBlockScopedBindings15.js b/tests/baselines/reference/nestedBlockScopedBindings15.js
index 8e294de98e4..de8e85f1b1d 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings15.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings15.js
@@ -32,7 +32,7 @@ for (; false;) {
 }
 
 //// [nestedBlockScopedBindings15.js]
-var _loop_1 = function() {
+var _loop_1 = function () {
     {
         var x_1;
         (function () { return x_1; });
@@ -47,7 +47,7 @@ for (; false;) {
         y = 1;
     }
 }
-var _loop_2 = function() {
+var _loop_2 = function () {
     switch (1) {
         case 1:
             var z0_1;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings16.js b/tests/baselines/reference/nestedBlockScopedBindings16.js
index 91f67d0d8f2..8fcbdde823a 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings16.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings16.js
@@ -37,7 +37,7 @@ for (; false;) {
 
 //// [nestedBlockScopedBindings16.js]
 var x;
-var _loop_1 = function() {
+var _loop_1 = function () {
     {
         var x_1;
         (function () { return x_1; });
@@ -54,7 +54,7 @@ for (; false;) {
     }
 }
 var z0;
-var _loop_2 = function() {
+var _loop_2 = function () {
     switch (1) {
         case 1:
             var z0_1;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings3.js b/tests/baselines/reference/nestedBlockScopedBindings3.js
index f9474381816..d8b3df0c6ae 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings3.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings3.js
@@ -71,7 +71,7 @@ function a5() {
 //// [nestedBlockScopedBindings3.js]
 function a0() {
     {
-        var _loop_1 = function(x) {
+        var _loop_1 = function (x) {
             (function () { return x; });
         };
         for (var x = 0; x < 1;) {
@@ -79,7 +79,7 @@ function a0() {
         }
     }
     {
-        var _loop_2 = function(x) {
+        var _loop_2 = function (x) {
             (function () { return x; });
         };
         for (var x = void 0;;) {
@@ -88,13 +88,13 @@ function a0() {
     }
 }
 function a1() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
         (function () { return x; });
     };
     for (var x = void 0; x < 1;) {
         _loop_3(x);
     }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
         (function () { return x; });
     };
     for (var x = void 0;;) {
@@ -120,7 +120,7 @@ function a3() {
     }
 }
 function a4() {
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
         x = x + 1;
         (function () { return x; });
         out_x_1 = x;
@@ -137,7 +137,7 @@ function a4() {
     }
 }
 function a5() {
-    var _loop_6 = function(x) {
+    var _loop_6 = function (x) {
         x = x + 1;
         (function () { return x; });
         out_x_2 = x;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings4.js b/tests/baselines/reference/nestedBlockScopedBindings4.js
index 6b391070d93..0a73cc11148 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings4.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings4.js
@@ -50,7 +50,7 @@ function a0() {
     }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
         x = x + 1;
         (function () { return x; });
         out_x_1 = x;
@@ -68,7 +68,7 @@ function a2() {
     for (var x = void 0; x < 1;) {
         x = x + 1;
     }
-    var _loop_2 = function(x) {
+    var _loop_2 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_2 = x;
@@ -80,7 +80,7 @@ function a2() {
     }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
         x = x + 1;
         (function () { return x; });
         out_x_3 = x;
@@ -90,7 +90,7 @@ function a3() {
         _loop_3(x);
         x = out_x_3;
     }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_4 = x;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings5.js b/tests/baselines/reference/nestedBlockScopedBindings5.js
index df4fcf76423..dcaa0aae6d5 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings5.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings5.js
@@ -90,7 +90,7 @@ function a0() {
     }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
@@ -105,7 +105,7 @@ function a2() {
     for (var x in []) {
         x = x + 1;
     }
-    var _loop_2 = function(x) {
+    var _loop_2 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_1 = x;
@@ -117,14 +117,14 @@ function a2() {
     }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
     for (var x in []) {
         _loop_3(x);
     }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_2 = x;
@@ -160,7 +160,7 @@ function a5() {
     for (var x in []) {
         x = x + 1;
     }
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_3 = x;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings6.js b/tests/baselines/reference/nestedBlockScopedBindings6.js
index be9771471e9..2bcaeff2d0e 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings6.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings6.js
@@ -99,7 +99,7 @@ function a0() {
     }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
@@ -116,7 +116,7 @@ function a2() {
         var x = _a[_i];
         x = x + 1;
     }
-    var _loop_2 = function(x) {
+    var _loop_2 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_1 = x;
@@ -128,7 +128,7 @@ function a2() {
     }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
@@ -136,7 +136,7 @@ function a3() {
         var x = _a[_i];
         _loop_3(x);
     }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
         x = x + 2;
         (function () { return x; });
         out_x_2 = x;
@@ -148,7 +148,7 @@ function a3() {
     }
 }
 function a4() {
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
@@ -186,7 +186,7 @@ function a6() {
     }
 }
 function a7() {
-    var _loop_6 = function(x) {
+    var _loop_6 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
diff --git a/tests/baselines/reference/nestedBlockScopedBindings7.js b/tests/baselines/reference/nestedBlockScopedBindings7.js
index df0e6c52a62..54b5ac3e744 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings7.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings7.js
@@ -8,7 +8,7 @@ for (let y; false;) {
 }
 
 //// [nestedBlockScopedBindings7.js]
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
     (function () { return x; });
 };
 for (var x = void 0; false;) {
diff --git a/tests/baselines/reference/nestedBlockScopedBindings8.js b/tests/baselines/reference/nestedBlockScopedBindings8.js
index 772dc020d6d..dcc4edec5d9 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings8.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings8.js
@@ -11,7 +11,7 @@ for (let y; false; ) {
 
 //// [nestedBlockScopedBindings8.js]
 var x;
-var _loop_1 = function(x_1) {
+var _loop_1 = function (x_1) {
     (function () { return x_1; });
 };
 for (var x_1; false;) {
diff --git a/tests/baselines/reference/nestedClassDeclaration.js b/tests/baselines/reference/nestedClassDeclaration.js
index f9e3d08144d..04e2f6348ef 100644
--- a/tests/baselines/reference/nestedClassDeclaration.js
+++ b/tests/baselines/reference/nestedClassDeclaration.js
@@ -38,4 +38,5 @@ function foo() {
     }());
 }
 var x = {
-    class: C4 }, _a = void 0;
+    class: C4
+}, _a = void 0;
diff --git a/tests/baselines/reference/newWithSpread.js b/tests/baselines/reference/newWithSpread.js
index 3b4a726b4d4..91c502e50b9 100644
--- a/tests/baselines/reference/newWithSpread.js
+++ b/tests/baselines/reference/newWithSpread.js
@@ -129,52 +129,53 @@ var h;
 var i;
 // Basic expression
 new f(1, 2, "string");
-new f(1, 2, ...a);
-new f(1, 2, ...a, "string");
+new (f.bind.apply(f, [void 0, 1, 2].concat(a)))();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a, ["string"])))();
 // Multiple spreads arguments
-new f2(...a, ...a);
-new f(1, 2, ...a, ...a);
+new (f2.bind.apply(f2, [void 0].concat(a, a)))();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a, a)))();
 // Call expression
 new f(1, 2, "string")();
-new f(1, 2, ...a)();
-new f(1, 2, ...a, "string")();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a)))()();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a, ["string"])))()();
 // Property access expression
 new b.f(1, 2, "string");
-new b.f(1, 2, ...a);
-new b.f(1, 2, ...a, "string");
+new ((_a = b.f).bind.apply(_a, [void 0, 1, 2].concat(a)))();
+new ((_b = b.f).bind.apply(_b, [void 0, 1, 2].concat(a, ["string"])))();
 // Parenthesised expression
 new (b.f)(1, 2, "string");
-new (b.f)(1, 2, ...a);
-new (b.f)(1, 2, ...a, "string");
+new ((_c = (b.f)).bind.apply(_c, [void 0, 1, 2].concat(a)))();
+new ((_d = (b.f)).bind.apply(_d, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression
 new d[1].f(1, 2, "string");
-new d[1].f(1, 2, ...a);
-new d[1].f(1, 2, ...a, "string");
+new ((_e = d[1].f).bind.apply(_e, [void 0, 1, 2].concat(a)))();
+new ((_f = d[1].f).bind.apply(_f, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression with a punctuated key
 new e["a-b"].f(1, 2, "string");
-new e["a-b"].f(1, 2, ...a);
-new e["a-b"].f(1, 2, ...a, "string");
+new ((_g = e["a-b"].f).bind.apply(_g, [void 0, 1, 2].concat(a)))();
+new ((_h = e["a-b"].f).bind.apply(_h, [void 0, 1, 2].concat(a, ["string"])))();
 // Basic expression
 new B(1, 2, "string");
-new B(1, 2, ...a);
-new B(1, 2, ...a, "string");
+new (B.bind.apply(B, [void 0, 1, 2].concat(a)))();
+new (B.bind.apply(B, [void 0, 1, 2].concat(a, ["string"])))();
 // Property access expression
 new c["a-b"](1, 2, "string");
-new c["a-b"](1, 2, ...a);
-new c["a-b"](1, 2, ...a, "string");
+new ((_j = c["a-b"]).bind.apply(_j, [void 0, 1, 2].concat(a)))();
+new ((_k = c["a-b"]).bind.apply(_k, [void 0, 1, 2].concat(a, ["string"])))();
 // Parenthesised expression
 new (c["a-b"])(1, 2, "string");
-new (c["a-b"])(1, 2, ...a);
-new (c["a-b"])(1, 2, ...a, "string");
+new ((_l = (c["a-b"])).bind.apply(_l, [void 0, 1, 2].concat(a)))();
+new ((_m = (c["a-b"])).bind.apply(_m, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression
 new g[1]["a-b"](1, 2, "string");
-new g[1]["a-b"](1, 2, ...a);
-new g[1]["a-b"](1, 2, ...a, "string");
+new ((_o = g[1]["a-b"]).bind.apply(_o, [void 0, 1, 2].concat(a)))();
+new ((_p = g[1]["a-b"]).bind.apply(_p, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression with a punctuated key
 new h["a-b"]["a-b"](1, 2, "string");
-new h["a-b"]["a-b"](1, 2, ...a);
-new h["a-b"]["a-b"](1, 2, ...a, "string");
+new ((_q = h["a-b"]["a-b"]).bind.apply(_q, [void 0, 1, 2].concat(a)))();
+new ((_r = h["a-b"]["a-b"]).bind.apply(_r, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression with a number
 new i["a-b"][1](1, 2, "string");
-new i["a-b"][1](1, 2, ...a);
-new i["a-b"][1](1, 2, ...a, "string");
+new ((_s = i["a-b"][1]).bind.apply(_s, [void 0, 1, 2].concat(a)))();
+new ((_t = i["a-b"][1]).bind.apply(_t, [void 0, 1, 2].concat(a, ["string"])))();
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
diff --git a/tests/baselines/reference/newWithSpreadES5.js b/tests/baselines/reference/newWithSpreadES5.js
index fffa53d7c90..92904062d0a 100644
--- a/tests/baselines/reference/newWithSpreadES5.js
+++ b/tests/baselines/reference/newWithSpreadES5.js
@@ -128,53 +128,53 @@ var h;
 var i;
 // Basic expression
 new f(1, 2, "string");
-new (f.bind.apply(f, [void 0].concat([1, 2], a)))();
-new (f.bind.apply(f, [void 0].concat([1, 2], a, ["string"])))();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a)))();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a, ["string"])))();
 // Multiple spreads arguments
 new (f2.bind.apply(f2, [void 0].concat(a, a)))();
-new (f.bind.apply(f, [void 0].concat([1, 2], a, a)))();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a, a)))();
 // Call expression
 new f(1, 2, "string")();
-new (f.bind.apply(f, [void 0].concat([1, 2], a)))()();
-new (f.bind.apply(f, [void 0].concat([1, 2], a, ["string"])))()();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a)))()();
+new (f.bind.apply(f, [void 0, 1, 2].concat(a, ["string"])))()();
 // Property access expression
 new b.f(1, 2, "string");
-new ((_a = b.f).bind.apply(_a, [void 0].concat([1, 2], a)))();
-new ((_b = b.f).bind.apply(_b, [void 0].concat([1, 2], a, ["string"])))();
+new ((_a = b.f).bind.apply(_a, [void 0, 1, 2].concat(a)))();
+new ((_b = b.f).bind.apply(_b, [void 0, 1, 2].concat(a, ["string"])))();
 // Parenthesised expression
 new (b.f)(1, 2, "string");
-new ((_c = (b.f)).bind.apply(_c, [void 0].concat([1, 2], a)))();
-new ((_d = (b.f)).bind.apply(_d, [void 0].concat([1, 2], a, ["string"])))();
+new ((_c = (b.f)).bind.apply(_c, [void 0, 1, 2].concat(a)))();
+new ((_d = (b.f)).bind.apply(_d, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression
 new d[1].f(1, 2, "string");
-new ((_e = d[1].f).bind.apply(_e, [void 0].concat([1, 2], a)))();
-new ((_f = d[1].f).bind.apply(_f, [void 0].concat([1, 2], a, ["string"])))();
+new ((_e = d[1].f).bind.apply(_e, [void 0, 1, 2].concat(a)))();
+new ((_f = d[1].f).bind.apply(_f, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression with a punctuated key
 new e["a-b"].f(1, 2, "string");
-new ((_g = e["a-b"].f).bind.apply(_g, [void 0].concat([1, 2], a)))();
-new ((_h = e["a-b"].f).bind.apply(_h, [void 0].concat([1, 2], a, ["string"])))();
+new ((_g = e["a-b"].f).bind.apply(_g, [void 0, 1, 2].concat(a)))();
+new ((_h = e["a-b"].f).bind.apply(_h, [void 0, 1, 2].concat(a, ["string"])))();
 // Basic expression
 new B(1, 2, "string");
-new (B.bind.apply(B, [void 0].concat([1, 2], a)))();
-new (B.bind.apply(B, [void 0].concat([1, 2], a, ["string"])))();
+new (B.bind.apply(B, [void 0, 1, 2].concat(a)))();
+new (B.bind.apply(B, [void 0, 1, 2].concat(a, ["string"])))();
 // Property access expression
 new c["a-b"](1, 2, "string");
-new ((_j = c["a-b"]).bind.apply(_j, [void 0].concat([1, 2], a)))();
-new ((_k = c["a-b"]).bind.apply(_k, [void 0].concat([1, 2], a, ["string"])))();
+new ((_j = c["a-b"]).bind.apply(_j, [void 0, 1, 2].concat(a)))();
+new ((_k = c["a-b"]).bind.apply(_k, [void 0, 1, 2].concat(a, ["string"])))();
 // Parenthesised expression
 new (c["a-b"])(1, 2, "string");
-new ((_l = (c["a-b"])).bind.apply(_l, [void 0].concat([1, 2], a)))();
-new ((_m = (c["a-b"])).bind.apply(_m, [void 0].concat([1, 2], a, ["string"])))();
+new ((_l = (c["a-b"])).bind.apply(_l, [void 0, 1, 2].concat(a)))();
+new ((_m = (c["a-b"])).bind.apply(_m, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression
 new g[1]["a-b"](1, 2, "string");
-new ((_o = g[1]["a-b"]).bind.apply(_o, [void 0].concat([1, 2], a)))();
-new ((_p = g[1]["a-b"]).bind.apply(_p, [void 0].concat([1, 2], a, ["string"])))();
+new ((_o = g[1]["a-b"]).bind.apply(_o, [void 0, 1, 2].concat(a)))();
+new ((_p = g[1]["a-b"]).bind.apply(_p, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression with a punctuated key
 new h["a-b"]["a-b"](1, 2, "string");
-new ((_q = h["a-b"]["a-b"]).bind.apply(_q, [void 0].concat([1, 2], a)))();
-new ((_r = h["a-b"]["a-b"]).bind.apply(_r, [void 0].concat([1, 2], a, ["string"])))();
+new ((_q = h["a-b"]["a-b"]).bind.apply(_q, [void 0, 1, 2].concat(a)))();
+new ((_r = h["a-b"]["a-b"]).bind.apply(_r, [void 0, 1, 2].concat(a, ["string"])))();
 // Element access expression with a number
 new i["a-b"][1](1, 2, "string");
-new ((_s = i["a-b"][1]).bind.apply(_s, [void 0].concat([1, 2], a)))();
-new ((_t = i["a-b"][1]).bind.apply(_t, [void 0].concat([1, 2], a, ["string"])))();
+new ((_s = i["a-b"][1]).bind.apply(_s, [void 0, 1, 2].concat(a)))();
+new ((_t = i["a-b"][1]).bind.apply(_t, [void 0, 1, 2].concat(a, ["string"])))();
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
diff --git a/tests/baselines/reference/newWithSpreadES6.js b/tests/baselines/reference/newWithSpreadES6.js
index b712984f05e..dca5264cb3f 100644
--- a/tests/baselines/reference/newWithSpreadES6.js
+++ b/tests/baselines/reference/newWithSpreadES6.js
@@ -103,8 +103,7 @@ function f(x, y, ...z) {
 function f2(...x) {
 }
 class B {
-    constructor(x, y, ...z) {
-    }
+    constructor(x, y, ...z) { }
 }
 var a;
 var b;
diff --git a/tests/baselines/reference/noEmitHelpers2.js b/tests/baselines/reference/noEmitHelpers2.js
index f3bbfe54896..64acadf07e3 100644
--- a/tests/baselines/reference/noEmitHelpers2.js
+++ b/tests/baselines/reference/noEmitHelpers2.js
@@ -12,10 +12,10 @@ class A {
 var A = (function () {
     function A(a, b) {
     }
-    A = __decorate([
-        decorator,
-        __param(1, decorator), 
-        __metadata('design:paramtypes', [Number, String])
-    ], A);
     return A;
 }());
+A = __decorate([
+    decorator,
+    __param(1, decorator),
+    __metadata("design:paramtypes", [Number, String])
+], A);
diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.js b/tests/baselines/reference/noImplicitAnyInCastExpression.js
index 1b7cc59c7c0..b0a6907a5b4 100644
--- a/tests/baselines/reference/noImplicitAnyInCastExpression.js
+++ b/tests/baselines/reference/noImplicitAnyInCastExpression.js
@@ -19,8 +19,8 @@ interface IFoo {
 //// [noImplicitAnyInCastExpression.js]
 // verify no noImplictAny errors reported with cast expression
 // Expr type not assignable to target type
-{ a: null };
+({ a: null });
 // Expr type assignable to target type
-{ a: 2, b: undefined };
+({ a: 2, b: undefined });
 // Neither types is assignable to each other
-{ c: null };
+({ c: null });
diff --git a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
index 38a2a731af4..69d98d4b0c6 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -21,11 +21,6 @@ var __extends = (this && this.__extends) || function (d, b) {
 var Parent = (function () {
     function Parent() {
     }
-    Object.defineProperty(Parent.prototype, "message", {
-        set: function (str) { },
-        enumerable: true,
-        configurable: true
-    });
     return Parent;
 }());
 var Child = (function (_super) {
diff --git a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
index d4e0d17186d..7ad703fd3b7 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -20,11 +20,6 @@ var __extends = (this && this.__extends) || function (d, b) {
 var Parent = (function () {
     function Parent() {
     }
-    Object.defineProperty(Parent.prototype, "message", {
-        get: function () { },
-        enumerable: true,
-        configurable: true
-    });
     return Parent;
 }());
 var Child = (function (_super) {
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.js b/tests/baselines/reference/noImplicitUseStrict_system.js
index cf5a7e1b261..f1100e20fd7 100644
--- a/tests/baselines/reference/noImplicitUseStrict_system.js
+++ b/tests/baselines/reference/noImplicitUseStrict_system.js
@@ -3,13 +3,13 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_system.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = 0);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
index ca252daeb9d..566c3bbe0b6 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -3,13 +3,13 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_umd.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     exports.x = 0;
 });
diff --git a/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.js b/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.js
index 0b1ce1f0736..54a0328c27c 100644
--- a/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.js
+++ b/tests/baselines/reference/numericLiteralsWithTrailingDecimalPoints01.js
@@ -28,9 +28,9 @@ toString();
 var i = 1;
 var test1 = i.toString();
 var test2 = 2., toString = ();
-var test3 = 3 .toString();
-var test4 = 3 .toString();
-var test5 = 3 .toString();
+var test3 = 3..toString();
+var test4 = 3..toString();
+var test5 = 3..toString();
 var test6 = 3.['toString']();
 var test7 = 3
     .toString();
diff --git a/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js b/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js
index d6a8579be04..7e5f63255af 100644
--- a/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js
+++ b/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js
@@ -2,4 +2,4 @@
 var v = { foo(); }
 
 //// [objectLiteralMemberWithoutBlock1.js]
-var v = { foo: function () { } };
+var v = {};
diff --git a/tests/baselines/reference/objectLiteralWithSemicolons4.js b/tests/baselines/reference/objectLiteralWithSemicolons4.js
index a01d52548ee..9e1e3dea4b9 100644
--- a/tests/baselines/reference/objectLiteralWithSemicolons4.js
+++ b/tests/baselines/reference/objectLiteralWithSemicolons4.js
@@ -5,4 +5,5 @@ var v = {
 
 //// [objectLiteralWithSemicolons4.js]
 var v = {
-    a:  };
+    a: 
+};
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.js b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
index eabb1a153a6..1612e6785c7 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
@@ -32,16 +32,15 @@ var a;
 var C = (function () {
     function C() {
     }
-    C.prototype.x = ;
+    C.prototype.x = function () { };
     return C;
 }());
 var C2 = (function () {
     function C2() {
     }
-    C2.prototype.x = ;
+    C2.prototype.x = function () { };
     return C2;
 }());
 var b = {
-    x: function () { }, 1: // error
-     // error
+    x: function () { }, 1:  // error
 };
diff --git a/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
new file mode 100644
index 00000000000..9fa887c53b3
--- /dev/null
+++ b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/compiler/optionsOutAndNoModuleGen.ts(2,1): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+
+
+==== tests/cases/compiler/optionsOutAndNoModuleGen.ts (1 errors) ====
+    
+    export var x = 10;
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
\ No newline at end of file
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesSystem.js b/tests/baselines/reference/outFilerootDirModuleNamesSystem.js
index 18ec6ecc19b..6754f3ef89a 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesSystem.js
+++ b/tests/baselines/reference/outFilerootDirModuleNamesSystem.js
@@ -11,36 +11,37 @@ export default function foo() { new Foo(); }
 
 
 //// [output.js]
-System.register("b", ["a"], function(exports_1, context_1) {
+System.register("b", ["a"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var a_1;
     function foo() { new a_1.default(); }
+    var a_1;
     exports_1("default", foo);
     return {
-        setters:[
+        setters: [
             function (a_1_1) {
                 a_1 = a_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
         }
-    }
+    };
 });
-System.register("a", ["b"], function(exports_2, context_2) {
+System.register("a", ["b"], function (exports_2, context_2) {
     "use strict";
     var __moduleName = context_2 && context_2.id;
-    var b_1;
-    var Foo;
+    var b_1, Foo;
     return {
-        setters:[
+        setters: [
             function (b_1_1) {
                 b_1 = b_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             Foo = class Foo {
             };
             exports_2("default", Foo);
             b_1.default();
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index 5c34fd866a4..7f9893b2346 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAlB,cAAkB;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAA5B,cAA4B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index 76370d95c32..ba7f1d93245 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -62,17 +62,11 @@ sourceFile:tests/cases/compiler/ref/a.ts
 ---
 >>>    exports.A = A;
 1->^^^^
-2 >    ^^^^^^^^^
-3 >             ^^^^
-4 >                 ^
+2 >    ^^^^^^^^^^^^^^
 1->
-2 >    A
-3 >              { }
-4 >                 
-1->Emitted(13, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(13, 14) Source(2, 15) + SourceIndex(0)
-3 >Emitted(13, 18) Source(2, 19) + SourceIndex(0)
-4 >Emitted(13, 19) Source(2, 19) + SourceIndex(0)
+2 >    export class A { }
+1->Emitted(13, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(13, 19) Source(2, 19) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -150,17 +144,11 @@ sourceFile:tests/cases/compiler/b.ts
 ---
 >>>    exports.B = B;
 1->^^^^
-2 >    ^^^^^^^^^
-3 >             ^^^^
-4 >                 ^
+2 >    ^^^^^^^^^^^^^^
 1->
-2 >    B
-3 >              extends A { }
-4 >                 
-1->Emitted(24, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(24, 14) Source(2, 15) + SourceIndex(1)
-3 >Emitted(24, 18) Source(2, 29) + SourceIndex(1)
-4 >Emitted(24, 19) Source(2, 29) + SourceIndex(1)
+2 >    export class B extends A { }
+1->Emitted(24, 5) Source(2, 1) + SourceIndex(1)
+2 >Emitted(24, 19) Source(2, 29) + SourceIndex(1)
 ---
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js b/tests/baselines/reference/outModuleConcatCommonjs.js
deleted file mode 100644
index 0dbaee88004..00000000000
--- a/tests/baselines/reference/outModuleConcatCommonjs.js
+++ /dev/null
@@ -1,31 +0,0 @@
-//// [tests/cases/compiler/outModuleConcatCommonjs.ts] ////
-
-//// [a.ts]
-
-// This should be an error
-
-export class A { }
-
-//// [b.ts]
-import {A} from "./ref/a";
-export class B extends A { }
-
-//// [all.js]
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-// This should be an error
-//# sourceMappingURL=all.js.map
-
-//// [all.d.ts]
-declare module "ref/a" {
-    export class A {
-    }
-}
-declare module "b" {
-    import { A } from "ref/a";
-    export class B extends A {
-    }
-}
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js.map b/tests/baselines/reference/outModuleConcatCommonjs.js.map
deleted file mode 100644
index 09646467406..00000000000
--- a/tests/baselines/reference/outModuleConcatCommonjs.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AACA,0BAA0B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt b/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
deleted file mode 100644
index 698328649e2..00000000000
--- a/tests/baselines/reference/outModuleConcatCommonjs.sourcemap.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-===================================================================
-JsFile: all.js
-mapUrl: all.js.map
-sourceRoot: 
-sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:all.js
-sourceFile:tests/cases/compiler/ref/a.ts
--------------------------------------------------------------------
->>>var __extends = (this && this.__extends) || function (d, b) {
->>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
->>>    function __() { this.constructor = d; }
->>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
->>>};
->>>// This should be an error
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^->
-1 >
-  >
-2 >// This should be an error
-1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(6, 27) Source(2, 27) + SourceIndex(0)
----
->>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.js b/tests/baselines/reference/outModuleConcatES6.js
deleted file mode 100644
index 45e58d2d773..00000000000
--- a/tests/baselines/reference/outModuleConcatES6.js
+++ /dev/null
@@ -1,26 +0,0 @@
-//// [tests/cases/compiler/outModuleConcatES6.ts] ////
-
-//// [a.ts]
-
-// This should be an error
-
-export class A { }
-
-//// [b.ts]
-import {A} from "./ref/a";
-export class B extends A { }
-
-//// [all.js]
-// This should be an error
-//# sourceMappingURL=all.js.map
-
-//// [all.d.ts]
-declare module "ref/a" {
-    export class A {
-    }
-}
-declare module "b" {
-    import { A } from "ref/a";
-    export class B extends A {
-    }
-}
diff --git a/tests/baselines/reference/outModuleConcatES6.js.map b/tests/baselines/reference/outModuleConcatES6.js.map
deleted file mode 100644
index bd3e6f58731..00000000000
--- a/tests/baselines/reference/outModuleConcatES6.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AACA,0BAA0B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatES6.sourcemap.txt b/tests/baselines/reference/outModuleConcatES6.sourcemap.txt
deleted file mode 100644
index 78b6e98ac15..00000000000
--- a/tests/baselines/reference/outModuleConcatES6.sourcemap.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-===================================================================
-JsFile: all.js
-mapUrl: all.js.map
-sourceRoot: 
-sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:all.js
-sourceFile:tests/cases/compiler/ref/a.ts
--------------------------------------------------------------------
->>>// This should be an error
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^->
-1 >
-  >
-2 >// This should be an error
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 27) Source(2, 27) + SourceIndex(0)
----
->>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js
index 59bbb363022..b23b73caf83 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -14,13 +14,13 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-System.register("ref/a", [], function(exports_1, context_1) {
+System.register("ref/a", [], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var A;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             A = (function () {
                 function A() {
                 }
@@ -28,19 +28,19 @@ System.register("ref/a", [], function(exports_1, context_1) {
             }());
             exports_1("A", A);
         }
-    }
+    };
 });
-System.register("b", ["ref/a"], function(exports_2, context_2) {
+System.register("b", ["ref/a"], function (exports_2, context_2) {
     "use strict";
     var __moduleName = context_2 && context_2.id;
-    var a_1;
-    var B;
+    var a_1, B;
     return {
-        setters:[
+        setters: [
             function (a_1_1) {
                 a_1 = a_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             B = (function (_super) {
                 __extends(B, _super);
                 function B() {
@@ -50,7 +50,7 @@ System.register("b", ["ref/a"], function(exports_2, context_2) {
             }(a_1.A));
             exports_2("B", B);
         }
-    }
+    };
 });
 //# sourceMappingURL=all.js.map
 
diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map
index be6e66c3cf4..59ab70de531 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js.map
+++ b/tests/baselines/reference/outModuleConcatSystem.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;YAA5B,iBAA4B,CAAA"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;;QAClB,CAAC;;;;;;;;;;;;;;YCDD;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;;QAAA,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
index 0281bdec5bd..86573493e20 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -13,13 +13,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    function __() { this.constructor = d; }
 >>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 >>>};
->>>System.register("ref/a", [], function(exports_1, context_1) {
+>>>System.register("ref/a", [], function (exports_1, context_1) {
 >>>    "use strict";
 >>>    var __moduleName = context_1 && context_1.id;
 >>>    var A;
 >>>    return {
->>>        setters:[],
->>>        execute: function() {
+>>>        setters: [],
+>>>        execute: function () {
 >>>            A = (function () {
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^->
@@ -66,34 +66,32 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >Emitted(17, 18) Source(2, 19) + SourceIndex(0)
 ---
 >>>            exports_1("A", A);
-1->^^^^^^^^^^^^
-2 >            ^^^^^^^^^^^^^^^^^
-3 >                             ^
-1->
-2 >            export class A { }
-3 >                             
-1->Emitted(18, 13) Source(2, 1) + SourceIndex(0)
-2 >Emitted(18, 30) Source(2, 19) + SourceIndex(0)
-3 >Emitted(18, 31) Source(2, 19) + SourceIndex(0)
+>>>        }
+1->^^^^^^^^
+2 >        ^
+1->
+  >
+2 >        
+1->Emitted(19, 9) Source(3, 1) + SourceIndex(0)
+2 >Emitted(19, 10) Source(3, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
->>>        }
->>>    }
+>>>    };
 >>>});
->>>System.register("b", ["ref/a"], function(exports_2, context_2) {
+>>>System.register("b", ["ref/a"], function (exports_2, context_2) {
 >>>    "use strict";
 >>>    var __moduleName = context_2 && context_2.id;
->>>    var a_1;
->>>    var B;
+>>>    var a_1, B;
 >>>    return {
->>>        setters:[
+>>>        setters: [
 >>>            function (a_1_1) {
 >>>                a_1 = a_1_1;
->>>            }],
->>>        execute: function() {
+>>>            }
+>>>        ],
+>>>        execute: function () {
 >>>            B = (function (_super) {
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -162,17 +160,14 @@ sourceFile:tests/cases/compiler/b.ts
 6 >Emitted(39, 23) Source(2, 29) + SourceIndex(1)
 ---
 >>>            exports_2("B", B);
-1->^^^^^^^^^^^^
-2 >            ^^^^^^^^^^^^^^^^^
-3 >                             ^
-1->
-2 >            export class B extends A { }
-3 >                             
-1->Emitted(40, 13) Source(2, 1) + SourceIndex(1)
-2 >Emitted(40, 30) Source(2, 29) + SourceIndex(1)
-3 >Emitted(40, 31) Source(2, 29) + SourceIndex(1)
----
 >>>        }
->>>    }
+1->^^^^^^^^
+2 >        ^
+1->
+2 >        
+1->Emitted(41, 9) Source(2, 29) + SourceIndex(1)
+2 >Emitted(41, 10) Source(2, 30) + SourceIndex(1)
+---
+>>>    };
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.js b/tests/baselines/reference/outModuleConcatUmd.js
deleted file mode 100644
index 6c60a13c892..00000000000
--- a/tests/baselines/reference/outModuleConcatUmd.js
+++ /dev/null
@@ -1,31 +0,0 @@
-//// [tests/cases/compiler/outModuleConcatUmd.ts] ////
-
-//// [a.ts]
-
-// This should error
-
-export class A { }
-
-//// [b.ts]
-import {A} from "./ref/a";
-export class B extends A { }
-
-//// [all.js]
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-// This should error
-//# sourceMappingURL=all.js.map
-
-//// [all.d.ts]
-declare module "ref/a" {
-    export class A {
-    }
-}
-declare module "b" {
-    import { A } from "ref/a";
-    export class B extends A {
-    }
-}
diff --git a/tests/baselines/reference/outModuleConcatUmd.js.map b/tests/baselines/reference/outModuleConcatUmd.js.map
deleted file mode 100644
index 7a9fcd77bdf..00000000000
--- a/tests/baselines/reference/outModuleConcatUmd.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AACA,oBAAoB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
deleted file mode 100644
index d2fbe17fe65..00000000000
--- a/tests/baselines/reference/outModuleConcatUmd.sourcemap.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-===================================================================
-JsFile: all.js
-mapUrl: all.js.map
-sourceRoot: 
-sources: tests/cases/compiler/ref/a.ts,tests/cases/compiler/b.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:all.js
-sourceFile:tests/cases/compiler/ref/a.ts
--------------------------------------------------------------------
->>>var __extends = (this && this.__extends) || function (d, b) {
->>>    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
->>>    function __() { this.constructor = d; }
->>>    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
->>>};
->>>// This should error
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^^^^^^^^->
-1 >
-  >
-2 >// This should error
-1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(6, 21) Source(2, 21) + SourceIndex(0)
----
->>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index 7d0c11de99c..c6e1aab6bc8 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFD,cAEC;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAA5B,cAA4B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index a689c611ef0..8be43826419 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -136,19 +136,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 ---
 >>>    exports.A = A;
 1->^^^^
-2 >    ^^^^^^^^^
-3 >             ^^^^
-4 >                 ^
+2 >    ^^^^^^^^^^^^^^
 1->
-2 >    A
-3 >              {
-  >             	member: typeof GlobalFoo;
-  >             }
-4 >                 
-1->Emitted(20, 5) Source(3, 14) + SourceIndex(1)
-2 >Emitted(20, 14) Source(3, 15) + SourceIndex(1)
-3 >Emitted(20, 18) Source(5, 2) + SourceIndex(1)
-4 >Emitted(20, 19) Source(5, 2) + SourceIndex(1)
+2 >    export class A {
+  >    	member: typeof GlobalFoo;
+  >    }
+1->Emitted(20, 5) Source(3, 1) + SourceIndex(1)
+2 >Emitted(20, 19) Source(5, 2) + SourceIndex(1)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -226,17 +220,11 @@ sourceFile:tests/cases/compiler/b.ts
 ---
 >>>    exports.B = B;
 1->^^^^
-2 >    ^^^^^^^^^
-3 >             ^^^^
-4 >                 ^
+2 >    ^^^^^^^^^^^^^^
 1->
-2 >    B
-3 >              extends A { }
-4 >                 
-1->Emitted(31, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(31, 14) Source(2, 15) + SourceIndex(2)
-3 >Emitted(31, 18) Source(2, 29) + SourceIndex(2)
-4 >Emitted(31, 19) Source(2, 29) + SourceIndex(2)
+2 >    export class B extends A { }
+1->Emitted(31, 5) Source(2, 1) + SourceIndex(2)
+2 >Emitted(31, 19) Source(2, 29) + SourceIndex(2)
 ---
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadConsecutiveness.js b/tests/baselines/reference/overloadConsecutiveness.js
index 68e478a30b5..6a245ea18fa 100644
--- a/tests/baselines/reference/overloadConsecutiveness.js
+++ b/tests/baselines/reference/overloadConsecutiveness.js
@@ -14,13 +14,15 @@ class C {
 
 //// [overloadConsecutiveness.js]
 // Making sure compiler won't break with declarations that are consecutive in the AST but not consecutive in the source. Syntax errors intentional.
+function f1() { }
+function f2() { }
 function f2() { }
 function f3() { }
 var C = (function () {
     function C() {
     }
-    C.prototype.m1 = ;
-    C.prototype.m2 = ;
+    C.prototype.m1 = function () { };
+    C.prototype.m2 = function () { };
     C.prototype.m2 = function () { };
     C.prototype.m3 = function () { };
     return C;
diff --git a/tests/baselines/reference/parameterReferenceInInitializer1.js b/tests/baselines/reference/parameterReferenceInInitializer1.js
index 51f98603de8..c1ebb1722d6 100644
--- a/tests/baselines/reference/parameterReferenceInInitializer1.js
+++ b/tests/baselines/reference/parameterReferenceInInitializer1.js
@@ -18,9 +18,9 @@ function fn(y, set) {
 }
 var C = (function () {
     function C(y, x // expected to work, but actually doesn't
-        ) {
-        if (x === void 0) { x = fn(y, function (y, x) { return y.x = x; }); }
-        this.x = x;
+    ) {
+        if (x === void 0) { x = fn(y, function (y, x) { return y.x = x; }); } // expected to work, but actually doesn't
+        this.x = x; // expected to work, but actually doesn't
     }
     return C;
 }());
diff --git a/tests/baselines/reference/parseRegularExpressionMixedWithComments.js b/tests/baselines/reference/parseRegularExpressionMixedWithComments.js
index 78752a77f75..a955ba31f2f 100644
--- a/tests/baselines/reference/parseRegularExpressionMixedWithComments.js
+++ b/tests/baselines/reference/parseRegularExpressionMixedWithComments.js
@@ -10,5 +10,5 @@ var regex5 = /**// asdf/**/ /;
 var regex1 = / asdf /;
 var regex2 = / asdf /;
 var regex3 = 1;
-var regex4 = Math.pow(/ /, /asdf /);
-var regex5 = Math.pow(/ asdf/, / /);
+var regex4 = Math.pow(/**/ / /, /asdf /);
+var regex5 = Math.pow(/**/ / asdf/, / /);
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic3.js b/tests/baselines/reference/parserAccessibilityAfterStatic3.js
index 7a9ae06e439..38202bc5dc8 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic3.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic3.js
@@ -9,6 +9,6 @@ static public = 1;
 var Outer = (function () {
     function Outer() {
     }
-    Outer.public = 1;
     return Outer;
 }());
+Outer.public = 1;
diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js
index 8ad35187e51..79bee90168d 100644
--- a/tests/baselines/reference/parserES5ForOfStatement4.js
+++ b/tests/baselines/reference/parserES5ForOfStatement4.js
@@ -4,5 +4,5 @@ for (var a = 1 of X) {
 
 //// [parserES5ForOfStatement4.js]
 for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
-    var a = 1 = X_1[_i];
+    var a = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js
index 75454de208e..fd3c20d9484 100644
--- a/tests/baselines/reference/parserES5ForOfStatement6.js
+++ b/tests/baselines/reference/parserES5ForOfStatement6.js
@@ -4,5 +4,5 @@ for (var a = 1, b = 2 of X) {
 
 //// [parserES5ForOfStatement6.js]
 for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
-    var a = 1 = X_1[_i];
+    var a = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js
index ef3a02e45eb..f1c0fd394db 100644
--- a/tests/baselines/reference/parserES5ForOfStatement7.js
+++ b/tests/baselines/reference/parserES5ForOfStatement7.js
@@ -4,5 +4,5 @@ for (var a: number = 1, b: string = "" of X) {
 
 //// [parserES5ForOfStatement7.js]
 for (var _i = 0, X_1 = X; _i < X_1.length; _i++) {
-    var a = 1 = X_1[_i];
+    var a = X_1[_i];
 }
diff --git a/tests/baselines/reference/parserEnum5.js b/tests/baselines/reference/parserEnum5.js
index 50781f40dd7..89d92dee6cf 100644
--- a/tests/baselines/reference/parserEnum5.js
+++ b/tests/baselines/reference/parserEnum5.js
@@ -11,14 +11,14 @@ var E2;
 var E3;
 (function (E3) {
     E3[E3["a"] = 0] = "a";
-    E3[E3["1"] = 1] = "1";
+    E3[E3[1] = 1] = 1;
 })(E3 || (E3 = {}));
 var E1;
 (function (E1) {
     E1[E1["a"] = 0] = "a";
     E1[E1["b"] = 1] = "b";
-    E1[E1["1"] = 2] = "1";
+    E1[E1[1] = 2] = 1;
     E1[E1["c"] = 3] = "c";
     E1[E1["d"] = 4] = "d";
-    E1[E1["2"] = 3] = "2";
+    E1[E1[2] = 3] = 2;
 })(E1 || (E1 = {}));
diff --git a/tests/baselines/reference/parserEnum7.js b/tests/baselines/reference/parserEnum7.js
index 3781167bbba..86809cf325f 100644
--- a/tests/baselines/reference/parserEnum7.js
+++ b/tests/baselines/reference/parserEnum7.js
@@ -6,7 +6,7 @@ enum E {
 //// [parserEnum7.js]
 var E;
 (function (E) {
-    E[E["1"] = 0] = "1";
-    E[E["2"] = 1] = "2";
-    E[E["3"] = 2] = "3";
+    E[E[1] = 0] = 1;
+    E[E[2] = 1] = 2;
+    E[E[3] = 2] = 3;
 })(E || (E = {}));
diff --git a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction1.js b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction1.js
index 5358a25fd82..3a2ff9e3ae7 100644
--- a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction1.js
+++ b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction1.js
@@ -2,3 +2,4 @@
 function =>
 
 //// [parserEqualsGreaterThanAfterFunction1.js]
+function () { }
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.js b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.js
index c1b2f517b45..f39b641efd7 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.js
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.js
@@ -2,4 +2,5 @@
 function f() => 4;
 
 //// [parserErrantEqualsGreaterThanAfterFunction1.js]
+function f() { }
 4;
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.js b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.js
index 5b4b71cab1f..83586363466 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.js
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.js
@@ -2,4 +2,5 @@
 function f(p: A) => p;
 
 //// [parserErrantEqualsGreaterThanAfterFunction2.js]
+function f(p) { }
 p;
diff --git a/tests/baselines/reference/parserErrorRecovery_Block3.js b/tests/baselines/reference/parserErrorRecovery_Block3.js
index 1851d148bc8..842533c6801 100644
--- a/tests/baselines/reference/parserErrorRecovery_Block3.js
+++ b/tests/baselines/reference/parserErrorRecovery_Block3.js
@@ -10,7 +10,8 @@ class C  {
 var C = (function () {
     function C() {
     }
-    C.prototype.a = function () { };
+    C.prototype.a = function () {
+    };
     C.prototype.b = function () {
     };
     return C;
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
index 9bb4395e556..57d0536e975 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
@@ -41,10 +41,10 @@ var Shapes;
         }
         // Instance member
         Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); };
-        // Static member
-        Point.origin = new Point(0, 0);
         return Point;
     }());
+    // Static member
+    Point.origin = new Point(0, 0);
     Shapes.Point = Point;
 })(Shapes || (Shapes = {}));
 // Local variables
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js
index 0ee73b8b1e5..2bb08a14e35 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js
@@ -42,10 +42,10 @@ var Shapes;
         }
         // Instance member
         Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); };
-        // Static member
-        Point.origin = new Point(0, 0);
         return Point;
     }());
+    // Static member
+    Point.origin = new Point(0, 0);
     Shapes.Point = Point;
 })(Shapes || (Shapes = {}));
 // Local variables
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList5.js b/tests/baselines/reference/parserErrorRecovery_ParameterList5.js
index 7ff32fd1873..3de7d0593c5 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList5.js
@@ -2,4 +2,4 @@
 (a:number => { }
 
 //// [parserErrorRecovery_ParameterList5.js]
-();
+(function (a, _a) { return ; });
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js
index 21e43f31512..c3d5a838f88 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js
@@ -7,7 +7,7 @@ class Foo {
 var Foo = (function () {
     function Foo() {
     }
-    Foo.prototype.banana = ;
+    Foo.prototype.banana = function (x) { };
     return Foo;
 }());
 break ;
diff --git a/tests/baselines/reference/parserExportAssignment5.js b/tests/baselines/reference/parserExportAssignment5.js
index ac2a1202e5e..03b1d798d5d 100644
--- a/tests/baselines/reference/parserExportAssignment5.js
+++ b/tests/baselines/reference/parserExportAssignment5.js
@@ -6,4 +6,5 @@ module M {
 //// [parserExportAssignment5.js]
 var M;
 (function (M) {
+    export = A;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/parserForInStatement2.js b/tests/baselines/reference/parserForInStatement2.js
index 9f522eadc5d..0f55fd32c65 100644
--- a/tests/baselines/reference/parserForInStatement2.js
+++ b/tests/baselines/reference/parserForInStatement2.js
@@ -3,5 +3,5 @@ for (var in X) {
 }
 
 //// [parserForInStatement2.js]
-for ( in X) {
+for (var  in X) {
 }
diff --git a/tests/baselines/reference/parserForInStatement3.js b/tests/baselines/reference/parserForInStatement3.js
index 4964c108ca0..076acbf68e8 100644
--- a/tests/baselines/reference/parserForInStatement3.js
+++ b/tests/baselines/reference/parserForInStatement3.js
@@ -3,5 +3,5 @@ for (var a, b in X) {
 }
 
 //// [parserForInStatement3.js]
-for (var a in X) {
+for (var a, b in X) {
 }
diff --git a/tests/baselines/reference/parserForInStatement6.js b/tests/baselines/reference/parserForInStatement6.js
index b80d13f3184..f35a550252e 100644
--- a/tests/baselines/reference/parserForInStatement6.js
+++ b/tests/baselines/reference/parserForInStatement6.js
@@ -3,5 +3,5 @@ for (var a = 1, b = 2 in X) {
 }
 
 //// [parserForInStatement6.js]
-for (var a = 1 in X) {
+for (var a = 1, b = 2 in X) {
 }
diff --git a/tests/baselines/reference/parserForInStatement7.js b/tests/baselines/reference/parserForInStatement7.js
index 5c056abedb6..ee8c948a9d2 100644
--- a/tests/baselines/reference/parserForInStatement7.js
+++ b/tests/baselines/reference/parserForInStatement7.js
@@ -3,5 +3,5 @@ for (var a: number = 1, b: string = "" in X) {
 }
 
 //// [parserForInStatement7.js]
-for (var a = 1 in X) {
+for (var a = 1, b = "" in X) {
 }
diff --git a/tests/baselines/reference/parserForOfStatement2.js b/tests/baselines/reference/parserForOfStatement2.js
index 84d23d4e2aa..0ede351060b 100644
--- a/tests/baselines/reference/parserForOfStatement2.js
+++ b/tests/baselines/reference/parserForOfStatement2.js
@@ -3,5 +3,5 @@ for (var of X) {
 }
 
 //// [parserForOfStatement2.js]
-for ( of X) {
+for (var  of X) {
 }
diff --git a/tests/baselines/reference/parserForOfStatement21.js b/tests/baselines/reference/parserForOfStatement21.js
index 5db883e18a0..8852b91b413 100644
--- a/tests/baselines/reference/parserForOfStatement21.js
+++ b/tests/baselines/reference/parserForOfStatement21.js
@@ -2,4 +2,4 @@
 for (var of of) { }
 
 //// [parserForOfStatement21.js]
-for ( of of) { }
+for (var  of of) { }
diff --git a/tests/baselines/reference/parserForOfStatement3.js b/tests/baselines/reference/parserForOfStatement3.js
index 206e8fe5af8..497eef03142 100644
--- a/tests/baselines/reference/parserForOfStatement3.js
+++ b/tests/baselines/reference/parserForOfStatement3.js
@@ -3,5 +3,5 @@ for (var a, b of X) {
 }
 
 //// [parserForOfStatement3.js]
-for (var a of X) {
+for (var a, b of X) {
 }
diff --git a/tests/baselines/reference/parserForOfStatement6.js b/tests/baselines/reference/parserForOfStatement6.js
index 37f3560a29c..0268b1dc676 100644
--- a/tests/baselines/reference/parserForOfStatement6.js
+++ b/tests/baselines/reference/parserForOfStatement6.js
@@ -3,5 +3,5 @@ for (var a = 1, b = 2 of X) {
 }
 
 //// [parserForOfStatement6.js]
-for (var a = 1 of X) {
+for (var a = 1, b = 2 of X) {
 }
diff --git a/tests/baselines/reference/parserForOfStatement7.js b/tests/baselines/reference/parserForOfStatement7.js
index 0b18d0358b4..a8867d6974c 100644
--- a/tests/baselines/reference/parserForOfStatement7.js
+++ b/tests/baselines/reference/parserForOfStatement7.js
@@ -3,5 +3,5 @@ for (var a: number = 1, b: string = "" of X) {
 }
 
 //// [parserForOfStatement7.js]
-for (var a = 1 of X) {
+for (var a = 1, b = "" of X) {
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.js b/tests/baselines/reference/parserMemberAccessorDeclaration10.js
index fd02058d06c..6dd5e190198 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration10.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.js
@@ -8,8 +8,7 @@ var C = (function () {
     function C() {
     }
     Object.defineProperty(C.prototype, "Foo", {
-        get: function () { }
-        exports.Foo = Foo;,
+        get: function () { },
         enumerable: true,
         configurable: true
     });
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.js b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
index acde7a1daed..c8c87111d92 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
@@ -7,7 +7,7 @@ class C {
 var C = (function () {
     function C() {
     }
-    Object.defineProperty(C.prototype, "0", {
+    Object.defineProperty(C.prototype, 0, {
         get: function () { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.js b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
index 3f9f6d9bea9..52977e1b7dc 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
@@ -7,7 +7,7 @@ class C {
 var C = (function () {
     function C() {
     }
-    Object.defineProperty(C.prototype, "0", {
+    Object.defineProperty(C.prototype, 0, {
         set: function (i) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration4.js b/tests/baselines/reference/parserMemberFunctionDeclaration4.js
index f082a450346..8911fe60c1f 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclaration4.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclaration4.js
@@ -7,7 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype.Foo = function () { }
-    exports.Foo = Foo;;
+    C.prototype.Foo = function () { };
     return C;
 }());
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
index e7234a4d274..352ee0cc511 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
@@ -7,6 +7,6 @@ export function foo() {
 //// [parserModifierOnStatementInBlock1.js]
 "use strict";
 function foo() {
-    exports.x = this;
+    export var x = this;
 }
 exports.foo = foo;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
index 0520d0e1d07..2815af43708 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
@@ -10,6 +10,5 @@ export function foo() {
 function foo() {
     function bar() {
     }
-    exports.bar = bar;
 }
 exports.foo = foo;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock4.js b/tests/baselines/reference/parserModifierOnStatementInBlock4.js
index 82d2475a689..34b390468eb 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock4.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock4.js
@@ -9,5 +9,4 @@
 {
     function bar() {
     }
-    exports.bar = bar;
 }
diff --git a/tests/baselines/reference/parserParameterList1.js b/tests/baselines/reference/parserParameterList1.js
index 7fabad715e1..01ef6a149dc 100644
--- a/tests/baselines/reference/parserParameterList1.js
+++ b/tests/baselines/reference/parserParameterList1.js
@@ -7,6 +7,6 @@ class C {
 var C = (function () {
     function C() {
     }
-    C.prototype.F = function (A, B) { };
+    C.prototype.F = function (B) { };
     return C;
 }());
diff --git a/tests/baselines/reference/parserRealSource4.js b/tests/baselines/reference/parserRealSource4.js
index c06bd191fb5..39d17fb6ef4 100644
--- a/tests/baselines/reference/parserRealSource4.js
+++ b/tests/baselines/reference/parserRealSource4.js
@@ -319,7 +319,7 @@ var TypeScript;
     var StringHashTable = (function () {
         function StringHashTable() {
             this.itemCount = 0;
-            this.table = (new BlockIntrinsics());
+            this.table = new BlockIntrinsics();
         }
         StringHashTable.prototype.getAllKeys = function () {
             var result = [];
diff --git a/tests/baselines/reference/parserSkippedTokens16.js b/tests/baselines/reference/parserSkippedTokens16.js
index dfbd8a4277a..2c3a9be876d 100644
--- a/tests/baselines/reference/parserSkippedTokens16.js
+++ b/tests/baselines/reference/parserSkippedTokens16.js
@@ -12,6 +12,7 @@ var x       =
 foo();
 Bar;
 { }
+function Foo() { }
 { }
 4 + ;
 5;
diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js
index 6b38a8c9e4c..1a525c49d19 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2371,11 +2371,11 @@ var Harness;
                 errorHandlerStack[errorHandlerStack.length - 1](e);
             }
         };
-        // The current stack of Runnable objects
-        Runnable.currentStack = [];
-        Runnable.errorHandlerStack = [];
         return Runnable;
     }());
+    // The current stack of Runnable objects
+    Runnable.currentStack = [];
+    Runnable.errorHandlerStack = [];
     Harness.Runnable = Runnable;
     var TestCase = (function (_super) {
         __extends(TestCase, _super);
diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js
index cf88f4e9ba6..d51c2624b1c 100644
--- a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js
+++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js
@@ -31,13 +31,13 @@ if (++y) {
 }
 
 //// [prefixUnaryOperatorsOnExportedVariables.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x, y;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = false);
             exports_1("y", y = 1);
             if (!x) {
@@ -55,5 +55,5 @@ System.register([], function(exports_1, context_1) {
             if (exports_1("y", ++y)) {
             }
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
index 6c2dcf304cf..cebf700aa59 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -159,13 +159,13 @@ var publicClassWithWithPrivatePropertyTypes = (function () {
         this.myPublicProperty1 = exporter.createExportedWidget3(); // Error
         this.myPrivateProperty1 = exporter.createExportedWidget3();
     }
-    publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); // Error
-    publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
-    publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
-    publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
     return publicClassWithWithPrivatePropertyTypes;
 }());
 exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); // Error
+publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
+publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
+publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
 var privateClassWithWithPrivatePropertyTypes = (function () {
     function privateClassWithWithPrivatePropertyTypes() {
         this.myPublicProperty = exporter.createExportedWidget1();
@@ -173,12 +173,12 @@ var privateClassWithWithPrivatePropertyTypes = (function () {
         this.myPublicProperty1 = exporter.createExportedWidget3();
         this.myPrivateProperty1 = exporter.createExportedWidget3();
     }
-    privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1();
-    privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
-    privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3();
-    privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
     return privateClassWithWithPrivatePropertyTypes;
 }());
+privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1();
+privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
+privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3();
+privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
 exports.publicVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); // Error
 var privateVarWithPrivatePropertyTypes = exporter.createExportedWidget1();
 exports.publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
@@ -188,11 +188,11 @@ var publicClassWithPrivateModulePropertyTypes = (function () {
         this.myPublicProperty = exporter.createExportedWidget2(); // Error
         this.myPublicProperty1 = exporter.createExportedWidget4(); // Error
     }
-    publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error
-    publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
     return publicClassWithPrivateModulePropertyTypes;
 }());
 exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error
+publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
 exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); // Error
 exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
 var privateClassWithPrivateModulePropertyTypes = (function () {
@@ -200,10 +200,10 @@ var privateClassWithPrivateModulePropertyTypes = (function () {
         this.myPublicProperty = exporter.createExportedWidget2();
         this.myPublicProperty1 = exporter.createExportedWidget4();
     }
-    privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2();
-    privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
     return privateClassWithPrivateModulePropertyTypes;
 }());
+privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2();
+privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
 var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2();
 var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
 
diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js
index 407ac5bb8d5..ecafec9d639 100644
--- a/tests/baselines/reference/privacyGloImport.js
+++ b/tests/baselines/reference/privacyGloImport.js
@@ -235,6 +235,8 @@ var m1;
     //var m1_im4_private_v4_private = m1_im4_private.f1();
     m1.m1_im1_public = m1_M1_public;
     m1.m1_im2_public = m1_M2_private;
+    //export import m1_im3_public = require("m1_M3_public");
+    //export import m1_im4_public = require("m1_M4_private");
 })(m1 || (m1 = {}));
 var glo_M1_public;
 (function (glo_M1_public) {
@@ -256,5 +258,6 @@ var m2;
     var m4;
     (function (m4) {
         var a = 10;
+        //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
index debb1e3b4bd..fcac37bac36 100644
--- a/tests/baselines/reference/privacyImport.js
+++ b/tests/baselines/reference/privacyImport.js
@@ -440,6 +440,8 @@ var m1;
     //var m1_im4_private_v4_private = m1_im4_private.f1();
     m1.m1_im1_public = m1_M1_public;
     m1.m1_im2_public = m1_M2_private;
+    //export import m1_im3_public = require("m1_M3_public");
+    //export import m1_im4_public = require("m1_M4_private");
 })(m1 = exports.m1 || (exports.m1 = {}));
 var m2;
 (function (m2) {
@@ -524,6 +526,8 @@ var m2;
     // Parse error to export module
     m2.m1_im1_public = m2_M1_public;
     m2.m1_im2_public = m2_M2_private;
+    //export import m1_im3_public = require("m2_M3_public");
+    //export import m1_im4_public = require("m2_M4_private");
 })(m2 || (m2 = {}));
 var glo_M1_public;
 (function (glo_M1_public) {
@@ -686,6 +690,7 @@ var m2;
     var m4;
     (function (m4) {
         var a = 10;
+        //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m2 || (m2 = {}));
 var m3;
@@ -694,5 +699,6 @@ var m3;
     var m4;
     (function (m4) {
         var a = 10;
+        //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m3 = exports.m3 || (exports.m3 = {}));
diff --git a/tests/baselines/reference/privateIndexer2.js b/tests/baselines/reference/privateIndexer2.js
index 1268c6e4c25..a90e03a5bc2 100644
--- a/tests/baselines/reference/privateIndexer2.js
+++ b/tests/baselines/reference/privateIndexer2.js
@@ -14,7 +14,6 @@ var y: {
 var x = (_a = {},
     _a[x] = string,
     _a.string = ,
-    _a
-);
+    _a);
 var y;
 var _a;
diff --git a/tests/baselines/reference/privateStaticMemberAccessibility.js b/tests/baselines/reference/privateStaticMemberAccessibility.js
index 2074e5aa864..352256ac9bd 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -25,6 +25,6 @@ var Derived = (function (_super) {
         _super.apply(this, arguments);
         this.bing = function () { return Base.foo; }; // error
     }
-    Derived.bar = Base.foo; // error
     return Derived;
 }(Base));
+Derived.bar = Base.foo; // error
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
index 7c26154e17b..3025d1c8d37 100644
--- a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
@@ -16,8 +16,5 @@
         "a.ts",
         "subfolder/c.ts"
     ],
-    "emittedFiles": [
-        "out.js",
-        "out.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir3/node/out.d.ts b/tests/baselines/reference/project/declarationDir3/node/out.d.ts
deleted file mode 100644
index 60950f066bc..00000000000
--- a/tests/baselines/reference/project/declarationDir3/node/out.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-declare module "subfolder/b" {
-    export class B {
-    }
-}
-declare module "a" {
-    import { B } from "subfolder/b";
-    export class A {
-        b: B;
-    }
-}
-declare module "subfolder/c" {
-    import { A } from "a";
-    export class C {
-        a: A;
-    }
-}
diff --git a/tests/baselines/reference/project/declarationDir3/node/out.js b/tests/baselines/reference/project/declarationDir3/node/out.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index 41ab9194c4e..8b73fc550cf 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -13,12 +13,12 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
         }
-        MyClass1 = __decorate([
-            foo, 
-            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-        ], MyClass1);
         return MyClass1;
-        var _a;
     }());
+    MyClass1 = __decorate([
+        foo,
+        __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+    ], MyClass1);
     exports.MyClass1 = MyClass1;
+    var _a;
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index e8bd90fc475..3c1d2cd6da6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -13,11 +13,11 @@ var MyClass1 = (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
     }
-    MyClass1 = __decorate([
-        foo, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-    ], MyClass1);
     return MyClass1;
-    var _a;
 }());
+MyClass1 = __decorate([
+    foo,
+    __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+], MyClass1);
 exports.MyClass1 = MyClass1;
+var _a;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index 41ab9194c4e..8b73fc550cf 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -13,12 +13,12 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
         }
-        MyClass1 = __decorate([
-            foo, 
-            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-        ], MyClass1);
         return MyClass1;
-        var _a;
     }());
+    MyClass1 = __decorate([
+        foo,
+        __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+    ], MyClass1);
     exports.MyClass1 = MyClass1;
+    var _a;
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index e8bd90fc475..3c1d2cd6da6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -13,11 +13,11 @@ var MyClass1 = (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
     }
-    MyClass1 = __decorate([
-        foo, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-    ], MyClass1);
     return MyClass1;
-    var _a;
 }());
+MyClass1 = __decorate([
+    foo,
+    __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+], MyClass1);
 exports.MyClass1 = MyClass1;
+var _a;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index 41ab9194c4e..8b73fc550cf 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -13,12 +13,12 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
         }
-        MyClass1 = __decorate([
-            foo, 
-            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-        ], MyClass1);
         return MyClass1;
-        var _a;
     }());
+    MyClass1 = __decorate([
+        foo,
+        __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+    ], MyClass1);
     exports.MyClass1 = MyClass1;
+    var _a;
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index e8bd90fc475..3c1d2cd6da6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -13,11 +13,11 @@ var MyClass1 = (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
     }
-    MyClass1 = __decorate([
-        foo, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-    ], MyClass1);
     return MyClass1;
-    var _a;
 }());
+MyClass1 = __decorate([
+    foo,
+    __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+], MyClass1);
 exports.MyClass1 = MyClass1;
+var _a;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index 41ab9194c4e..8b73fc550cf 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -13,12 +13,12 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
         }
-        MyClass1 = __decorate([
-            foo, 
-            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-        ], MyClass1);
         return MyClass1;
-        var _a;
     }());
+    MyClass1 = __decorate([
+        foo,
+        __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+    ], MyClass1);
     exports.MyClass1 = MyClass1;
+    var _a;
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index e8bd90fc475..3c1d2cd6da6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -13,11 +13,11 @@ var MyClass1 = (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
     }
-    MyClass1 = __decorate([
-        foo, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-    ], MyClass1);
     return MyClass1;
-    var _a;
 }());
+MyClass1 = __decorate([
+    foo,
+    __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+], MyClass1);
 exports.MyClass1 = MyClass1;
+var _a;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index 41ab9194c4e..8b73fc550cf 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -13,12 +13,12 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
         }
-        MyClass1 = __decorate([
-            foo, 
-            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-        ], MyClass1);
         return MyClass1;
-        var _a;
     }());
+    MyClass1 = __decorate([
+        foo,
+        __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+    ], MyClass1);
     exports.MyClass1 = MyClass1;
+    var _a;
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index e8bd90fc475..3c1d2cd6da6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -13,11 +13,11 @@ var MyClass1 = (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
     }
-    MyClass1 = __decorate([
-        foo, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-    ], MyClass1);
     return MyClass1;
-    var _a;
 }());
+MyClass1 = __decorate([
+    foo,
+    __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+], MyClass1);
 exports.MyClass1 = MyClass1;
+var _a;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 1928d5965fb..c0e40d9e56c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index b295037df93..5f6fc59aa0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 1928d5965fb..c0e40d9e56c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index b295037df93..5f6fc59aa0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 04c42ed11d0..06567a4fddd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b3feff79cab..0865ddc2903 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index babc80c4d26..d3c0e8697cd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 7813d8d45f1..8430db389ed 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 383cd93a9db..048c2816811 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index df92966a910..8e4c69b85ca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index 6c8ee2b7bf2..adc497fc60f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 74fc6200ba9..3c11f6387b3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index a1ba2747bea..f102ba902d9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index 7fe59ee242c..c84a8f5c835 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index df92966a910..8e4c69b85ca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 6c8ee2b7bf2..adc497fc60f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 383cd93a9db..048c2816811 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index a1ba2747bea..f102ba902d9 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 7fe59ee242c..c84a8f5c835 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 74fc6200ba9..3c11f6387b3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index bbd9ace39b6..51320616653 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 18e06e5bc50..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 2974abdc1cc..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 14643d2565d..5843f218e63 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -16,9 +16,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 5b0497285e2..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
-sourceRoot: 
-sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts
-===================================================================
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index 7a239e36dfd..cb20dafd0e6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 70ee8ff61e0..379e5b9d7b2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index ced269a7dca..2a7d88eea53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 1977336ea8e..99658249a09 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 7a239e36dfd..cb20dafd0e6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 70ee8ff61e0..379e5b9d7b2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index ced269a7dca..2a7d88eea53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 1977336ea8e..99658249a09 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index f8787f0f018..105ebefb06e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index f6e3eb542f4..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index f491a9ec373..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 40d72149fd9..18f4cc0381a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 1eef0eba6f2..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
-sourceRoot: 
-sources: ../m1.ts,../test.ts
-===================================================================
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 3875e8cb03a..9eb482b6438 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 70ee8ff61e0..379e5b9d7b2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index eda395c6137..764cd7db3b4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index 9b4031ad9ad..48a5bd9efa8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 3875e8cb03a..9eb482b6438 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 70ee8ff61e0..379e5b9d7b2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eda395c6137..764cd7db3b4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9b4031ad9ad..48a5bd9efa8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index f2d94cd0ab2..12c15dd7143 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 7ff280253f1..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index bfdacf69428..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 8787d932d29..49df7a3186b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 20f2ab47188..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
-sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
-===================================================================
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 8046b4e56e9..26b3342e168 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 3d767492427..2137f48e86b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 8046b4e56e9..26b3342e168 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 3d767492427..2137f48e86b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index ad91316934a..6e903b7c370 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b54fffed73f..2118f70902b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 946ba761aef..4767cb6f425 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index c5cc839430f..c9efc4d02d1 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 319f5bbb7d5..60700ad9d17 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 07fcee5d5c6..1c3270c1034 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index ed3a0f816aa..eb045bec338 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 261053c5b8a..4b491bfe9bb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index c6fe688528b..70285d9fdb4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 9bc78eedda3..3b815b52961 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 07fcee5d5c6..1c3270c1034 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index ed3a0f816aa..eb045bec338 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 319f5bbb7d5..60700ad9d17 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index c6fe688528b..70285d9fdb4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 9bc78eedda3..3b815b52961 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 261053c5b8a..4b491bfe9bb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 692f9bdb8e9..e5f2d235179 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index f359cef4be2..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index ca280b23052..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 2f6c92af199..3ef58f1b25c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index ce08ef2c878..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: ../../../mapFiles/test.js.map
-sourceRoot: 
-sources: ../projects/outputdir_module_multifolder/ref/m1.ts,../projects/outputdir_module_multifolder_ref/m2.ts,../projects/outputdir_module_multifolder/test.ts
-===================================================================
->>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 054150c2654..a623d2caaa6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index c82c9aa7814..579a6a187e3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index d2943328caf..3a1b7b27c58 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 5dec3e818a6..a9589e1fed8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 054150c2654..a623d2caaa6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index c82c9aa7814..579a6a187e3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d2943328caf..3a1b7b27c58 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 5dec3e818a6..a9589e1fed8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 3f784bfa553..5ac4a707e39 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 58e831a041d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 847236565f8..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index 2346dd23910..9cb1b89ebe2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 4c009331988..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: ../outputdir_module_simple/m1.ts,../outputdir_module_simple/test.ts
-===================================================================
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 5c31d767ece..943ae3c5b8e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index 2653e1320a0..478bae202d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index c0316079a93..9fea18a6b02 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index f057481c9b1..e96624acd65 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 5c31d767ece..943ae3c5b8e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 2653e1320a0..478bae202d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index c0316079a93..9fea18a6b02 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index f057481c9b1..e96624acd65 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b8840d8440c..4c60ddd29d4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 58e831a041d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index b8c7cced3ae..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index c688513f28f..a1ae6fc57cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index a57632c4e07..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: ../outputdir_module_subfolder/ref/m1.ts,../outputdir_module_subfolder/test.ts
-===================================================================
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 4a3d2534830..a1de0913da5 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 66453b1e9b4..861972de209 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 4a3d2534830..a1de0913da5 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 66453b1e9b4..861972de209 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 5c82f181545..64ad8eb1642 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b322a9dd0bb..0e5790298d1 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 41be9779546..63bc893832b 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 7cf551e7dc0..83c95ed2c07 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index abf7a2ecd19..7a409515607 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index fa40ecf4816..3343670eb84 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 3fe49d9c7af..57bb373e054 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 165dd78d6c9..2da721ff1a0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 40ad29ac6e6..c1f7e172c9d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
index 386c14e8731..474dd107529 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index fa40ecf4816..3343670eb84 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 3fe49d9c7af..57bb373e054 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index abf7a2ecd19..7a409515607 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 40ad29ac6e6..c1f7e172c9d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 386c14e8731..474dd107529 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 165dd78d6c9..2da721ff1a0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index e5b77da53eb..155baf7912b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 1c42486b782..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
index d6640cdb404..fc97eb8c912 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index e66e92ff5cf..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts,file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts,file:///tests/cases/projects/outputdir_module_multifolder/test.ts
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
index f794e0c5d09..e9f1d54cc87 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
index 9cf904bdb36..4c83678dafd 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
index 546a52762dc..e96a1a904e7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
index 2a6e8fef128..e0513a8b07b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index f794e0c5d09..e9f1d54cc87 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 9cf904bdb36..4c83678dafd 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 546a52762dc..e96a1a904e7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 2a6e8fef128..e0513a8b07b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 6aaa713e8f4..ecbd039578c 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index a7424e92122..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
index e96204c5faa..a2aac5c1574 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index ef808a08b3f..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_simple/m1.ts,file:///tests/cases/projects/outputdir_module_simple/test.ts
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index b21a6141b7c..94b0fd005cb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 527dcc9a33d..76cc81a74f4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index 00d7fafd83c..637153a8c7a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
index b8f2b007951..99312830f1c 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index b21a6141b7c..94b0fd005cb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 527dcc9a33d..76cc81a74f4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 00d7fafd83c..637153a8c7a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b8f2b007951..99312830f1c 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 130a41cfbba..d962fcf11cb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 44276925bda..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 10de4bede9e..a0d82365b29 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 16bcb98e00c..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts,file:///tests/cases/projects/outputdir_module_subfolder/test.ts
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 830a328e144..e68a248d5d7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 790459b963d..c6ff2cc27ce 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 830a328e144..e68a248d5d7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 790459b963d..c6ff2cc27ce 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 38ee6987e2c..35e555688e0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index facd1d09335..2d0fd86fc16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index d2eeb5074b5..19bcc3ee32a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index f3f77743f87..7b3f8edb8a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index aedc29a2978..a8c35bc15c6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 312d2f052cc..f1623c531a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 2330fbc104b..b199c0dc1ad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 0b0599e7f62..ef338fcc887 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index f53f427de90..10777c25bd4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index fc3dfdd8306..dbab2cdf457 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 312d2f052cc..f1623c531a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 2330fbc104b..b199c0dc1ad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index aedc29a2978..a8c35bc15c6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index f53f427de90..10777c25bd4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index fc3dfdd8306..dbab2cdf457 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 0b0599e7f62..ef338fcc887 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index f142c1edf9b..5a120cbe800 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index f84040526ba..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 98804be1c15..c65824ad4d1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -16,9 +16,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 909ae1c3750..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 7e292316432..26e7b01ccdb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index 3bb503f2c26..1b563cf259d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index 13298067344..46e8000caa0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 7e292316432..26e7b01ccdb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 3bb503f2c26..1b563cf259d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 13298067344..46e8000caa0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c324029a742..28d5511a5ee 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 3b75f2878c9..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 7b5ccb6c071..b44b23ab837 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index d9df59725a9..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 422fe41a79d..88ce97eeeff 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index bee1ea97f83..e28d378dfc0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index f851a615aef..c956b034f6f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 422fe41a79d..88ce97eeeff 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index bee1ea97f83..e28d378dfc0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index f851a615aef..c956b034f6f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index ade8b34024d..a46d68e9b05 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 4409af8d0a7..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 66a2c90e80f..733f90f84d9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 3a403373a8f..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
index ef27e5d6f40..4f6001ccc51 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
@@ -13,8 +13,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
index 11bd042a34c..7b0f7634a86 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
@@ -12,8 +12,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
index d37850e3f0b..8def3a29073 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
@@ -12,8 +12,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a62495f753a..fa8f5c4613e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 1dea57986d9..3d7c6263ee6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a62495f753a..fa8f5c4613e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 1dea57986d9..3d7c6263ee6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 5ff4ba61874..28783dfb983 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 11f204cc242..b5bfe6f35c7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 98d50582c81..1361d34702b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index a4bacca9ebe..9f13c07cc7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 8bf3ef49561..90860d39fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 0fc51f5e341..b9400dc5624 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index f0be560aaaf..c50aee154a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index ab5f17a63ea..11747238b4e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index cec71625f40..186a8fb3753 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index 4bdb1bfdb51..450cff64fa1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0fc51f5e341..b9400dc5624 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index f0be560aaaf..c50aee154a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 8bf3ef49561..90860d39fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index cec71625f40..186a8fb3753 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 4bdb1bfdb51..450cff64fa1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index ab5f17a63ea..11747238b4e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 4e1b085eb4c..c1afcd019cc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 027f9569ebc..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 279857bce8b..c1f5e250cf8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -16,9 +16,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index e129af6a045..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index 3d65f47e63a..3539fcb8d17 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index fb10b5b1de9..6355e109114 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 1ba37ab45d0..4347d2eb3ea 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 7611cfa9649..647c302260c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 3d65f47e63a..3539fcb8d17 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index fb10b5b1de9..6355e109114 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 1ba37ab45d0..4347d2eb3ea 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 7611cfa9649..647c302260c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c94ffed292f..13c43235b2b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 487d57bd2ae..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index eed9ed1ea34..f12c5aff508 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 0a161bb4886..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 9a60e0b6f5d..d39589e4f3e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 5a25b5d4656..63351122f3e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index a40c4244c47..4cd2a39d1c1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index fd5f31062e0..993894958b0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 9a60e0b6f5d..d39589e4f3e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 5a25b5d4656..63351122f3e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index a40c4244c47..4cd2a39d1c1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index fd5f31062e0..993894958b0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 3910a6170d3..8dca8ba1a6c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 622f2c91c95..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 048d4296ae5..d52fb087d34 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 5d837611e49..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: ref/m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 06b2a8b3dfc..5685e41f2bb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 43700cb4537..ea96dcd448f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 06b2a8b3dfc..5685e41f2bb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 43700cb4537..ea96dcd448f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 5005743418e..f9f1f0cd10e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index f406d61a6f1..2e303ee1885 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 0cefe1f1642..19977a8159b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 6bd9a36c15d..8fa001f03aa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index d14f89c2c6e..0f5e1f6de5c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 0a78c398416..453bd036286 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index bb03821c385..019c9ca53da 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index e173a64c64d..d32dfbe0fa3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index daef8ad6d4e..a923e39f3eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 530c3cb016c..faf9a0a8d50 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0a78c398416..453bd036286 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index bb03821c385..019c9ca53da 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index d14f89c2c6e..0f5e1f6de5c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index daef8ad6d4e..a923e39f3eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 530c3cb016c..faf9a0a8d50 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index e173a64c64d..d32dfbe0fa3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 38fef635f82..bb8c756a0b9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index a3ab2ebecdb..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 328a26d1086..7b1cda2a19b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 7ef7adace73..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index c8f4d72f22f..05d9f8cb3da 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index a87178e07e2..e446b64679d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 87446d16463..cca0e50d762 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index f8ad3c6a445..46798ce7bb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index c8f4d72f22f..05d9f8cb3da 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a87178e07e2..e446b64679d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 87446d16463..cca0e50d762 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index f8ad3c6a445..46798ce7bb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a8a3b1c51da..d70e1816041 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index f55a72e7977..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index d16c4a53d9c..32b2fa4d7dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 2910ad61478..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 934216cc931..43194290d9d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index a87178e07e2..e446b64679d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index d7788bd6bb9..cd7b5d10db4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index f5191f2dd02..b77575bb8b5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 934216cc931..43194290d9d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a87178e07e2..e446b64679d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index d7788bd6bb9..cd7b5d10db4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index f5191f2dd02..b77575bb8b5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 209b545b609..3c2cbaf1342 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index f803a29f3bf..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index f1ef0403d6e..03ecf07f373 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index b05ffee34ca..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: ref/m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 37d956756ce..b7c7a763318 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
index 107c53778e2..57aea3578c6 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 01d0cee6543..af5f11f8dd3 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index ac0b3d2dc48..3d8629098dc 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 04c42ed11d0..06567a4fddd 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b3feff79cab..0865ddc2903 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index babc80c4d26..d3c0e8697cd 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 7813d8d45f1..8430db389ed 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 37d956756ce..b7c7a763318 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 7613820ab99..41a7fb93ee6 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
index 02d734d6a23..dc6ab342a51 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
index 107c53778e2..57aea3578c6 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
index d3e8930bf4e..6af45080bd6 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
index 63de9801efe..c51718c91d8 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 2655f2c655e..a77c789e625 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 05f63e35111..5890568ea24 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 8bc0b5d0e4c..502b9145dc8 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 4a4c8a4ab2e..1bc2118f2b7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index efe375c82cc..48cc4f7aa98 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 213e3024d61..476d3d93966 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index bbd9ace39b6..51320616653 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 2974abdc1cc..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
index 7ba960c4bef..0b341bae56d 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 70054e8f1c6..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: ../ref/m1.ts,../../outputdir_module_multifolder_ref/m2.ts,../test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
index 7613820ab99..41a7fb93ee6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
index 1e9d1cc6ddf..0deeb01864d 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
index d3e8930bf4e..6af45080bd6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
index 0af52e5facd..40fdb33821b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index c93393fadd7..761471d9d82 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 3ee95c75c95..d3fedc589bf 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d9691d43fc2..2923aa0a014 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 814caa426d9..8cd970cb557 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index f8787f0f018..105ebefb06e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index f491a9ec373..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
index c9889aff69b..afd9e2385c0 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -13,9 +13,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 056b7a1c7f2..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: ../m1.ts,../test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7613820ab99..41a7fb93ee6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
index 1e9d1cc6ddf..0deeb01864d 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
index d3e8930bf4e..6af45080bd6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
index bbd1ffd7b98..92ae347312c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index df92966a910..8e4c69b85ca 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 3ee95c75c95..d3fedc589bf 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index a1ba2747bea..f102ba902d9 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 1ea6b49a9b9..be65d1d02a5 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index f2d94cd0ab2..12c15dd7143 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index bfdacf69428..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
index da85c1bf06c..4dabc0fcefa 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -13,9 +13,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 282a64dbc6f..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: ../ref/m1.ts,../test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 830a328e144..e68a248d5d7 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 790459b963d..c6ff2cc27ce 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 830a328e144..e68a248d5d7 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 790459b963d..c6ff2cc27ce 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 38ee6987e2c..35e555688e0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index facd1d09335..2d0fd86fc16 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index d2eeb5074b5..19bcc3ee32a 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
index c3a64f5b6eb..984a65ed100 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.d.ts
@@ -4,14 +4,6 @@ declare class m1_c1 {
 }
 declare var m1_instance1: m1_c1;
 declare function m1_f1(): m1_c1;
-declare module "ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
 declare var a1: number;
 declare class c1 {
     p1: number;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index f3f77743f87..7b3f8edb8a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index aedc29a2978..a8c35bc15c6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 312d2f052cc..f1623c531a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 2330fbc104b..b199c0dc1ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 0b0599e7f62..ef338fcc887 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index f53f427de90..10777c25bd4 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index fc3dfdd8306..dbab2cdf457 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 312d2f052cc..f1623c531a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 2330fbc104b..b199c0dc1ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index aedc29a2978..a8c35bc15c6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index f53f427de90..10777c25bd4 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index fc3dfdd8306..dbab2cdf457 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 0b0599e7f62..ef338fcc887 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index f142c1edf9b..5a120cbe800 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index b66a73a7c90..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-declare module "outputdir_module_multifolder/ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "outputdir_module_multifolder_ref/m2" {
-    export var m2_a1: number;
-    export class m2_c1 {
-        m2_c1_p1: number;
-    }
-    export var m2_instance1: m2_c1;
-    export function m2_f1(): m2_c1;
-}
-declare module "outputdir_module_multifolder/test" {
-    import m1 = require("outputdir_module_multifolder/ref/m1");
-    import m2 = require("outputdir_module_multifolder_ref/m2");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-    export var a3: typeof m2.m2_c1;
-}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index f84040526ba..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 4b7656e044e..d56b17556fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -15,9 +15,5 @@
         "../outputdir_module_multifolder_ref/m2.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 95f7d3cee8f..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: outputdir_module_multifolder/ref/m1.ts,outputdir_module_multifolder_ref/m2.ts,outputdir_module_multifolder/test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 7e292316432..26e7b01ccdb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index ac92d511dce..3040116f9df 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -12,21 +12,24 @@ sourceFile:m1.ts
 >>>    "use strict";
 >>>    exports.m1_a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^^^^
+4 >                 ^^^
+5 >                    ^^
+6 >                      ^
+7 >                       ^^^^^^^^->
 1 >export var 
-2 >    m1_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
+2 >    
+3 >            m1_a1
+4 >                  = 
+5 >                    10
+6 >                      ;
 1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
+2 >Emitted(3, 13) Source(1, 12) + SourceIndex(0)
+3 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
+4 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
+5 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
+6 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
 ---
 >>>    var m1_c1 = (function () {
 1->^^^^
@@ -79,45 +82,42 @@ sourceFile:m1.ts
 ---
 >>>    exports.m1_c1 = m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^->
 1->
-2 >    m1_c1
-3 >                  {
-  >                     public m1_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(9, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
+2 >    export class m1_c1 {
+  >        public m1_c1_p1: number;
+  >    }
+1->Emitted(9, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_instance1 = new m1_c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^^^^
+4 >                        ^^^
+5 >                           ^^^^
+6 >                               ^^^^^
+7 >                                    ^^
+8 >                                      ^
 1->
   >
   >export var 
-2 >    m1_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m1_c1
-6 >                                    ()
-7 >                                      ;
+2 >    
+3 >            m1_instance1
+4 >                         = 
+5 >                           new 
+6 >                               m1_c1
+7 >                                    ()
+8 >                                      ;
 1->Emitted(10, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
+2 >Emitted(10, 13) Source(6, 12) + SourceIndex(0)
+3 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
+4 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
+5 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
+6 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
+7 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
+8 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
 ---
 >>>    function m1_f1() {
 1 >^^^^
@@ -156,19 +156,13 @@ sourceFile:m1.ts
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    m1_f1
-3 >                 () {
-  >                     return m1_instance1;
-  >                 }
-4 >                         
-1->Emitted(14, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
+2 >    export function m1_f1() {
+  >        return m1_instance1;
+  >    }
+1->Emitted(14, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=m1.js.map===================================================================
@@ -185,22 +179,25 @@ sourceFile:test.ts
 >>>    "use strict";
 >>>    exports.a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^^^^->
 1 >import m1 = require("m1");
   >export var 
-2 >    a1
-3 >               = 
-4 >                 10
-5 >                   ;
+2 >    
+3 >            a1
+4 >               = 
+5 >                 10
+6 >                   ;
 1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0)
+2 >Emitted(3, 13) Source(2, 12) + SourceIndex(0)
+3 >Emitted(3, 15) Source(2, 14) + SourceIndex(0)
+4 >Emitted(3, 18) Source(2, 17) + SourceIndex(0)
+5 >Emitted(3, 20) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 21) Source(2, 20) + SourceIndex(0)
 ---
 >>>    var c1 = (function () {
 1->^^^^
@@ -253,45 +250,42 @@ sourceFile:test.ts
 ---
 >>>    exports.c1 = c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^^^^^->
 1->
-2 >    c1
-3 >               {
-  >                  public p1: number;
-  >              }
-4 >                   
-1->Emitted(9, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0)
+2 >    export class c1 {
+  >        public p1: number;
+  >    }
+1->Emitted(9, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(9, 21) Source(5, 2) + SourceIndex(0)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
-4 >                        ^^^^
-5 >                            ^^
-6 >                              ^^
-7 >                                ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^
+6 >                            ^^
+7 >                              ^^
+8 >                                ^
 1->
   >
   >export var 
-2 >    instance1
-3 >                      = 
-4 >                        new 
-5 >                            c1
-6 >                              ()
-7 >                                ;
+2 >    
+3 >            instance1
+4 >                      = 
+5 >                        new 
+6 >                            c1
+7 >                              ()
+8 >                                ;
 1->Emitted(10, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0)
+2 >Emitted(10, 13) Source(7, 12) + SourceIndex(0)
+3 >Emitted(10, 22) Source(7, 21) + SourceIndex(0)
+4 >Emitted(10, 25) Source(7, 24) + SourceIndex(0)
+5 >Emitted(10, 29) Source(7, 28) + SourceIndex(0)
+6 >Emitted(10, 31) Source(7, 30) + SourceIndex(0)
+7 >Emitted(10, 33) Source(7, 32) + SourceIndex(0)
+8 >Emitted(10, 34) Source(7, 33) + SourceIndex(0)
 ---
 >>>    function f1() {
 1 >^^^^
@@ -330,45 +324,42 @@ sourceFile:test.ts
 ---
 >>>    exports.f1 = f1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^->
 1->
-2 >    f1
-3 >              () {
-  >                  return instance1;
-  >              }
-4 >                   
-1->Emitted(14, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0)
+2 >    export function f1() {
+  >        return instance1;
+  >    }
+1->Emitted(14, 5) Source(8, 1) + SourceIndex(0)
+2 >Emitted(14, 21) Source(10, 2) + SourceIndex(0)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^
-7 >                         ^
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^
+8 >                         ^
 1->
   >
   >export var 
-2 >    a2
-3 >               = 
-4 >                 m1
-5 >                   .
-6 >                    m1_c1
-7 >                         ;
+2 >    
+3 >            a2
+4 >               = 
+5 >                 m1
+6 >                   .
+7 >                    m1_c1
+8 >                         ;
 1->Emitted(15, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0)
+2 >Emitted(15, 13) Source(12, 12) + SourceIndex(0)
+3 >Emitted(15, 15) Source(12, 14) + SourceIndex(0)
+4 >Emitted(15, 18) Source(12, 17) + SourceIndex(0)
+5 >Emitted(15, 20) Source(12, 19) + SourceIndex(0)
+6 >Emitted(15, 21) Source(12, 20) + SourceIndex(0)
+7 >Emitted(15, 26) Source(12, 25) + SourceIndex(0)
+8 >Emitted(15, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index 3bb503f2c26..1b563cf259d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index 6ab1c1d6310..43f0e8169c0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -11,21 +11,24 @@ sourceFile:m1.ts
 >>>"use strict";
 >>>exports.m1_a1 = 10;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^^^^
+4 >             ^^^
+5 >                ^^
+6 >                  ^
+7 >                   ^^^^^^^^->
 1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
+2 >
+3 >        m1_a1
+4 >              = 
+5 >                10
+6 >                  ;
 1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0)
+2 >Emitted(2, 9) Source(1, 12) + SourceIndex(0)
+3 >Emitted(2, 14) Source(1, 17) + SourceIndex(0)
+4 >Emitted(2, 17) Source(1, 20) + SourceIndex(0)
+5 >Emitted(2, 19) Source(1, 22) + SourceIndex(0)
+6 >Emitted(2, 20) Source(1, 23) + SourceIndex(0)
 ---
 >>>var m1_c1 = (function () {
 1->
@@ -78,45 +81,42 @@ sourceFile:m1.ts
 ---
 >>>exports.m1_c1 = m1_c1;
 1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^^^^^^^^->
 1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(8, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0)
+2 >export class m1_c1 {
+  >    public m1_c1_p1: number;
+  >}
+1->Emitted(8, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(8, 23) Source(4, 2) + SourceIndex(0)
 ---
 >>>exports.m1_instance1 = new m1_c1();
 1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
+2 >^^^^^^^^
+3 >        ^^^^^^^^^^^^
+4 >                    ^^^
+5 >                       ^^^^
+6 >                           ^^^^^
+7 >                                ^^
+8 >                                  ^
 1->
   >
   >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
+2 >
+3 >        m1_instance1
+4 >                     = 
+5 >                       new 
+6 >                           m1_c1
+7 >                                ()
+8 >                                  ;
 1->Emitted(9, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0)
+2 >Emitted(9, 9) Source(6, 12) + SourceIndex(0)
+3 >Emitted(9, 21) Source(6, 24) + SourceIndex(0)
+4 >Emitted(9, 24) Source(6, 27) + SourceIndex(0)
+5 >Emitted(9, 28) Source(6, 31) + SourceIndex(0)
+6 >Emitted(9, 33) Source(6, 36) + SourceIndex(0)
+7 >Emitted(9, 35) Source(6, 38) + SourceIndex(0)
+8 >Emitted(9, 36) Source(6, 39) + SourceIndex(0)
 ---
 >>>function m1_f1() {
 1 >
@@ -155,20 +155,14 @@ sourceFile:m1.ts
 ---
 >>>exports.m1_f1 = m1_f1;
 1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^->
 1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(13, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0)
+2 >export function m1_f1() {
+  >    return m1_instance1;
+  >}
+1->Emitted(13, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(13, 23) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
@@ -183,45 +177,33 @@ sourceFile:test.ts
 >>>"use strict";
 >>>var m1 = require("m1");
 1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
+2 >^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
+2 >import m1 = require("m1");
 1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0)
+2 >Emitted(2, 24) Source(1, 27) + SourceIndex(0)
 ---
 >>>exports.a1 = 10;
 1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^
+4 >          ^^^
+5 >             ^^
+6 >               ^
+7 >                ^^^^^^^^->
 1 >
   >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
+2 >
+3 >        a1
+4 >           = 
+5 >             10
+6 >               ;
 1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0)
+2 >Emitted(3, 9) Source(2, 12) + SourceIndex(0)
+3 >Emitted(3, 11) Source(2, 14) + SourceIndex(0)
+4 >Emitted(3, 14) Source(2, 17) + SourceIndex(0)
+5 >Emitted(3, 16) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 17) Source(2, 20) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
@@ -274,45 +256,42 @@ sourceFile:test.ts
 ---
 >>>exports.c1 = c1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^->
 1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0)
+2 >export class c1 {
+  >    public p1: number;
+  >}
+1->Emitted(9, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(9, 17) Source(5, 2) + SourceIndex(0)
 ---
 >>>exports.instance1 = new c1();
 1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
+2 >^^^^^^^^
+3 >        ^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^
+6 >                        ^^
+7 >                          ^^
+8 >                            ^
 1->
   >
   >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
+2 >
+3 >        instance1
+4 >                  = 
+5 >                    new 
+6 >                        c1
+7 >                          ()
+8 >                            ;
 1->Emitted(10, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0)
+2 >Emitted(10, 9) Source(7, 12) + SourceIndex(0)
+3 >Emitted(10, 18) Source(7, 21) + SourceIndex(0)
+4 >Emitted(10, 21) Source(7, 24) + SourceIndex(0)
+5 >Emitted(10, 25) Source(7, 28) + SourceIndex(0)
+6 >Emitted(10, 27) Source(7, 30) + SourceIndex(0)
+7 >Emitted(10, 29) Source(7, 32) + SourceIndex(0)
+8 >Emitted(10, 30) Source(7, 33) + SourceIndex(0)
 ---
 >>>function f1() {
 1 >
@@ -351,45 +330,42 @@ sourceFile:test.ts
 ---
 >>>exports.f1 = f1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
+2 >^^^^^^^^^^^^^^^^
+3 >                ^^^^^^^->
 1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0)
+2 >export function f1() {
+  >    return instance1;
+  >}
+1->Emitted(14, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(14, 17) Source(10, 2) + SourceIndex(0)
 ---
 >>>exports.a2 = m1.m1_c1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^
+4 >          ^^^
+5 >             ^^
+6 >               ^
+7 >                ^^^^^
+8 >                     ^
+9 >                      ^^^^^^^^^->
 1->
   >
   >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
+2 >
+3 >        a2
+4 >           = 
+5 >             m1
+6 >               .
+7 >                m1_c1
+8 >                     ;
 1->Emitted(15, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0)
+2 >Emitted(15, 9) Source(12, 12) + SourceIndex(0)
+3 >Emitted(15, 11) Source(12, 14) + SourceIndex(0)
+4 >Emitted(15, 14) Source(12, 17) + SourceIndex(0)
+5 >Emitted(15, 16) Source(12, 19) + SourceIndex(0)
+6 >Emitted(15, 17) Source(12, 20) + SourceIndex(0)
+7 >Emitted(15, 22) Source(12, 25) + SourceIndex(0)
+8 >Emitted(15, 23) Source(12, 26) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index 13298067344..46e8000caa0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 7e292316432..26e7b01ccdb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index c29900cfdc9..73d7191bc56 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -12,21 +12,24 @@ sourceFile:m1.ts
 >>>    "use strict";
 >>>    exports.m1_a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^^^^
+4 >                 ^^^
+5 >                    ^^
+6 >                      ^
+7 >                       ^^^^^^^^->
 1 >export var 
-2 >    m1_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
+2 >    
+3 >            m1_a1
+4 >                  = 
+5 >                    10
+6 >                      ;
 1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
+2 >Emitted(3, 13) Source(1, 12) + SourceIndex(0)
+3 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
+4 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
+5 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
+6 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
 ---
 >>>    var m1_c1 = (function () {
 1->^^^^
@@ -79,45 +82,42 @@ sourceFile:m1.ts
 ---
 >>>    exports.m1_c1 = m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^->
 1->
-2 >    m1_c1
-3 >                  {
-  >                     public m1_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(9, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
+2 >    export class m1_c1 {
+  >        public m1_c1_p1: number;
+  >    }
+1->Emitted(9, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_instance1 = new m1_c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^^^^
+4 >                        ^^^
+5 >                           ^^^^
+6 >                               ^^^^^
+7 >                                    ^^
+8 >                                      ^
 1->
   >
   >export var 
-2 >    m1_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m1_c1
-6 >                                    ()
-7 >                                      ;
+2 >    
+3 >            m1_instance1
+4 >                         = 
+5 >                           new 
+6 >                               m1_c1
+7 >                                    ()
+8 >                                      ;
 1->Emitted(10, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
+2 >Emitted(10, 13) Source(6, 12) + SourceIndex(0)
+3 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
+4 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
+5 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
+6 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
+7 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
+8 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
 ---
 >>>    function m1_f1() {
 1 >^^^^
@@ -156,19 +156,13 @@ sourceFile:m1.ts
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    m1_f1
-3 >                 () {
-  >                     return m1_instance1;
-  >                 }
-4 >                         
-1->Emitted(14, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
+2 >    export function m1_f1() {
+  >        return m1_instance1;
+  >    }
+1->Emitted(14, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=m1.js.map===================================================================
@@ -185,22 +179,25 @@ sourceFile:test.ts
 >>>    "use strict";
 >>>    exports.a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^^^^->
 1 >import m1 = require("m1");
   >export var 
-2 >    a1
-3 >               = 
-4 >                 10
-5 >                   ;
+2 >    
+3 >            a1
+4 >               = 
+5 >                 10
+6 >                   ;
 1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0)
+2 >Emitted(3, 13) Source(2, 12) + SourceIndex(0)
+3 >Emitted(3, 15) Source(2, 14) + SourceIndex(0)
+4 >Emitted(3, 18) Source(2, 17) + SourceIndex(0)
+5 >Emitted(3, 20) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 21) Source(2, 20) + SourceIndex(0)
 ---
 >>>    var c1 = (function () {
 1->^^^^
@@ -253,45 +250,42 @@ sourceFile:test.ts
 ---
 >>>    exports.c1 = c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^^^^^->
 1->
-2 >    c1
-3 >               {
-  >                  public p1: number;
-  >              }
-4 >                   
-1->Emitted(9, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0)
+2 >    export class c1 {
+  >        public p1: number;
+  >    }
+1->Emitted(9, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(9, 21) Source(5, 2) + SourceIndex(0)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
-4 >                        ^^^^
-5 >                            ^^
-6 >                              ^^
-7 >                                ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^
+6 >                            ^^
+7 >                              ^^
+8 >                                ^
 1->
   >
   >export var 
-2 >    instance1
-3 >                      = 
-4 >                        new 
-5 >                            c1
-6 >                              ()
-7 >                                ;
+2 >    
+3 >            instance1
+4 >                      = 
+5 >                        new 
+6 >                            c1
+7 >                              ()
+8 >                                ;
 1->Emitted(10, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0)
+2 >Emitted(10, 13) Source(7, 12) + SourceIndex(0)
+3 >Emitted(10, 22) Source(7, 21) + SourceIndex(0)
+4 >Emitted(10, 25) Source(7, 24) + SourceIndex(0)
+5 >Emitted(10, 29) Source(7, 28) + SourceIndex(0)
+6 >Emitted(10, 31) Source(7, 30) + SourceIndex(0)
+7 >Emitted(10, 33) Source(7, 32) + SourceIndex(0)
+8 >Emitted(10, 34) Source(7, 33) + SourceIndex(0)
 ---
 >>>    function f1() {
 1 >^^^^
@@ -330,45 +324,42 @@ sourceFile:test.ts
 ---
 >>>    exports.f1 = f1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^->
 1->
-2 >    f1
-3 >              () {
-  >                  return instance1;
-  >              }
-4 >                   
-1->Emitted(14, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0)
+2 >    export function f1() {
+  >        return instance1;
+  >    }
+1->Emitted(14, 5) Source(8, 1) + SourceIndex(0)
+2 >Emitted(14, 21) Source(10, 2) + SourceIndex(0)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^
-7 >                         ^
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^
+8 >                         ^
 1->
   >
   >export var 
-2 >    a2
-3 >               = 
-4 >                 m1
-5 >                   .
-6 >                    m1_c1
-7 >                         ;
+2 >    
+3 >            a2
+4 >               = 
+5 >                 m1
+6 >                   .
+7 >                    m1_c1
+8 >                         ;
 1->Emitted(15, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0)
+2 >Emitted(15, 13) Source(12, 12) + SourceIndex(0)
+3 >Emitted(15, 15) Source(12, 14) + SourceIndex(0)
+4 >Emitted(15, 18) Source(12, 17) + SourceIndex(0)
+5 >Emitted(15, 20) Source(12, 19) + SourceIndex(0)
+6 >Emitted(15, 21) Source(12, 20) + SourceIndex(0)
+7 >Emitted(15, 26) Source(12, 25) + SourceIndex(0)
+8 >Emitted(15, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 3bb503f2c26..1b563cf259d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 13298067344..46e8000caa0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AACf,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index f4c1f40d95b..fa1fcffc859 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -11,21 +11,24 @@ sourceFile:m1.ts
 >>>"use strict";
 >>>exports.m1_a1 = 10;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^^^^
+4 >             ^^^
+5 >                ^^
+6 >                  ^
+7 >                   ^^^^^^^^->
 1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
+2 >
+3 >        m1_a1
+4 >              = 
+5 >                10
+6 >                  ;
 1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0)
+2 >Emitted(2, 9) Source(1, 12) + SourceIndex(0)
+3 >Emitted(2, 14) Source(1, 17) + SourceIndex(0)
+4 >Emitted(2, 17) Source(1, 20) + SourceIndex(0)
+5 >Emitted(2, 19) Source(1, 22) + SourceIndex(0)
+6 >Emitted(2, 20) Source(1, 23) + SourceIndex(0)
 ---
 >>>var m1_c1 = (function () {
 1->
@@ -78,45 +81,42 @@ sourceFile:m1.ts
 ---
 >>>exports.m1_c1 = m1_c1;
 1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^^^^^^^^->
 1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(8, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0)
+2 >export class m1_c1 {
+  >    public m1_c1_p1: number;
+  >}
+1->Emitted(8, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(8, 23) Source(4, 2) + SourceIndex(0)
 ---
 >>>exports.m1_instance1 = new m1_c1();
 1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
+2 >^^^^^^^^
+3 >        ^^^^^^^^^^^^
+4 >                    ^^^
+5 >                       ^^^^
+6 >                           ^^^^^
+7 >                                ^^
+8 >                                  ^
 1->
   >
   >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
+2 >
+3 >        m1_instance1
+4 >                     = 
+5 >                       new 
+6 >                           m1_c1
+7 >                                ()
+8 >                                  ;
 1->Emitted(9, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0)
+2 >Emitted(9, 9) Source(6, 12) + SourceIndex(0)
+3 >Emitted(9, 21) Source(6, 24) + SourceIndex(0)
+4 >Emitted(9, 24) Source(6, 27) + SourceIndex(0)
+5 >Emitted(9, 28) Source(6, 31) + SourceIndex(0)
+6 >Emitted(9, 33) Source(6, 36) + SourceIndex(0)
+7 >Emitted(9, 35) Source(6, 38) + SourceIndex(0)
+8 >Emitted(9, 36) Source(6, 39) + SourceIndex(0)
 ---
 >>>function m1_f1() {
 1 >
@@ -155,20 +155,14 @@ sourceFile:m1.ts
 ---
 >>>exports.m1_f1 = m1_f1;
 1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^->
 1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(13, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0)
+2 >export function m1_f1() {
+  >    return m1_instance1;
+  >}
+1->Emitted(13, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(13, 23) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
@@ -183,45 +177,33 @@ sourceFile:test.ts
 >>>"use strict";
 >>>var m1 = require("m1");
 1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^
-6 >                     ^
-7 >                      ^
+2 >^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "m1"
-6 >                     )
-7 >                      ;
+2 >import m1 = require("m1");
 1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(2, 22) Source(1, 25) + SourceIndex(0)
-6 >Emitted(2, 23) Source(1, 26) + SourceIndex(0)
-7 >Emitted(2, 24) Source(1, 27) + SourceIndex(0)
+2 >Emitted(2, 24) Source(1, 27) + SourceIndex(0)
 ---
 >>>exports.a1 = 10;
 1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^
+4 >          ^^^
+5 >             ^^
+6 >               ^
+7 >                ^^^^^^^^->
 1 >
   >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
+2 >
+3 >        a1
+4 >           = 
+5 >             10
+6 >               ;
 1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0)
+2 >Emitted(3, 9) Source(2, 12) + SourceIndex(0)
+3 >Emitted(3, 11) Source(2, 14) + SourceIndex(0)
+4 >Emitted(3, 14) Source(2, 17) + SourceIndex(0)
+5 >Emitted(3, 16) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 17) Source(2, 20) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
@@ -274,45 +256,42 @@ sourceFile:test.ts
 ---
 >>>exports.c1 = c1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^->
 1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0)
+2 >export class c1 {
+  >    public p1: number;
+  >}
+1->Emitted(9, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(9, 17) Source(5, 2) + SourceIndex(0)
 ---
 >>>exports.instance1 = new c1();
 1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
+2 >^^^^^^^^
+3 >        ^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^
+6 >                        ^^
+7 >                          ^^
+8 >                            ^
 1->
   >
   >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
+2 >
+3 >        instance1
+4 >                  = 
+5 >                    new 
+6 >                        c1
+7 >                          ()
+8 >                            ;
 1->Emitted(10, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0)
+2 >Emitted(10, 9) Source(7, 12) + SourceIndex(0)
+3 >Emitted(10, 18) Source(7, 21) + SourceIndex(0)
+4 >Emitted(10, 21) Source(7, 24) + SourceIndex(0)
+5 >Emitted(10, 25) Source(7, 28) + SourceIndex(0)
+6 >Emitted(10, 27) Source(7, 30) + SourceIndex(0)
+7 >Emitted(10, 29) Source(7, 32) + SourceIndex(0)
+8 >Emitted(10, 30) Source(7, 33) + SourceIndex(0)
 ---
 >>>function f1() {
 1 >
@@ -351,45 +330,42 @@ sourceFile:test.ts
 ---
 >>>exports.f1 = f1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
+2 >^^^^^^^^^^^^^^^^
+3 >                ^^^^^^^->
 1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0)
+2 >export function f1() {
+  >    return instance1;
+  >}
+1->Emitted(14, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(14, 17) Source(10, 2) + SourceIndex(0)
 ---
 >>>exports.a2 = m1.m1_c1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^
+4 >          ^^^
+5 >             ^^
+6 >               ^
+7 >                ^^^^^
+8 >                     ^
+9 >                      ^^^^^^^^^->
 1->
   >
   >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
+2 >
+3 >        a2
+4 >           = 
+5 >             m1
+6 >               .
+7 >                m1_c1
+8 >                     ;
 1->Emitted(15, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0)
+2 >Emitted(15, 9) Source(12, 12) + SourceIndex(0)
+3 >Emitted(15, 11) Source(12, 14) + SourceIndex(0)
+4 >Emitted(15, 14) Source(12, 17) + SourceIndex(0)
+5 >Emitted(15, 16) Source(12, 19) + SourceIndex(0)
+6 >Emitted(15, 17) Source(12, 20) + SourceIndex(0)
+7 >Emitted(15, 22) Source(12, 25) + SourceIndex(0)
+8 >Emitted(15, 23) Source(12, 26) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c324029a742..28d5511a5ee 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index adb1e2c76b3..9a706f5a2b8 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -12,21 +12,24 @@ sourceFile:m1.ts
 >>>    "use strict";
 >>>    exports.m1_a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^^^^
+4 >                 ^^^
+5 >                    ^^
+6 >                      ^
+7 >                       ^^^^^^^^->
 1 >export var 
-2 >    m1_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
+2 >    
+3 >            m1_a1
+4 >                  = 
+5 >                    10
+6 >                      ;
 1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
+2 >Emitted(3, 13) Source(1, 12) + SourceIndex(0)
+3 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
+4 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
+5 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
+6 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
 ---
 >>>    var m1_c1 = (function () {
 1->^^^^
@@ -79,45 +82,42 @@ sourceFile:m1.ts
 ---
 >>>    exports.m1_c1 = m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^->
 1->
-2 >    m1_c1
-3 >                  {
-  >                     public m1_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(9, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
+2 >    export class m1_c1 {
+  >        public m1_c1_p1: number;
+  >    }
+1->Emitted(9, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_instance1 = new m1_c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^^^^
+4 >                        ^^^
+5 >                           ^^^^
+6 >                               ^^^^^
+7 >                                    ^^
+8 >                                      ^
 1->
   >
   >export var 
-2 >    m1_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m1_c1
-6 >                                    ()
-7 >                                      ;
+2 >    
+3 >            m1_instance1
+4 >                         = 
+5 >                           new 
+6 >                               m1_c1
+7 >                                    ()
+8 >                                      ;
 1->Emitted(10, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
+2 >Emitted(10, 13) Source(6, 12) + SourceIndex(0)
+3 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
+4 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
+5 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
+6 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
+7 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
+8 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
 ---
 >>>    function m1_f1() {
 1 >^^^^
@@ -156,19 +156,13 @@ sourceFile:m1.ts
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    m1_f1
-3 >                 () {
-  >                     return m1_instance1;
-  >                 }
-4 >                         
-1->Emitted(14, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
+2 >    export function m1_f1() {
+  >        return m1_instance1;
+  >    }
+1->Emitted(14, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -179,22 +173,25 @@ sourceFile:test.ts
 >>>    "use strict";
 >>>    exports.a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^^^^->
 1 >import m1 = require("m1");
   >export var 
-2 >    a1
-3 >               = 
-4 >                 10
-5 >                   ;
+2 >    
+3 >            a1
+4 >               = 
+5 >                 10
+6 >                   ;
 1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1)
-2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1)
-3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1)
-4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1)
-5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1)
+2 >Emitted(18, 13) Source(2, 12) + SourceIndex(1)
+3 >Emitted(18, 15) Source(2, 14) + SourceIndex(1)
+4 >Emitted(18, 18) Source(2, 17) + SourceIndex(1)
+5 >Emitted(18, 20) Source(2, 19) + SourceIndex(1)
+6 >Emitted(18, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
@@ -247,45 +244,42 @@ sourceFile:test.ts
 ---
 >>>    exports.c1 = c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^^^^^->
 1->
-2 >    c1
-3 >               {
-  >                  public p1: number;
-  >              }
-4 >                   
-1->Emitted(24, 5) Source(3, 14) + SourceIndex(1)
-2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1)
-3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1)
-4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1)
+2 >    export class c1 {
+  >        public p1: number;
+  >    }
+1->Emitted(24, 5) Source(3, 1) + SourceIndex(1)
+2 >Emitted(24, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
-4 >                        ^^^^
-5 >                            ^^
-6 >                              ^^
-7 >                                ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^
+6 >                            ^^
+7 >                              ^^
+8 >                                ^
 1->
   >
   >export var 
-2 >    instance1
-3 >                      = 
-4 >                        new 
-5 >                            c1
-6 >                              ()
-7 >                                ;
+2 >    
+3 >            instance1
+4 >                      = 
+5 >                        new 
+6 >                            c1
+7 >                              ()
+8 >                                ;
 1->Emitted(25, 5) Source(7, 12) + SourceIndex(1)
-2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1)
-3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1)
-4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1)
-5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1)
-6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1)
-7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1)
+2 >Emitted(25, 13) Source(7, 12) + SourceIndex(1)
+3 >Emitted(25, 22) Source(7, 21) + SourceIndex(1)
+4 >Emitted(25, 25) Source(7, 24) + SourceIndex(1)
+5 >Emitted(25, 29) Source(7, 28) + SourceIndex(1)
+6 >Emitted(25, 31) Source(7, 30) + SourceIndex(1)
+7 >Emitted(25, 33) Source(7, 32) + SourceIndex(1)
+8 >Emitted(25, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
@@ -324,45 +318,42 @@ sourceFile:test.ts
 ---
 >>>    exports.f1 = f1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^->
 1->
-2 >    f1
-3 >              () {
-  >                  return instance1;
-  >              }
-4 >                   
-1->Emitted(29, 5) Source(8, 17) + SourceIndex(1)
-2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1)
-3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1)
-4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1)
+2 >    export function f1() {
+  >        return instance1;
+  >    }
+1->Emitted(29, 5) Source(8, 1) + SourceIndex(1)
+2 >Emitted(29, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^
-7 >                         ^
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^
+8 >                         ^
 1->
   >
   >export var 
-2 >    a2
-3 >               = 
-4 >                 m1
-5 >                   .
-6 >                    m1_c1
-7 >                         ;
+2 >    
+3 >            a2
+4 >               = 
+5 >                 m1
+6 >                   .
+7 >                    m1_c1
+8 >                         ;
 1->Emitted(30, 5) Source(12, 12) + SourceIndex(1)
-2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1)
-3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1)
-4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1)
-5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1)
-6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1)
-7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1)
+2 >Emitted(30, 13) Source(12, 12) + SourceIndex(1)
+3 >Emitted(30, 15) Source(12, 14) + SourceIndex(1)
+4 >Emitted(30, 18) Source(12, 17) + SourceIndex(1)
+5 >Emitted(30, 20) Source(12, 19) + SourceIndex(1)
+6 >Emitted(30, 21) Source(12, 20) + SourceIndex(1)
+7 >Emitted(30, 26) Source(12, 25) + SourceIndex(1)
+8 >Emitted(30, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index df062274b3e..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 3b75f2878c9..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 49abba9156c..3958ba2389d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index dfbb5f48fff..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 422fe41a79d..88ce97eeeff 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index bee1ea97f83..e28d378dfc0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index f851a615aef..c956b034f6f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 422fe41a79d..88ce97eeeff 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 67f4a8faf60..f92c491640f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 6c57ae57e72..5c24bd16a28 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -12,21 +12,24 @@ sourceFile:ref/m1.ts
 >>>    "use strict";
 >>>    exports.m1_a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^^^^
+4 >                 ^^^
+5 >                    ^^
+6 >                      ^
+7 >                       ^^^^^^^^->
 1 >export var 
-2 >    m1_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
+2 >    
+3 >            m1_a1
+4 >                  = 
+5 >                    10
+6 >                      ;
 1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
+2 >Emitted(3, 13) Source(1, 12) + SourceIndex(0)
+3 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
+4 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
+5 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
+6 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
 ---
 >>>    var m1_c1 = (function () {
 1->^^^^
@@ -79,45 +82,42 @@ sourceFile:ref/m1.ts
 ---
 >>>    exports.m1_c1 = m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^->
 1->
-2 >    m1_c1
-3 >                  {
-  >                     public m1_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(9, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
+2 >    export class m1_c1 {
+  >        public m1_c1_p1: number;
+  >    }
+1->Emitted(9, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_instance1 = new m1_c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^^^^
+4 >                        ^^^
+5 >                           ^^^^
+6 >                               ^^^^^
+7 >                                    ^^
+8 >                                      ^
 1->
   >
   >export var 
-2 >    m1_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m1_c1
-6 >                                    ()
-7 >                                      ;
+2 >    
+3 >            m1_instance1
+4 >                         = 
+5 >                           new 
+6 >                               m1_c1
+7 >                                    ()
+8 >                                      ;
 1->Emitted(10, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
+2 >Emitted(10, 13) Source(6, 12) + SourceIndex(0)
+3 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
+4 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
+5 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
+6 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
+7 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
+8 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
 ---
 >>>    function m1_f1() {
 1 >^^^^
@@ -156,19 +156,13 @@ sourceFile:ref/m1.ts
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    m1_f1
-3 >                 () {
-  >                     return m1_instance1;
-  >                 }
-4 >                         
-1->Emitted(14, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
+2 >    export function m1_f1() {
+  >        return m1_instance1;
+  >    }
+1->Emitted(14, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=m1.js.map===================================================================
@@ -185,22 +179,25 @@ sourceFile:test.ts
 >>>    "use strict";
 >>>    exports.a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^^^^->
 1 >import m1 = require("ref/m1");
   >export var 
-2 >    a1
-3 >               = 
-4 >                 10
-5 >                   ;
+2 >    
+3 >            a1
+4 >               = 
+5 >                 10
+6 >                   ;
 1 >Emitted(3, 5) Source(2, 12) + SourceIndex(0)
-2 >Emitted(3, 15) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 17) + SourceIndex(0)
-4 >Emitted(3, 20) Source(2, 19) + SourceIndex(0)
-5 >Emitted(3, 21) Source(2, 20) + SourceIndex(0)
+2 >Emitted(3, 13) Source(2, 12) + SourceIndex(0)
+3 >Emitted(3, 15) Source(2, 14) + SourceIndex(0)
+4 >Emitted(3, 18) Source(2, 17) + SourceIndex(0)
+5 >Emitted(3, 20) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 21) Source(2, 20) + SourceIndex(0)
 ---
 >>>    var c1 = (function () {
 1->^^^^
@@ -253,45 +250,42 @@ sourceFile:test.ts
 ---
 >>>    exports.c1 = c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^^^^^->
 1->
-2 >    c1
-3 >               {
-  >                  public p1: number;
-  >              }
-4 >                   
-1->Emitted(9, 5) Source(3, 14) + SourceIndex(0)
-2 >Emitted(9, 15) Source(3, 16) + SourceIndex(0)
-3 >Emitted(9, 20) Source(5, 2) + SourceIndex(0)
-4 >Emitted(9, 21) Source(5, 2) + SourceIndex(0)
+2 >    export class c1 {
+  >        public p1: number;
+  >    }
+1->Emitted(9, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(9, 21) Source(5, 2) + SourceIndex(0)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
-4 >                        ^^^^
-5 >                            ^^
-6 >                              ^^
-7 >                                ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^
+6 >                            ^^
+7 >                              ^^
+8 >                                ^
 1->
   >
   >export var 
-2 >    instance1
-3 >                      = 
-4 >                        new 
-5 >                            c1
-6 >                              ()
-7 >                                ;
+2 >    
+3 >            instance1
+4 >                      = 
+5 >                        new 
+6 >                            c1
+7 >                              ()
+8 >                                ;
 1->Emitted(10, 5) Source(7, 12) + SourceIndex(0)
-2 >Emitted(10, 22) Source(7, 21) + SourceIndex(0)
-3 >Emitted(10, 25) Source(7, 24) + SourceIndex(0)
-4 >Emitted(10, 29) Source(7, 28) + SourceIndex(0)
-5 >Emitted(10, 31) Source(7, 30) + SourceIndex(0)
-6 >Emitted(10, 33) Source(7, 32) + SourceIndex(0)
-7 >Emitted(10, 34) Source(7, 33) + SourceIndex(0)
+2 >Emitted(10, 13) Source(7, 12) + SourceIndex(0)
+3 >Emitted(10, 22) Source(7, 21) + SourceIndex(0)
+4 >Emitted(10, 25) Source(7, 24) + SourceIndex(0)
+5 >Emitted(10, 29) Source(7, 28) + SourceIndex(0)
+6 >Emitted(10, 31) Source(7, 30) + SourceIndex(0)
+7 >Emitted(10, 33) Source(7, 32) + SourceIndex(0)
+8 >Emitted(10, 34) Source(7, 33) + SourceIndex(0)
 ---
 >>>    function f1() {
 1 >^^^^
@@ -330,45 +324,42 @@ sourceFile:test.ts
 ---
 >>>    exports.f1 = f1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^->
 1->
-2 >    f1
-3 >              () {
-  >                  return instance1;
-  >              }
-4 >                   
-1->Emitted(14, 5) Source(8, 17) + SourceIndex(0)
-2 >Emitted(14, 15) Source(8, 19) + SourceIndex(0)
-3 >Emitted(14, 20) Source(10, 2) + SourceIndex(0)
-4 >Emitted(14, 21) Source(10, 2) + SourceIndex(0)
+2 >    export function f1() {
+  >        return instance1;
+  >    }
+1->Emitted(14, 5) Source(8, 1) + SourceIndex(0)
+2 >Emitted(14, 21) Source(10, 2) + SourceIndex(0)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^
-7 >                         ^
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^
+8 >                         ^
 1->
   >
   >export var 
-2 >    a2
-3 >               = 
-4 >                 m1
-5 >                   .
-6 >                    m1_c1
-7 >                         ;
+2 >    
+3 >            a2
+4 >               = 
+5 >                 m1
+6 >                   .
+7 >                    m1_c1
+8 >                         ;
 1->Emitted(15, 5) Source(12, 12) + SourceIndex(0)
-2 >Emitted(15, 15) Source(12, 14) + SourceIndex(0)
-3 >Emitted(15, 18) Source(12, 17) + SourceIndex(0)
-4 >Emitted(15, 20) Source(12, 19) + SourceIndex(0)
-5 >Emitted(15, 21) Source(12, 20) + SourceIndex(0)
-6 >Emitted(15, 26) Source(12, 25) + SourceIndex(0)
-7 >Emitted(15, 27) Source(12, 26) + SourceIndex(0)
+2 >Emitted(15, 13) Source(12, 12) + SourceIndex(0)
+3 >Emitted(15, 15) Source(12, 14) + SourceIndex(0)
+4 >Emitted(15, 18) Source(12, 17) + SourceIndex(0)
+5 >Emitted(15, 20) Source(12, 19) + SourceIndex(0)
+6 >Emitted(15, 21) Source(12, 20) + SourceIndex(0)
+7 >Emitted(15, 26) Source(12, 25) + SourceIndex(0)
+8 >Emitted(15, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index bee1ea97f83..e28d378dfc0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFD,sBAEC;AAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index f851a615aef..c956b034f6f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AACnB,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFD,gBAEC;AAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index db57e7cba0c..f6b26376856 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -11,21 +11,24 @@ sourceFile:ref/m1.ts
 >>>"use strict";
 >>>exports.m1_a1 = 10;
 1 >
-2 >^^^^^^^^^^^^^
-3 >             ^^^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^^^^
+4 >             ^^^
+5 >                ^^
+6 >                  ^
+7 >                   ^^^^^^^^->
 1 >export var 
-2 >m1_a1
-3 >              = 
-4 >                10
-5 >                  ;
+2 >
+3 >        m1_a1
+4 >              = 
+5 >                10
+6 >                  ;
 1 >Emitted(2, 1) Source(1, 12) + SourceIndex(0)
-2 >Emitted(2, 14) Source(1, 17) + SourceIndex(0)
-3 >Emitted(2, 17) Source(1, 20) + SourceIndex(0)
-4 >Emitted(2, 19) Source(1, 22) + SourceIndex(0)
-5 >Emitted(2, 20) Source(1, 23) + SourceIndex(0)
+2 >Emitted(2, 9) Source(1, 12) + SourceIndex(0)
+3 >Emitted(2, 14) Source(1, 17) + SourceIndex(0)
+4 >Emitted(2, 17) Source(1, 20) + SourceIndex(0)
+5 >Emitted(2, 19) Source(1, 22) + SourceIndex(0)
+6 >Emitted(2, 20) Source(1, 23) + SourceIndex(0)
 ---
 >>>var m1_c1 = (function () {
 1->
@@ -78,45 +81,42 @@ sourceFile:ref/m1.ts
 ---
 >>>exports.m1_c1 = m1_c1;
 1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^^^^^^^^->
 1->
-2 >m1_c1
-3 >              {
-  >                 public m1_c1_p1: number;
-  >             }
-4 >                     
-1->Emitted(8, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(8, 14) Source(2, 19) + SourceIndex(0)
-3 >Emitted(8, 22) Source(4, 2) + SourceIndex(0)
-4 >Emitted(8, 23) Source(4, 2) + SourceIndex(0)
+2 >export class m1_c1 {
+  >    public m1_c1_p1: number;
+  >}
+1->Emitted(8, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(8, 23) Source(4, 2) + SourceIndex(0)
 ---
 >>>exports.m1_instance1 = new m1_c1();
 1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^^
-7 >                                  ^
+2 >^^^^^^^^
+3 >        ^^^^^^^^^^^^
+4 >                    ^^^
+5 >                       ^^^^
+6 >                           ^^^^^
+7 >                                ^^
+8 >                                  ^
 1->
   >
   >export var 
-2 >m1_instance1
-3 >                     = 
-4 >                       new 
-5 >                           m1_c1
-6 >                                ()
-7 >                                  ;
+2 >
+3 >        m1_instance1
+4 >                     = 
+5 >                       new 
+6 >                           m1_c1
+7 >                                ()
+8 >                                  ;
 1->Emitted(9, 1) Source(6, 12) + SourceIndex(0)
-2 >Emitted(9, 21) Source(6, 24) + SourceIndex(0)
-3 >Emitted(9, 24) Source(6, 27) + SourceIndex(0)
-4 >Emitted(9, 28) Source(6, 31) + SourceIndex(0)
-5 >Emitted(9, 33) Source(6, 36) + SourceIndex(0)
-6 >Emitted(9, 35) Source(6, 38) + SourceIndex(0)
-7 >Emitted(9, 36) Source(6, 39) + SourceIndex(0)
+2 >Emitted(9, 9) Source(6, 12) + SourceIndex(0)
+3 >Emitted(9, 21) Source(6, 24) + SourceIndex(0)
+4 >Emitted(9, 24) Source(6, 27) + SourceIndex(0)
+5 >Emitted(9, 28) Source(6, 31) + SourceIndex(0)
+6 >Emitted(9, 33) Source(6, 36) + SourceIndex(0)
+7 >Emitted(9, 35) Source(6, 38) + SourceIndex(0)
+8 >Emitted(9, 36) Source(6, 39) + SourceIndex(0)
 ---
 >>>function m1_f1() {
 1 >
@@ -155,20 +155,14 @@ sourceFile:ref/m1.ts
 ---
 >>>exports.m1_f1 = m1_f1;
 1->
-2 >^^^^^^^^^^^^^
-3 >             ^^^^^^^^
-4 >                     ^
-5 >                      ^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^^->
 1->
-2 >m1_f1
-3 >             () {
-  >                 return m1_instance1;
-  >             }
-4 >                     
-1->Emitted(13, 1) Source(7, 17) + SourceIndex(0)
-2 >Emitted(13, 14) Source(7, 22) + SourceIndex(0)
-3 >Emitted(13, 22) Source(9, 2) + SourceIndex(0)
-4 >Emitted(13, 23) Source(9, 2) + SourceIndex(0)
+2 >export function m1_f1() {
+  >    return m1_instance1;
+  >}
+1->Emitted(13, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(13, 23) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=m1.js.map===================================================================
 JsFile: test.js
@@ -183,45 +177,33 @@ sourceFile:test.ts
 >>>"use strict";
 >>>var m1 = require("ref/m1");
 1 >
-2 >^^^^
-3 >    ^^
-4 >      ^^^^^^^^^^^
-5 >                 ^^^^^^^^
-6 >                         ^
-7 >                          ^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >import 
-3 >    m1
-4 >       = require(
-5 >                 "ref/m1"
-6 >                         )
-7 >                          ;
+2 >import m1 = require("ref/m1");
 1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(2, 7) Source(1, 10) + SourceIndex(0)
-4 >Emitted(2, 18) Source(1, 21) + SourceIndex(0)
-5 >Emitted(2, 26) Source(1, 29) + SourceIndex(0)
-6 >Emitted(2, 27) Source(1, 30) + SourceIndex(0)
-7 >Emitted(2, 28) Source(1, 31) + SourceIndex(0)
+2 >Emitted(2, 28) Source(1, 31) + SourceIndex(0)
 ---
 >>>exports.a1 = 10;
 1 >
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^
+4 >          ^^^
+5 >             ^^
+6 >               ^
+7 >                ^^^^^^^^->
 1 >
   >export var 
-2 >a1
-3 >           = 
-4 >             10
-5 >               ;
+2 >
+3 >        a1
+4 >           = 
+5 >             10
+6 >               ;
 1 >Emitted(3, 1) Source(2, 12) + SourceIndex(0)
-2 >Emitted(3, 11) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 14) Source(2, 17) + SourceIndex(0)
-4 >Emitted(3, 16) Source(2, 19) + SourceIndex(0)
-5 >Emitted(3, 17) Source(2, 20) + SourceIndex(0)
+2 >Emitted(3, 9) Source(2, 12) + SourceIndex(0)
+3 >Emitted(3, 11) Source(2, 14) + SourceIndex(0)
+4 >Emitted(3, 14) Source(2, 17) + SourceIndex(0)
+5 >Emitted(3, 16) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 17) Source(2, 20) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
@@ -274,45 +256,42 @@ sourceFile:test.ts
 ---
 >>>exports.c1 = c1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^->
 1->
-2 >c1
-3 >           {
-  >              public p1: number;
-  >          }
-4 >               
-1->Emitted(9, 1) Source(3, 14) + SourceIndex(0)
-2 >Emitted(9, 11) Source(3, 16) + SourceIndex(0)
-3 >Emitted(9, 16) Source(5, 2) + SourceIndex(0)
-4 >Emitted(9, 17) Source(5, 2) + SourceIndex(0)
+2 >export class c1 {
+  >    public p1: number;
+  >}
+1->Emitted(9, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(9, 17) Source(5, 2) + SourceIndex(0)
 ---
 >>>exports.instance1 = new c1();
 1->
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^^^
-5 >                        ^^
-6 >                          ^^
-7 >                            ^
+2 >^^^^^^^^
+3 >        ^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^
+6 >                        ^^
+7 >                          ^^
+8 >                            ^
 1->
   >
   >export var 
-2 >instance1
-3 >                  = 
-4 >                    new 
-5 >                        c1
-6 >                          ()
-7 >                            ;
+2 >
+3 >        instance1
+4 >                  = 
+5 >                    new 
+6 >                        c1
+7 >                          ()
+8 >                            ;
 1->Emitted(10, 1) Source(7, 12) + SourceIndex(0)
-2 >Emitted(10, 18) Source(7, 21) + SourceIndex(0)
-3 >Emitted(10, 21) Source(7, 24) + SourceIndex(0)
-4 >Emitted(10, 25) Source(7, 28) + SourceIndex(0)
-5 >Emitted(10, 27) Source(7, 30) + SourceIndex(0)
-6 >Emitted(10, 29) Source(7, 32) + SourceIndex(0)
-7 >Emitted(10, 30) Source(7, 33) + SourceIndex(0)
+2 >Emitted(10, 9) Source(7, 12) + SourceIndex(0)
+3 >Emitted(10, 18) Source(7, 21) + SourceIndex(0)
+4 >Emitted(10, 21) Source(7, 24) + SourceIndex(0)
+5 >Emitted(10, 25) Source(7, 28) + SourceIndex(0)
+6 >Emitted(10, 27) Source(7, 30) + SourceIndex(0)
+7 >Emitted(10, 29) Source(7, 32) + SourceIndex(0)
+8 >Emitted(10, 30) Source(7, 33) + SourceIndex(0)
 ---
 >>>function f1() {
 1 >
@@ -351,45 +330,42 @@ sourceFile:test.ts
 ---
 >>>exports.f1 = f1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^^^
-4 >               ^
-5 >                ^^^^^^^->
+2 >^^^^^^^^^^^^^^^^
+3 >                ^^^^^^^->
 1->
-2 >f1
-3 >          () {
-  >              return instance1;
-  >          }
-4 >               
-1->Emitted(14, 1) Source(8, 17) + SourceIndex(0)
-2 >Emitted(14, 11) Source(8, 19) + SourceIndex(0)
-3 >Emitted(14, 16) Source(10, 2) + SourceIndex(0)
-4 >Emitted(14, 17) Source(10, 2) + SourceIndex(0)
+2 >export function f1() {
+  >    return instance1;
+  >}
+1->Emitted(14, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(14, 17) Source(10, 2) + SourceIndex(0)
 ---
 >>>exports.a2 = m1.m1_c1;
 1->
-2 >^^^^^^^^^^
-3 >          ^^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^
-7 >                     ^
-8 >                      ^^^^^^^^^->
+2 >^^^^^^^^
+3 >        ^^
+4 >          ^^^
+5 >             ^^
+6 >               ^
+7 >                ^^^^^
+8 >                     ^
+9 >                      ^^^^^^^^^->
 1->
   >
   >export var 
-2 >a2
-3 >           = 
-4 >             m1
-5 >               .
-6 >                m1_c1
-7 >                     ;
+2 >
+3 >        a2
+4 >           = 
+5 >             m1
+6 >               .
+7 >                m1_c1
+8 >                     ;
 1->Emitted(15, 1) Source(12, 12) + SourceIndex(0)
-2 >Emitted(15, 11) Source(12, 14) + SourceIndex(0)
-3 >Emitted(15, 14) Source(12, 17) + SourceIndex(0)
-4 >Emitted(15, 16) Source(12, 19) + SourceIndex(0)
-5 >Emitted(15, 17) Source(12, 20) + SourceIndex(0)
-6 >Emitted(15, 22) Source(12, 25) + SourceIndex(0)
-7 >Emitted(15, 23) Source(12, 26) + SourceIndex(0)
+2 >Emitted(15, 9) Source(12, 12) + SourceIndex(0)
+3 >Emitted(15, 11) Source(12, 14) + SourceIndex(0)
+4 >Emitted(15, 14) Source(12, 17) + SourceIndex(0)
+5 >Emitted(15, 16) Source(12, 19) + SourceIndex(0)
+6 >Emitted(15, 17) Source(12, 20) + SourceIndex(0)
+7 >Emitted(15, 22) Source(12, 25) + SourceIndex(0)
+8 >Emitted(15, 23) Source(12, 26) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index ade8b34024d..a46d68e9b05 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICPU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFD,sBAEC;IAEU,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFD,gBAEC;IAEU,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index edca6852f84..8fca8ab873e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -12,21 +12,24 @@ sourceFile:ref/m1.ts
 >>>    "use strict";
 >>>    exports.m1_a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^^^^
+4 >                 ^^^
+5 >                    ^^
+6 >                      ^
+7 >                       ^^^^^^^^->
 1 >export var 
-2 >    m1_a1
-3 >                  = 
-4 >                    10
-5 >                      ;
+2 >    
+3 >            m1_a1
+4 >                  = 
+5 >                    10
+6 >                      ;
 1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0)
-2 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
-3 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
-4 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
-5 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
+2 >Emitted(3, 13) Source(1, 12) + SourceIndex(0)
+3 >Emitted(3, 18) Source(1, 17) + SourceIndex(0)
+4 >Emitted(3, 21) Source(1, 20) + SourceIndex(0)
+5 >Emitted(3, 23) Source(1, 22) + SourceIndex(0)
+6 >Emitted(3, 24) Source(1, 23) + SourceIndex(0)
 ---
 >>>    var m1_c1 = (function () {
 1->^^^^
@@ -79,45 +82,42 @@ sourceFile:ref/m1.ts
 ---
 >>>    exports.m1_c1 = m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
-5 >                          ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^->
 1->
-2 >    m1_c1
-3 >                  {
-  >                     public m1_c1_p1: number;
-  >                 }
-4 >                         
-1->Emitted(9, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(9, 18) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 26) Source(4, 2) + SourceIndex(0)
-4 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
+2 >    export class m1_c1 {
+  >        public m1_c1_p1: number;
+  >    }
+1->Emitted(9, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(9, 27) Source(4, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_instance1 = new m1_c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^^
-5 >                               ^^^^^
-6 >                                    ^^
-7 >                                      ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^^^^
+4 >                        ^^^
+5 >                           ^^^^
+6 >                               ^^^^^
+7 >                                    ^^
+8 >                                      ^
 1->
   >
   >export var 
-2 >    m1_instance1
-3 >                         = 
-4 >                           new 
-5 >                               m1_c1
-6 >                                    ()
-7 >                                      ;
+2 >    
+3 >            m1_instance1
+4 >                         = 
+5 >                           new 
+6 >                               m1_c1
+7 >                                    ()
+8 >                                      ;
 1->Emitted(10, 5) Source(6, 12) + SourceIndex(0)
-2 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
-3 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
-4 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
-5 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
-6 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
-7 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
+2 >Emitted(10, 13) Source(6, 12) + SourceIndex(0)
+3 >Emitted(10, 25) Source(6, 24) + SourceIndex(0)
+4 >Emitted(10, 28) Source(6, 27) + SourceIndex(0)
+5 >Emitted(10, 32) Source(6, 31) + SourceIndex(0)
+6 >Emitted(10, 37) Source(6, 36) + SourceIndex(0)
+7 >Emitted(10, 39) Source(6, 38) + SourceIndex(0)
+8 >Emitted(10, 40) Source(6, 39) + SourceIndex(0)
 ---
 >>>    function m1_f1() {
 1 >^^^^
@@ -156,19 +156,13 @@ sourceFile:ref/m1.ts
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^^^^^^^
-4 >                         ^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    m1_f1
-3 >                 () {
-  >                     return m1_instance1;
-  >                 }
-4 >                         
-1->Emitted(14, 5) Source(7, 17) + SourceIndex(0)
-2 >Emitted(14, 18) Source(7, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(9, 2) + SourceIndex(0)
-4 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
+2 >    export function m1_f1() {
+  >        return m1_instance1;
+  >    }
+1->Emitted(14, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 27) Source(9, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -179,22 +173,25 @@ sourceFile:test.ts
 >>>    "use strict";
 >>>    exports.a1 = 10;
 1 >^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^^^^->
 1 >import m1 = require("ref/m1");
   >export var 
-2 >    a1
-3 >               = 
-4 >                 10
-5 >                   ;
+2 >    
+3 >            a1
+4 >               = 
+5 >                 10
+6 >                   ;
 1 >Emitted(18, 5) Source(2, 12) + SourceIndex(1)
-2 >Emitted(18, 15) Source(2, 14) + SourceIndex(1)
-3 >Emitted(18, 18) Source(2, 17) + SourceIndex(1)
-4 >Emitted(18, 20) Source(2, 19) + SourceIndex(1)
-5 >Emitted(18, 21) Source(2, 20) + SourceIndex(1)
+2 >Emitted(18, 13) Source(2, 12) + SourceIndex(1)
+3 >Emitted(18, 15) Source(2, 14) + SourceIndex(1)
+4 >Emitted(18, 18) Source(2, 17) + SourceIndex(1)
+5 >Emitted(18, 20) Source(2, 19) + SourceIndex(1)
+6 >Emitted(18, 21) Source(2, 20) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
@@ -247,45 +244,42 @@ sourceFile:test.ts
 ---
 >>>    exports.c1 = c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^^^^^->
 1->
-2 >    c1
-3 >               {
-  >                  public p1: number;
-  >              }
-4 >                   
-1->Emitted(24, 5) Source(3, 14) + SourceIndex(1)
-2 >Emitted(24, 15) Source(3, 16) + SourceIndex(1)
-3 >Emitted(24, 20) Source(5, 2) + SourceIndex(1)
-4 >Emitted(24, 21) Source(5, 2) + SourceIndex(1)
+2 >    export class c1 {
+  >        public p1: number;
+  >    }
+1->Emitted(24, 5) Source(3, 1) + SourceIndex(1)
+2 >Emitted(24, 21) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.instance1 = new c1();
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
-4 >                        ^^^^
-5 >                            ^^
-6 >                              ^^
-7 >                                ^
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^
+6 >                            ^^
+7 >                              ^^
+8 >                                ^
 1->
   >
   >export var 
-2 >    instance1
-3 >                      = 
-4 >                        new 
-5 >                            c1
-6 >                              ()
-7 >                                ;
+2 >    
+3 >            instance1
+4 >                      = 
+5 >                        new 
+6 >                            c1
+7 >                              ()
+8 >                                ;
 1->Emitted(25, 5) Source(7, 12) + SourceIndex(1)
-2 >Emitted(25, 22) Source(7, 21) + SourceIndex(1)
-3 >Emitted(25, 25) Source(7, 24) + SourceIndex(1)
-4 >Emitted(25, 29) Source(7, 28) + SourceIndex(1)
-5 >Emitted(25, 31) Source(7, 30) + SourceIndex(1)
-6 >Emitted(25, 33) Source(7, 32) + SourceIndex(1)
-7 >Emitted(25, 34) Source(7, 33) + SourceIndex(1)
+2 >Emitted(25, 13) Source(7, 12) + SourceIndex(1)
+3 >Emitted(25, 22) Source(7, 21) + SourceIndex(1)
+4 >Emitted(25, 25) Source(7, 24) + SourceIndex(1)
+5 >Emitted(25, 29) Source(7, 28) + SourceIndex(1)
+6 >Emitted(25, 31) Source(7, 30) + SourceIndex(1)
+7 >Emitted(25, 33) Source(7, 32) + SourceIndex(1)
+8 >Emitted(25, 34) Source(7, 33) + SourceIndex(1)
 ---
 >>>    function f1() {
 1 >^^^^
@@ -324,45 +318,42 @@ sourceFile:test.ts
 ---
 >>>    exports.f1 = f1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^^^
-4 >                   ^
-5 >                    ^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^->
 1->
-2 >    f1
-3 >              () {
-  >                  return instance1;
-  >              }
-4 >                   
-1->Emitted(29, 5) Source(8, 17) + SourceIndex(1)
-2 >Emitted(29, 15) Source(8, 19) + SourceIndex(1)
-3 >Emitted(29, 20) Source(10, 2) + SourceIndex(1)
-4 >Emitted(29, 21) Source(10, 2) + SourceIndex(1)
+2 >    export function f1() {
+  >        return instance1;
+  >    }
+1->Emitted(29, 5) Source(8, 1) + SourceIndex(1)
+2 >Emitted(29, 21) Source(10, 2) + SourceIndex(1)
 ---
 >>>    exports.a2 = m1.m1_c1;
 1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-6 >                    ^^^^^
-7 >                         ^
+2 >    ^^^^^^^^
+3 >            ^^
+4 >              ^^^
+5 >                 ^^
+6 >                   ^
+7 >                    ^^^^^
+8 >                         ^
 1->
   >
   >export var 
-2 >    a2
-3 >               = 
-4 >                 m1
-5 >                   .
-6 >                    m1_c1
-7 >                         ;
+2 >    
+3 >            a2
+4 >               = 
+5 >                 m1
+6 >                   .
+7 >                    m1_c1
+8 >                         ;
 1->Emitted(30, 5) Source(12, 12) + SourceIndex(1)
-2 >Emitted(30, 15) Source(12, 14) + SourceIndex(1)
-3 >Emitted(30, 18) Source(12, 17) + SourceIndex(1)
-4 >Emitted(30, 20) Source(12, 19) + SourceIndex(1)
-5 >Emitted(30, 21) Source(12, 20) + SourceIndex(1)
-6 >Emitted(30, 26) Source(12, 25) + SourceIndex(1)
-7 >Emitted(30, 27) Source(12, 26) + SourceIndex(1)
+2 >Emitted(30, 13) Source(12, 12) + SourceIndex(1)
+3 >Emitted(30, 15) Source(12, 14) + SourceIndex(1)
+4 >Emitted(30, 18) Source(12, 17) + SourceIndex(1)
+5 >Emitted(30, 20) Source(12, 19) + SourceIndex(1)
+6 >Emitted(30, 21) Source(12, 20) + SourceIndex(1)
+7 >Emitted(30, 26) Source(12, 25) + SourceIndex(1)
+8 >Emitted(30, 27) Source(12, 26) + SourceIndex(1)
 ---
 >>>});
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index 18eee0fd4df..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare module "ref/m1" {
-    export var m1_a1: number;
-    export class m1_c1 {
-        m1_c1_p1: number;
-    }
-    export var m1_instance1: m1_c1;
-    export function m1_f1(): m1_c1;
-}
-declare module "test" {
-    import m1 = require("ref/m1");
-    export var a1: number;
-    export class c1 {
-        p1: number;
-    }
-    export var instance1: c1;
-    export function f1(): c1;
-    export var a2: typeof m1.m1_c1;
-}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 4409af8d0a7..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 7db8ebc6926..81c758acde2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -14,9 +14,5 @@
         "ref/m1.ts",
         "test.ts"
     ],
-    "emittedFiles": [
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
-    ]
+    "emittedFiles": []
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
deleted file mode 100644
index 2903ad0141c..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: ref/m1.ts,test.ts
-===================================================================
->>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js
index 3f0900f7748..afa55acb894 100644
--- a/tests/baselines/reference/promiseChaining.js
+++ b/tests/baselines/reference/promiseChaining.js
@@ -19,7 +19,7 @@ var Chain = (function () {
     Chain.prototype.then = function (cb) {
         var result = cb(this.value);
         // should get a fresh type parameter which each then call
-        var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*string*/.then(function (x) { return x.length; }); // No error
+        var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*string*/.then(function (x) { return x.length; }) /*number*/; // No error
         return new Chain(result);
     };
     return Chain;
diff --git a/tests/baselines/reference/promiseChaining1.js b/tests/baselines/reference/promiseChaining1.js
index b396261a59e..ad2ddcf694b 100644
--- a/tests/baselines/reference/promiseChaining1.js
+++ b/tests/baselines/reference/promiseChaining1.js
@@ -19,7 +19,7 @@ var Chain2 = (function () {
     Chain2.prototype.then = function (cb) {
         var result = cb(this.value);
         // should get a fresh type parameter which each then call
-        var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*Function*/.then(function (x) { return x.length; }); // Should error on "abc" because it is not a Function
+        var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*Function*/.then(function (x) { return x.length; }) /*number*/; // Should error on "abc" because it is not a Function
         return new Chain2(result);
     };
     return Chain2;
diff --git a/tests/baselines/reference/propertyAccessibility2.js b/tests/baselines/reference/propertyAccessibility2.js
index afce6c4c24a..3618b86fcc5 100644
--- a/tests/baselines/reference/propertyAccessibility2.js
+++ b/tests/baselines/reference/propertyAccessibility2.js
@@ -9,7 +9,7 @@ var c = C.x;
 var C = (function () {
     function C() {
     }
-    C.x = 1;
     return C;
 }());
+C.x = 1;
 var c = C.x;
diff --git a/tests/baselines/reference/qualifiedModuleLocals.js b/tests/baselines/reference/qualifiedModuleLocals.js
index b7ba5b70e81..7fcbc0700f8 100644
--- a/tests/baselines/reference/qualifiedModuleLocals.js
+++ b/tests/baselines/reference/qualifiedModuleLocals.js
@@ -14,7 +14,7 @@ A.a();
 var A;
 (function (A) {
     function b() { }
-    function a() { A.b(); }
-    A.a = a; // A.b should be an unresolved symbol error
+    function a() { A.b(); } // A.b should be an unresolved symbol error
+    A.a = a;
 })(A || (A = {}));
 A.a();
diff --git a/tests/baselines/reference/quotedPropertyName2.js b/tests/baselines/reference/quotedPropertyName2.js
index 1c4d85076ea..550e5299702 100644
--- a/tests/baselines/reference/quotedPropertyName2.js
+++ b/tests/baselines/reference/quotedPropertyName2.js
@@ -7,6 +7,6 @@ class Test1 {
 var Test1 = (function () {
     function Test1() {
     }
-    Test1["prop1"] = 0;
     return Test1;
 }());
+Test1["prop1"] = 0;
diff --git a/tests/baselines/reference/reactNamespaceInvalidInput.js b/tests/baselines/reference/reactNamespaceInvalidInput.js
index bf079d6b9a8..69918fe976f 100644
--- a/tests/baselines/reference/reactNamespaceInvalidInput.js
+++ b/tests/baselines/reference/reactNamespaceInvalidInput.js
@@ -4,4 +4,4 @@
 
 
 //// [reactNamespaceInvalidInput.js]
-my-React-Lib.createElement("foo", {data: true});
+my-React-Lib.createElement("foo", { data: true });
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.js b/tests/baselines/reference/reactNamespaceJSXEmit.js
index ced18ebc031..3a21504bb80 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.js
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -21,8 +21,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
-myReactLib.createElement("foo", {data: true});
-myReactLib.createElement(Bar, {x: x});
+myReactLib.createElement("foo", { data: true });
+myReactLib.createElement(Bar, { x: x });
 myReactLib.createElement("x-component", null);
 myReactLib.createElement(Bar, __assign({}, x));
-myReactLib.createElement(Bar, __assign({}, x, {y: 2}));
+myReactLib.createElement(Bar, __assign({}, x, { y: 2 }));
diff --git a/tests/baselines/reference/reactNamespaceMissingDeclaration.js b/tests/baselines/reference/reactNamespaceMissingDeclaration.js
index d972f319f8f..8faeffa6496 100644
--- a/tests/baselines/reference/reactNamespaceMissingDeclaration.js
+++ b/tests/baselines/reference/reactNamespaceMissingDeclaration.js
@@ -5,4 +5,4 @@
 
 //// [reactNamespaceMissingDeclaration.js]
 // Error myReactLib not declared
-myReactLib.createElement("foo", {data: true});
+myReactLib.createElement("foo", { data: true });
diff --git a/tests/baselines/reference/reassignStaticProp.js b/tests/baselines/reference/reassignStaticProp.js
index 2bf2bafa128..d9c37c29ad5 100644
--- a/tests/baselines/reference/reassignStaticProp.js
+++ b/tests/baselines/reference/reassignStaticProp.js
@@ -15,6 +15,6 @@ class foo {
 var foo = (function () {
     function foo() {
     }
-    foo.bar = 1;
     return foo;
 }());
+foo.bar = 1;
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map
index 40f720effce..7e0b27b82b4 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js.map
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map
@@ -1,2 +1,2 @@
 //// [recursiveClassReferenceTest.js.map]
-{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI,EAAC,CAAC;gBACjC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO,EAAC,CAAC;YAC5B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS,EAAC,CAAC;gBAExC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
+{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI;gBAC/B;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO;YAC1B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS;gBAEtC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
index 25dc6a1900d..7e9da7dddf3 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -198,24 +198,18 @@ sourceFile:recursiveClassReferenceTest.ts
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^
 3 >                       ^^^^
-4 >                           ^^
-5 >                             ^
-6 >                              ^^^^^^^^^^^^^^^^^^^^^^^->
+4 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >            
 3 >                       Find
-4 >                            
-5 >                             {
 1->Emitted(15, 13) Source(32, 29) + SourceIndex(0)
 2 >Emitted(15, 24) Source(32, 29) + SourceIndex(0)
 3 >Emitted(15, 28) Source(32, 33) + SourceIndex(0)
-4 >Emitted(15, 30) Source(32, 34) + SourceIndex(0)
-5 >Emitted(15, 31) Source(32, 35) + SourceIndex(0)
 ---
 >>>                var StartFindAction = (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >	
 1->Emitted(16, 17) Source(33, 2) + SourceIndex(0)
 ---
@@ -663,24 +657,18 @@ sourceFile:recursiveClassReferenceTest.ts
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^
 3 >                   ^^^^^^^
-4 >                          ^^
-5 >                            ^
-6 >                             ^^^^^^^^^^^^^^^->
+4 >                          ^^^^^^^^^^^^^^^^^^->
 1->
 2 >        
 3 >                   Widgets
-4 >                           
-5 >                            {
 1->Emitted(35, 9) Source(44, 21) + SourceIndex(0)
 2 >Emitted(35, 20) Source(44, 21) + SourceIndex(0)
 3 >Emitted(35, 27) Source(44, 28) + SourceIndex(0)
-4 >Emitted(35, 29) Source(44, 29) + SourceIndex(0)
-5 >Emitted(35, 30) Source(44, 30) + SourceIndex(0)
 ---
 >>>            var FindWidget = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >	
 1->Emitted(36, 13) Source(45, 2) + SourceIndex(0)
 ---
@@ -1443,24 +1431,18 @@ sourceFile:recursiveClassReferenceTest.ts
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^
 3 >                       ^^^^^^^^^
-4 >                                ^^
-5 >                                  ^
-6 >                                   ^^^^^^^^->
+4 >                                ^^^^^^^^^^^->
 1->
 2 >            
 3 >                       PlainText
-4 >                                 
-5 >                                  {
 1->Emitted(70, 13) Source(76, 31) + SourceIndex(0)
 2 >Emitted(70, 24) Source(76, 31) + SourceIndex(0)
 3 >Emitted(70, 33) Source(76, 40) + SourceIndex(0)
-4 >Emitted(70, 35) Source(76, 41) + SourceIndex(0)
-5 >Emitted(70, 36) Source(76, 42) + SourceIndex(0)
 ---
 >>>                var State = (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >	
   >	
 1->Emitted(71, 17) Source(78, 2) + SourceIndex(0)
diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js
index ab5279d1d47..a4b68115ac2 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -27,7 +27,7 @@ var x = (function () {
 module.exports = x;
 //// [foo2.js]
 "use strict";
-var foo1 = require('./foo1');
+var foo1 = require("./foo1");
 module.exports = {
     x: foo1
 };
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var foo2 = require('./foo2');
+var foo2 = require("./foo2");
 var x = (function (_super) {
     __extends(x, _super);
     function x() {
diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js
index c25ffd4ab65..6986d8ddb68 100644
--- a/tests/baselines/reference/relativePathMustResolve.js
+++ b/tests/baselines/reference/relativePathMustResolve.js
@@ -10,5 +10,5 @@ var z = foo.x + 10;
 
 //// [foo_1.js]
 "use strict";
-var foo = require('./test/foo');
+var foo = require("./test/foo");
 var z = foo.x + 10;
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js
index 75d6539cb3c..36673510aef 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.js
+++ b/tests/baselines/reference/relativePathToDeclarationFile.js
@@ -28,9 +28,9 @@ if(foo.M2.x){
 
 //// [file1.js]
 "use strict";
-var foo = require('foo');
-var other = require('./other');
-var relMod = require('./sub/relMod');
+var foo = require("foo");
+var other = require("./other");
+var relMod = require("./sub/relMod");
 if (foo.M2.x) {
     var x = new relMod(other.M2.x.charCodeAt(0));
 }
diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js
index 69b071c9115..a5f8a680bcc 100644
--- a/tests/baselines/reference/reservedWords2.js
+++ b/tests/baselines/reference/reservedWords2.js
@@ -23,6 +23,7 @@ while (from)
 var ;
 typeof ;
 10;
+function () { }
 throw function () { };
 module;
 void {};
diff --git a/tests/baselines/reference/restParamModifier.js b/tests/baselines/reference/restParamModifier.js
index 3e0f7f7878a..ed7307fcdef 100644
--- a/tests/baselines/reference/restParamModifier.js
+++ b/tests/baselines/reference/restParamModifier.js
@@ -5,7 +5,7 @@ class C {
 
 //// [restParamModifier.js]
 var C = (function () {
-    function C(public, string) {
+    function C(string) {
         if (string === void 0) { string = []; }
     }
     return C;
diff --git a/tests/baselines/reference/restParameterNotLast.js b/tests/baselines/reference/restParameterNotLast.js
index 4ca416a47ec..d879bc12cd3 100644
--- a/tests/baselines/reference/restParameterNotLast.js
+++ b/tests/baselines/reference/restParameterNotLast.js
@@ -2,4 +2,4 @@
 function f(...x, y) { }
 
 //// [restParameterNotLast.js]
-function f(x, y) { }
+function f(y) { }
diff --git a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
index 26774b6c2f2..c6b5fa2ae41 100644
--- a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
+++ b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
@@ -40,7 +40,7 @@ var f = function foo() {
         x[_i - 0] = arguments[_i];
     }
 };
-var f2 = function (x) {
+var f2 = function () {
     var y = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         y[_i - 1] = arguments[_i];
@@ -65,7 +65,7 @@ var b = {
             x[_i - 0] = arguments[_i];
         }
     },
-    a: function foo(x) {
+    a: function foo() {
         var y = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             y[_i - 1] = arguments[_i];
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes.js b/tests/baselines/reference/restParametersOfNonArrayTypes.js
index d6235194b30..5400a8b43cc 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes.js
@@ -39,7 +39,7 @@ var f = function foo() {
         x[_i - 0] = arguments[_i];
     }
 };
-var f2 = function (x) {
+var f2 = function () {
     var y = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         y[_i - 1] = arguments[_i];
@@ -64,7 +64,7 @@ var b = {
             x[_i - 0] = arguments[_i];
         }
     },
-    a: function foo(x) {
+    a: function foo() {
         var y = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             y[_i - 1] = arguments[_i];
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes2.js b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
index 598c8f2fe3d..d405c13db5a 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes2.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
@@ -71,7 +71,7 @@ var f = function foo() {
         x[_i - 0] = arguments[_i];
     }
 };
-var f2 = function (x) {
+var f2 = function () {
     var y = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         y[_i - 1] = arguments[_i];
@@ -96,7 +96,7 @@ var b = {
             x[_i - 0] = arguments[_i];
         }
     },
-    a: function foo(x) {
+    a: function foo() {
         var y = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             y[_i - 1] = arguments[_i];
@@ -121,7 +121,7 @@ var f3 = function foo() {
         x[_i - 0] = arguments[_i];
     }
 };
-var f4 = function (x) {
+var f4 = function () {
     var y = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         y[_i - 1] = arguments[_i];
@@ -146,7 +146,7 @@ var b2 = {
             x[_i - 0] = arguments[_i];
         }
     },
-    a: function foo(x) {
+    a: function foo() {
         var y = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             y[_i - 1] = arguments[_i];
diff --git a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
index 11208f1fb83..3f1cf33e7ba 100644
--- a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
+++ b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
@@ -66,7 +66,7 @@ var f = function foo() {
         x[_i - 0] = arguments[_i];
     }
 };
-var f2 = function (x) {
+var f2 = function () {
     var y = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         y[_i - 1] = arguments[_i];
@@ -91,7 +91,7 @@ var b = {
             x[_i - 0] = arguments[_i];
         }
     },
-    a: function foo(x) {
+    a: function foo() {
         var y = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             y[_i - 1] = arguments[_i];
@@ -116,7 +116,7 @@ var f3 = function foo() {
         x[_i - 0] = arguments[_i];
     }
 };
-var f4 = function (x) {
+var f4 = function () {
     var y = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         y[_i - 1] = arguments[_i];
@@ -141,7 +141,7 @@ var b2 = {
             x[_i - 0] = arguments[_i];
         }
     },
-    a: function foo(x) {
+    a: function foo() {
         var y = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             y[_i - 1] = arguments[_i];
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js
index 3cecc18b661..383d5d99e9e 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.js
+++ b/tests/baselines/reference/shorthand-property-es6-amd.js
@@ -6,7 +6,7 @@ const bar = { foo, baz };
 
 
 //// [test.js]
-define(["require", "exports", './foo'], function (require, exports, foo_1) {
+define(["require", "exports", "./foo"], function (require, exports, foo_1) {
     "use strict";
     const baz = 42;
     const bar = { foo: foo_1.foo, baz };
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
index d52622dffc7..fad9c37ea8f 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
@@ -20,8 +20,8 @@ use(foo);
 exports.x = 1;
 //// [test.js]
 "use strict";
-const existingModule_1 = require('./existingModule');
-const missingModule_1 = require('./missingModule');
+const existingModule_1 = require("./existingModule");
+const missingModule_1 = require("./missingModule");
 const test = { x: existingModule_1.x, foo: missingModule_1.foo };
 use(existingModule_1.x);
 use(missingModule_1.foo);
diff --git a/tests/baselines/reference/sourceMap-Comments.js.map b/tests/baselines/reference/sourceMap-Comments.js.map
index 7f6c159c6eb..1905d050a0b 100644
--- a/tests/baselines/reference/sourceMap-Comments.js.map
+++ b/tests/baselines/reference/sourceMap-Comments.js.map
@@ -1,2 +1,2 @@
 //// [sourceMap-Comments.js.map]
-{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkBT;AAlBD,WAAO,GAAG;IAAC,IAAA,KAAK,CAkBf;IAlBU,WAAA,KAAK,EAAC,CAAC;QACd;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACR,KAAK,CAAC;wBACF,KAAK,CAAC;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,KAAK,CAAC;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,KAAK,CAAC;gBACd,CAAC;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBU,KAAK,GAAL,SAAK,KAAL,SAAK,QAkBf;AAAD,CAAC,EAlBM,GAAG,KAAH,GAAG,QAkBT"}
\ No newline at end of file
+{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkBT;AAlBD,WAAO,GAAG;IAAC,IAAA,KAAK,CAkBf;IAlBU,WAAA,KAAK;QACZ;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACR,KAAK,CAAC;wBACF,KAAK,CAAC;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,KAAK,CAAC;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,KAAK,CAAC;gBACd,CAAC;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBU,KAAK,GAAL,SAAK,KAAL,SAAK,QAkBf;AAAD,CAAC,EAlBM,GAAG,KAAH,GAAG,QAkBT"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt
index 29726c68d9a..f6009f3fc34 100644
--- a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt
@@ -90,24 +90,18 @@ sourceFile:sourceMap-Comments.ts
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^^^^^
-4 >                    ^^
-5 >                      ^
-6 >                       ^^^^^^^^^^^->
+4 >                    ^^^^^^^^^^^^^^->
 1->
 2 >    
 3 >               tools
-4 >                     
-5 >                      {
 1->Emitted(4, 5) Source(1, 12) + SourceIndex(0)
 2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0)
 3 >Emitted(4, 21) Source(1, 17) + SourceIndex(0)
-4 >Emitted(4, 23) Source(1, 18) + SourceIndex(0)
-5 >Emitted(4, 24) Source(1, 19) + SourceIndex(0)
 ---
 >>>        var Test = (function () {
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >    
 1->Emitted(5, 9) Source(2, 5) + SourceIndex(0)
 ---
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js b/tests/baselines/reference/sourceMap-FileWithComments.js
index 9bb18dba33d..dd2131889af 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.js
+++ b/tests/baselines/reference/sourceMap-FileWithComments.js
@@ -49,10 +49,10 @@ var Shapes;
         }
         // Instance member
         Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); };
-        // Static member
-        Point.origin = new Point(0, 0);
         return Point;
     }());
+    // Static member
+    Point.origin = new Point(0, 0);
     Shapes.Point = Point;
     // Variable comment after class
     var a = 10;
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map
index f3e9674336d..11d0f52a18d 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.js.map
+++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map
@@ -1,2 +1,2 @@
 //// [sourceMap-FileWithComments.js.map]
-{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAMA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAEX,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,gBAAgB;QACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,YAAC;IAAD,CAAC,AATD,IASC;IATY,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX;IACA,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAMA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAET,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAItE,YAAC;IAAD,CAAC,AATD;IAOI,gBAAgB;IACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IARvB,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX;IACA,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
index 3bcf2634507..fc822f1cfe0 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
@@ -67,24 +67,18 @@ sourceFile:sourceMap-FileWithComments.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^^^^
-4 >                 ^^
-5 >                   ^
 1->
 2 >module 
 3 >           Shapes
-4 >                  
-5 >                   {
 1->Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(3, 12) Source(8, 8) + SourceIndex(0)
 3 >Emitted(3, 18) Source(8, 14) + SourceIndex(0)
-4 >Emitted(3, 20) Source(8, 15) + SourceIndex(0)
-5 >Emitted(3, 21) Source(8, 16) + SourceIndex(0)
 ---
 >>>    // Class
 1 >^^^^
 2 >    ^^^^^^^^
 3 >            ^^^^^^^^^^^^^^^^^^^->
-1 >
+1 > {
   >
   >    
 2 >    // Class
@@ -271,93 +265,89 @@ sourceFile:sourceMap-FileWithComments.ts
 28>Emitted(12, 102) Source(16, 74) + SourceIndex(0)
 29>Emitted(12, 103) Source(16, 75) + SourceIndex(0)
 ---
->>>        // Static member
-1 >^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^
-3 >                        ^^^^^^^^^^^^^^^^->
-1 >
-  >
-  >        
-2 >        // Static member
-1 >Emitted(13, 9) Source(18, 9) + SourceIndex(0)
-2 >Emitted(13, 25) Source(18, 25) + SourceIndex(0)
----
->>>        Point.origin = new Point(0, 0);
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^
-3 >                    ^^^
-4 >                       ^^^^
-5 >                           ^^^^^
-6 >                                ^
-7 >                                 ^
-8 >                                  ^^
-9 >                                    ^
-10>                                     ^
-11>                                      ^
-1->
-  >        static 
-2 >        origin
-3 >                     = 
-4 >                       new 
-5 >                           Point
-6 >                                (
-7 >                                 0
-8 >                                  , 
-9 >                                    0
-10>                                     )
-11>                                      ;
-1->Emitted(14, 9) Source(19, 16) + SourceIndex(0)
-2 >Emitted(14, 21) Source(19, 22) + SourceIndex(0)
-3 >Emitted(14, 24) Source(19, 25) + SourceIndex(0)
-4 >Emitted(14, 28) Source(19, 29) + SourceIndex(0)
-5 >Emitted(14, 33) Source(19, 34) + SourceIndex(0)
-6 >Emitted(14, 34) Source(19, 35) + SourceIndex(0)
-7 >Emitted(14, 35) Source(19, 36) + SourceIndex(0)
-8 >Emitted(14, 37) Source(19, 38) + SourceIndex(0)
-9 >Emitted(14, 38) Source(19, 39) + SourceIndex(0)
-10>Emitted(14, 39) Source(19, 40) + SourceIndex(0)
-11>Emitted(14, 40) Source(19, 41) + SourceIndex(0)
----
 >>>        return Point;
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1 >
+  >
+  >        // Static member
+  >        static origin = new Point(0, 0);
   >    
 2 >        }
-1 >Emitted(15, 9) Source(20, 5) + SourceIndex(0)
-2 >Emitted(15, 21) Source(20, 6) + SourceIndex(0)
+1 >Emitted(13, 9) Source(20, 5) + SourceIndex(0)
+2 >Emitted(13, 21) Source(20, 6) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
 2 >    ^
 3 >     
-4 >     ^^^^
-5 >         ^^^^^^^^^^^^^^^^^->
+4 >     ^^^^^^^^^^^^^^^^->
 1 >
 2 >    }
 3 >     
-4 >     export class Point implements IPoint {
-  >             // Constructor
-  >             constructor(public x: number, public y: number) { }
-  >     
-  >             // Instance member
-  >             getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
-  >     
-  >             // Static member
-  >             static origin = new Point(0, 0);
-  >         }
-1 >Emitted(16, 5) Source(20, 5) + SourceIndex(0)
-2 >Emitted(16, 6) Source(20, 6) + SourceIndex(0)
-3 >Emitted(16, 6) Source(11, 5) + SourceIndex(0)
-4 >Emitted(16, 10) Source(20, 6) + SourceIndex(0)
+1 >Emitted(14, 5) Source(20, 5) + SourceIndex(0)
+2 >Emitted(14, 6) Source(20, 6) + SourceIndex(0)
+3 >Emitted(14, 6) Source(11, 5) + SourceIndex(0)
+---
+>>>    // Static member
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^^^^^^^^->
+1->export class Point implements IPoint {
+  >        // Constructor
+  >        constructor(public x: number, public y: number) { }
+  >
+  >        // Instance member
+  >        getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
+  >
+  >        
+2 >    // Static member
+1->Emitted(15, 5) Source(18, 9) + SourceIndex(0)
+2 >Emitted(15, 21) Source(18, 25) + SourceIndex(0)
+---
+>>>    Point.origin = new Point(0, 0);
+1->^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^
+4 >                   ^^^^
+5 >                       ^^^^^
+6 >                            ^
+7 >                             ^
+8 >                              ^^
+9 >                                ^
+10>                                 ^
+11>                                  ^
+1->
+  >        static 
+2 >    origin
+3 >                 = 
+4 >                   new 
+5 >                       Point
+6 >                            (
+7 >                             0
+8 >                              , 
+9 >                                0
+10>                                 )
+11>                                  ;
+1->Emitted(16, 5) Source(19, 16) + SourceIndex(0)
+2 >Emitted(16, 17) Source(19, 22) + SourceIndex(0)
+3 >Emitted(16, 20) Source(19, 25) + SourceIndex(0)
+4 >Emitted(16, 24) Source(19, 29) + SourceIndex(0)
+5 >Emitted(16, 29) Source(19, 34) + SourceIndex(0)
+6 >Emitted(16, 30) Source(19, 35) + SourceIndex(0)
+7 >Emitted(16, 31) Source(19, 36) + SourceIndex(0)
+8 >Emitted(16, 33) Source(19, 38) + SourceIndex(0)
+9 >Emitted(16, 34) Source(19, 39) + SourceIndex(0)
+10>Emitted(16, 35) Source(19, 40) + SourceIndex(0)
+11>Emitted(16, 36) Source(19, 41) + SourceIndex(0)
 ---
 >>>    Shapes.Point = Point;
-1->^^^^
+1 >^^^^
 2 >    ^^^^^^^^^^^^
 3 >                ^^^^^^^^
 4 >                        ^
 5 >                         ^^^^^^^^^^^->
-1->
+1 >
 2 >    Point
 3 >                 implements IPoint {
   >                        // Constructor
@@ -370,7 +360,7 @@ sourceFile:sourceMap-FileWithComments.ts
   >                        static origin = new Point(0, 0);
   >                    }
 4 >                        
-1->Emitted(17, 5) Source(11, 18) + SourceIndex(0)
+1 >Emitted(17, 5) Source(11, 18) + SourceIndex(0)
 2 >Emitted(17, 17) Source(11, 23) + SourceIndex(0)
 3 >Emitted(17, 25) Source(20, 6) + SourceIndex(0)
 4 >Emitted(17, 26) Source(20, 6) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map
index 27ec5d732b8..c86a8937ed7 100644
--- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map
+++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map
@@ -1,2 +1,2 @@
 //// [sourceMap-StringLiteralWithNewLine.js.map]
-{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAQA,IAAO,GAAG,CAKT;AALD,WAAO,GAAG,EAAC,CAAC;IACR,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALM,GAAG,KAAH,GAAG,QAKT"}
\ No newline at end of file
+{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAQA,IAAO,GAAG,CAKT;AALD,WAAO,GAAG;IACN,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALM,GAAG,KAAH,GAAG,QAKT"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt
index dd0ccd40c27..f4c60842ea9 100644
--- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt
@@ -40,19 +40,13 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^
-4 >              ^^
-5 >                ^
-6 >                 ^^^^->
+4 >              ^^^^^^^->
 1->
 2 >module 
 3 >           Foo
-4 >               
-5 >                {
 1->Emitted(2, 1) Source(9, 1) + SourceIndex(0)
 2 >Emitted(2, 12) Source(9, 8) + SourceIndex(0)
 3 >Emitted(2, 15) Source(9, 11) + SourceIndex(0)
-4 >Emitted(2, 17) Source(9, 12) + SourceIndex(0)
-5 >Emitted(2, 18) Source(9, 13) + SourceIndex(0)
 ---
 >>>    var x = "test1";
 1->^^^^
@@ -61,7 +55,7 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts
 4 >         ^^^
 5 >            ^^^^^^^
 6 >                   ^
-1->
+1-> {
   >    
 2 >    var 
 3 >        x
diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map
index 7c97d8f302f..886f9be9842 100644
--- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map
+++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map]
-{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC,EAAC,CAAC;IACN;QACI,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALM,CAAC,KAAD,CAAC,QAKP"}
\ No newline at end of file
+{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC;IACJ;QACI,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALM,CAAC,KAAD,CAAC,QAKP"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt
index 0872b1f31eb..7dc91280e44 100644
--- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt
@@ -32,24 +32,18 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t
 1->
 2 >^^^^^^^^^^^
 3 >           ^
-4 >            ^^
-5 >              ^
-6 >               ^^^^->
+4 >            ^^^^^^^->
 1->
 2 >module 
 3 >           Q
-4 >             
-5 >              {
 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
 3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0)
-4 >Emitted(2, 15) Source(1, 10) + SourceIndex(0)
-5 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
 ---
 >>>    function P() {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >    
 1->Emitted(3, 5) Source(2, 5) + SourceIndex(0)
 ---
diff --git a/tests/baselines/reference/sourceMapSample.js.map b/tests/baselines/reference/sourceMapSample.js.map
index 0617ba4c1ba..783ff610f66 100644
--- a/tests/baselines/reference/sourceMapSample.js.map
+++ b/tests/baselines/reference/sourceMapSample.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapSample.js.map]
-{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAkCb;IAlCU,WAAA,GAAG,EAAC,CAAC;QACZ,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,aAAa,QAAgB;YACzB,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,cAAc,QAAgB;YAAE,uBAA0B;iBAA1B,WAA0B,CAA1B,sBAA0B,CAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAlCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAkCb;AAAD,CAAC,EAlCM,GAAG,KAAH,GAAG,QAkCT"}
\ No newline at end of file
+{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAkCb;IAlCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,aAAa,QAAgB;YACzB,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,cAAc,QAAgB;YAAE,uBAA0B;iBAA1B,UAA0B,EAA1B,qBAA0B,EAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAlCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAkCb;AAAD,CAAC,EAlCM,GAAG,KAAH,GAAG,QAkCT"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt
index 5b3251226b9..03ded2b6609 100644
--- a/tests/baselines/reference/sourceMapSample.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt
@@ -121,26 +121,20 @@ sourceFile:sourceMapSample.ts
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^^^
-4 >                  ^^
-5 >                    ^
-6 >                     ^->
+4 >                  ^^^^->
 1->
 2 >    
 3 >               Bar
-4 >                   
-5 >                    {
 1->Emitted(4, 5) Source(1, 12) + SourceIndex(0)
 2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0)
 3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0)
-4 >Emitted(4, 21) Source(1, 16) + SourceIndex(0)
-5 >Emitted(4, 22) Source(1, 17) + SourceIndex(0)
 ---
 >>>        "use strict";
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 3 >                    ^
 4 >                     ^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >    
 2 >        "use strict"
 3 >                    ;
@@ -431,21 +425,21 @@ sourceFile:sourceMapSample.ts
 ---
 >>>            for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^^^^^
-2 >                 ^^^^^^^^^^^
-3 >                            ^
-4 >                             ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                   ^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^
+5 >                                                  ^^
 6 >                                                    ^^^^
 1->
 2 >                 ...restGreetings: string[]
-3 >                            
+3 >                           
 4 >                             ...restGreetings: string[]
-5 >                                                   
+5 >                                                  
 6 >                                                    ...restGreetings: string[]
 1->Emitted(22, 18) Source(21, 37) + SourceIndex(0)
-2 >Emitted(22, 29) Source(21, 63) + SourceIndex(0)
+2 >Emitted(22, 28) Source(21, 63) + SourceIndex(0)
 3 >Emitted(22, 30) Source(21, 37) + SourceIndex(0)
-4 >Emitted(22, 52) Source(21, 63) + SourceIndex(0)
+4 >Emitted(22, 51) Source(21, 63) + SourceIndex(0)
 5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0)
 6 >Emitted(22, 57) Source(21, 63) + SourceIndex(0)
 ---
diff --git a/tests/baselines/reference/sourceMapValidationClass.js.map b/tests/baselines/reference/sourceMapValidationClass.js.map
index 6176f13bc51..8baf4772a27 100644
--- a/tests/baselines/reference/sourceMapValidationClass.js.map
+++ b/tests/baselines/reference/sourceMapValidationClass.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationClass.js.map]
-{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":[],"mappings":"AAAA;IACI,iBAAmB,QAAgB;QAAE,WAAc;aAAd,WAAc,CAAd,sBAAc,CAAd,IAAc;YAAd,0BAAc;;QAAhC,aAAQ,GAAR,QAAQ,CAAQ;QAM3B,OAAE,GAAW,EAAE,CAAC;IALxB,CAAC;IACD,uBAAK,GAAL;QACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5C,CAAC;IAGO,oBAAE,GAAV;QACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD,sBAAI,8BAAS;aAAb;YACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;aACD,UAAc,SAAiB;YAC3B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;;;OAHA;IAIL,cAAC;AAAD,CAAC,AAjBD,IAiBC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":[],"mappings":"AAAA;IACI,iBAAmB,QAAgB;QAAE,WAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,0BAAc;;QAAhC,aAAQ,GAAR,QAAQ,CAAQ;QAM3B,OAAE,GAAW,EAAE,CAAC;IALxB,CAAC;IACD,uBAAK,GAAL;QACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5C,CAAC;IAGO,oBAAE,GAAV;QACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD,sBAAI,8BAAS;aAAb;YACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;aACD,UAAc,SAAiB;YAC3B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;;;OAHA;IAIL,cAAC;AAAD,CAAC,AAjBD,IAiBC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
index 4173ae0ff0d..08fdfe2bfc6 100644
--- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
@@ -37,21 +37,21 @@ sourceFile:sourceMapValidationClass.ts
 ---
 >>>        for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^
-2 >             ^^^^^^^^^^^
-3 >                        ^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                               ^
+2 >             ^^^^^^^^^^
+3 >                       ^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^
+5 >                                              ^^
 6 >                                                ^^^^
 1->
 2 >             ...b: string[]
-3 >                        
+3 >                       
 4 >                         ...b: string[]
-5 >                                               
+5 >                                              
 6 >                                                ...b: string[]
 1->Emitted(4, 14) Source(2, 42) + SourceIndex(0)
-2 >Emitted(4, 25) Source(2, 56) + SourceIndex(0)
+2 >Emitted(4, 24) Source(2, 56) + SourceIndex(0)
 3 >Emitted(4, 26) Source(2, 42) + SourceIndex(0)
-4 >Emitted(4, 48) Source(2, 56) + SourceIndex(0)
+4 >Emitted(4, 47) Source(2, 56) + SourceIndex(0)
 5 >Emitted(4, 49) Source(2, 42) + SourceIndex(0)
 6 >Emitted(4, 53) Source(2, 56) + SourceIndex(0)
 ---
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
index 7dd53ed4b62..9c350133f2b 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map]
-{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;QAAsB,8BAAe;QAC1B,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,CAAsB,eAAe,GAGpC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;;QACW,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,CAAsB,eAAe,GAGpC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
index 5a3b2f86be9..f3052384651 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -82,27 +82,20 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >Emitted(13, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>        _super.apply(this, arguments);
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->class Greeter extends 
-2 >        AbstractGreeter
-1->Emitted(14, 9) Source(4, 23) + SourceIndex(0)
-2 >Emitted(14, 39) Source(4, 38) + SourceIndex(0)
----
 >>>        this.a = 10;
-1 >^^^^^^^^
+1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^^^
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > {
+1->class Greeter extends AbstractGreeter {
   >    public 
 2 >        a
 3 >               = 
 4 >                 10
 5 >                   ;
-1 >Emitted(15, 9) Source(5, 12) + SourceIndex(0)
+1->Emitted(15, 9) Source(5, 12) + SourceIndex(0)
 2 >Emitted(15, 15) Source(5, 13) + SourceIndex(0)
 3 >Emitted(15, 18) Source(5, 16) + SourceIndex(0)
 4 >Emitted(15, 20) Source(5, 18) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js
index 661892bc748..64517690f26 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.js
+++ b/tests/baselines/reference/sourceMapValidationClasses.js
@@ -59,7 +59,7 @@ var Foo;
         function foo2(greeting) {
             var restGreetings /* more greeting */ = [];
             for (var _i = 1; _i < arguments.length; _i++) {
-                restGreetings /* more greeting */[_i - 1] = arguments[_i];
+                restGreetings[_i - 1] = arguments[_i];
             }
             var greeters = []; /* inline block comment */
             greeters[0] = new Greeter(greeting);
diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map
index bddc7694f10..294ce8b315d 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.js.map
+++ b/tests/baselines/reference/sourceMapValidationClasses.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationClasses.js.map]
-{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAmCb;IAnCU,WAAA,GAAG,EAAC,CAAC;QACZ,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,aAAa,QAAgB;YACzB,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,cAAc,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,WAA8C,CAA9C,sBAA8C,CAA9C,IAA8C;gBAA9C,cAAiB,mBAAmB,yBAAU;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAnCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAmCb;AAAD,CAAC,EAnCM,GAAG,KAAH,GAAG,QAmCT"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAmCb;IAnCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,aAAa,QAAgB;YACzB,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,cAAc,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,UAA8C,EAA9C,qBAA8C,EAA9C,IAA8C;gBAA9C,sCAA8C;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAnCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAmCb;AAAD,CAAC,EAnCM,GAAG,KAAH,GAAG,QAmCT"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
index 29ad93cf74d..931c113ddc8 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
@@ -123,26 +123,20 @@ sourceFile:sourceMapValidationClasses.ts
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^^^
-4 >                  ^^
-5 >                    ^
-6 >                     ^->
+4 >                  ^^^^->
 1->
 2 >    
 3 >               Bar
-4 >                   
-5 >                    {
 1->Emitted(4, 5) Source(1, 12) + SourceIndex(0)
 2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0)
 3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0)
-4 >Emitted(4, 21) Source(1, 16) + SourceIndex(0)
-5 >Emitted(4, 22) Source(1, 17) + SourceIndex(0)
 ---
 >>>        "use strict";
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 3 >                    ^
 4 >                     ^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >    
 2 >        "use strict"
 3 >                    ;
@@ -439,38 +433,31 @@ sourceFile:sourceMapValidationClasses.ts
 ---
 >>>            for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^^^^^
-2 >                 ^^^^^^^^^^^
-3 >                            ^
-4 >                             ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                   ^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^
+5 >                                                  ^^
 6 >                                                    ^^^^
-7 >                                                        ^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                 ...restGreetings /* more greeting */: string[]
-3 >                            
+3 >                           
 4 >                             ...restGreetings /* more greeting */: string[]
-5 >                                                   
+5 >                                                  
 6 >                                                    ...restGreetings /* more greeting */: string[]
 1->Emitted(22, 18) Source(21, 37) + SourceIndex(0)
-2 >Emitted(22, 29) Source(21, 83) + SourceIndex(0)
+2 >Emitted(22, 28) Source(21, 83) + SourceIndex(0)
 3 >Emitted(22, 30) Source(21, 37) + SourceIndex(0)
-4 >Emitted(22, 52) Source(21, 83) + SourceIndex(0)
+4 >Emitted(22, 51) Source(21, 83) + SourceIndex(0)
 5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0)
 6 >Emitted(22, 57) Source(21, 83) + SourceIndex(0)
 ---
->>>                restGreetings /* more greeting */[_i - 1] = arguments[_i];
-1->^^^^^^^^^^^^^^^^
-2 >                ^^^^^^^^^^^^^^
-3 >                              ^^^^^^^^^^^^^^^^^^^
-4 >                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-2 >                ...restGreetings 
-3 >                              /* more greeting */
-4 >                                                 : string[]
-1->Emitted(23, 17) Source(21, 37) + SourceIndex(0)
-2 >Emitted(23, 31) Source(21, 54) + SourceIndex(0)
-3 >Emitted(23, 50) Source(21, 73) + SourceIndex(0)
-4 >Emitted(23, 75) Source(21, 83) + SourceIndex(0)
+>>>                restGreetings[_i - 1] = arguments[_i];
+1 >^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >                ...restGreetings /* more greeting */: string[]
+1 >Emitted(23, 17) Source(21, 37) + SourceIndex(0)
+2 >Emitted(23, 55) Source(21, 83) + SourceIndex(0)
 ---
 >>>            }
 >>>            var greeters = []; /* inline block comment */
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js b/tests/baselines/reference/sourceMapValidationDecorators.js
index c3bb5cd7225..63cdb25900c 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.js
+++ b/tests/baselines/reference/sourceMapValidationDecorators.js
@@ -88,37 +88,37 @@ var Greeter = (function () {
         enumerable: true,
         configurable: true
     });
-    Greeter.x1 = 10;
-    __decorate([
-        PropertyDecorator1,
-        PropertyDecorator2(40)
-    ], Greeter.prototype, "greet", null);
-    __decorate([
-        PropertyDecorator1,
-        PropertyDecorator2(50)
-    ], Greeter.prototype, "x", void 0);
-    __decorate([
-        __param(0, ParameterDecorator1),
-        __param(0, ParameterDecorator2(70))
-    ], Greeter.prototype, "fn", null);
-    __decorate([
-        PropertyDecorator1,
-        PropertyDecorator2(80),
-        __param(0, ParameterDecorator1),
-        __param(0, ParameterDecorator2(90))
-    ], Greeter.prototype, "greetings", null);
-    __decorate([
-        PropertyDecorator1,
-        PropertyDecorator2(60)
-    ], Greeter, "x1", void 0);
-    Greeter = __decorate([
-        ClassDecorator1,
-        ClassDecorator2(10),
-        __param(0, ParameterDecorator1),
-        __param(0, ParameterDecorator2(20)),
-        __param(1, ParameterDecorator1),
-        __param(1, ParameterDecorator2(30))
-    ], Greeter);
     return Greeter;
 }());
+Greeter.x1 = 10;
+__decorate([
+    PropertyDecorator1,
+    PropertyDecorator2(40)
+], Greeter.prototype, "greet", null);
+__decorate([
+    PropertyDecorator1,
+    PropertyDecorator2(50)
+], Greeter.prototype, "x", void 0);
+__decorate([
+    __param(0, ParameterDecorator1),
+    __param(0, ParameterDecorator2(70))
+], Greeter.prototype, "fn", null);
+__decorate([
+    PropertyDecorator1,
+    PropertyDecorator2(80),
+    __param(0, ParameterDecorator1),
+    __param(0, ParameterDecorator2(90))
+], Greeter.prototype, "greetings", null);
+__decorate([
+    PropertyDecorator1,
+    PropertyDecorator2(60)
+], Greeter, "x1", void 0);
+Greeter = __decorate([
+    ClassDecorator1,
+    ClassDecorator2(10),
+    __param(0, ParameterDecorator1),
+    __param(0, ParameterDecorator2(20)),
+    __param(1, ParameterDecorator1),
+    __param(1, ParameterDecorator2(30))
+], Greeter);
 //# sourceMappingURL=sourceMapValidationDecorators.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map
index 0a6b45eb383..535d6603d8c 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.js.map
+++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDecorators.js.map]
-{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":[],"mappings":";;;;;;;;;AASA;IACI,iBAGS,QAAgB;QAIvB,WAAc;aAAd,WAAc,CAAd,sBAAc,CAAd,IAAc;YAAd,0BAAc;;QAJP,aAAQ,GAAR,QAAQ,CAAQ;IAKzB,CAAC;IAID,uBAAK,GAAL;QACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5C,CAAC;IAUO,oBAAE,GAAV,UAGE,CAAS;QACP,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAID,sBAAI,8BAAS;aAAb;YACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;aAED,UAGE,SAAiB;YACf,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;;;OAPA;IAbc,UAAE,GAAW,EAAE,CAAC;IAZ/B;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;wCAAA;IAKvB;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;sCAAA;IAQrB;mBAAC,mBAAmB;mBACnB,mBAAmB,CAAC,EAAE,CAAC;qCAAA;IAK1B;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;mBAMpB,mBAAmB;mBACnB,mBAAmB,CAAC,EAAE,CAAC;4CAPH;IAZvB;QAAC,kBAAkB;QAClB,kBAAkB,CAAC,EAAE,CAAC;6BAAA;IAxB3B;QAAC,eAAe;QACf,eAAe,CAAC,EAAE,CAAC;mBAGb,mBAAmB;mBACnB,mBAAmB,CAAC,EAAE,CAAC;mBAGvB,mBAAmB;mBACnB,mBAAmB,CAAC,EAAE,CAAC;eARV;IA6CpB,cAAC;AAAD,CAAC,AA5CD,IA4CC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":[],"mappings":";;;;;;;;;AASA;IACI,iBAGS,QAAgB;QAIvB,WAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,0BAAc;;QAJP,aAAQ,GAAR,QAAQ,CAAQ;IAKzB,CAAC;IAID,uBAAK,GAAL;QACI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5C,CAAC;IAUO,oBAAE,GAAV,UAGE,CAAS;QACP,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAID,sBAAI,8BAAS;aAAb;YACI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;aAED,UAGE,SAAiB;YACf,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;;;OAPA;IAQL,cAAC;AAAD,CAAC,AA5CD,IA4CC;AArBkB,UAAE,GAAW,EAAE,CAAC;AAV/B;IAFC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;oCAGtB;AAID;IAFC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;kCACL;AAMlB;IACG,WAAA,mBAAmB,CAAA;IACnB,WAAA,mBAAmB,CAAC,EAAE,CAAC,CAAA;iCAGzB;AAID;IAFC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;IAMpB,WAAA,mBAAmB,CAAA;IACnB,WAAA,mBAAmB,CAAC,EAAE,CAAC,CAAA;wCAJzB;AAbD;IAFC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;yBACQ;AAvBnC;IAFC,eAAe;IACf,eAAe,CAAC,EAAE,CAAC;IAGb,WAAA,mBAAmB,CAAA;IACnB,WAAA,mBAAmB,CAAC,EAAE,CAAC,CAAA;IAGvB,WAAA,mBAAmB,CAAA;IACnB,WAAA,mBAAmB,CAAC,EAAE,CAAC,CAAA;WAqC7B"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
index 16820428856..37f6a4bea08 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
@@ -62,21 +62,21 @@ sourceFile:sourceMapValidationDecorators.ts
 ---
 >>>        for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^
-2 >             ^^^^^^^^^^^
-3 >                        ^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                               ^
+2 >             ^^^^^^^^^^
+3 >                       ^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^
+5 >                                              ^^
 6 >                                                ^^^^
 1->
 2 >             ...b: string[]
-3 >                        
+3 >                       
 4 >                         ...b: string[]
-5 >                                               
+5 >                                              
 6 >                                                ...b: string[]
 1->Emitted(13, 14) Source(18, 7) + SourceIndex(0)
-2 >Emitted(13, 25) Source(18, 21) + SourceIndex(0)
+2 >Emitted(13, 24) Source(18, 21) + SourceIndex(0)
 3 >Emitted(13, 26) Source(18, 7) + SourceIndex(0)
-4 >Emitted(13, 48) Source(18, 21) + SourceIndex(0)
+4 >Emitted(13, 47) Source(18, 21) + SourceIndex(0)
 5 >Emitted(13, 49) Source(18, 7) + SourceIndex(0)
 6 >Emitted(13, 53) Source(18, 21) + SourceIndex(0)
 ---
@@ -356,414 +356,14 @@ sourceFile:sourceMapValidationDecorators.ts
 >>>        configurable: true
 >>>    });
 1->^^^^^^^
-2 >       ^^^^^^^^^^^^^^->
+2 >       ^^^^^^^^^^^^^->
 1->
 1->Emitted(33, 8) Source(46, 6) + SourceIndex(0)
 ---
->>>    Greeter.x1 = 10;
-1->^^^^
-2 >    ^^^^^^^^^^
-3 >              ^^^
-4 >                 ^^
-5 >                   ^
-1->
-2 >    x1
-3 >              : number = 
-4 >                 10
-5 >                   ;
-1->Emitted(34, 5) Source(33, 20) + SourceIndex(0)
-2 >Emitted(34, 15) Source(33, 22) + SourceIndex(0)
-3 >Emitted(34, 18) Source(33, 33) + SourceIndex(0)
-4 >Emitted(34, 20) Source(33, 35) + SourceIndex(0)
-5 >Emitted(34, 21) Source(33, 36) + SourceIndex(0)
----
->>>    __decorate([
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-1 >Emitted(35, 5) Source(21, 5) + SourceIndex(0)
----
->>>        PropertyDecorator1,
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^^->
-1->@
-2 >        PropertyDecorator1
-1->Emitted(36, 9) Source(21, 6) + SourceIndex(0)
-2 >Emitted(36, 27) Source(21, 24) + SourceIndex(0)
----
->>>        PropertyDecorator2(40)
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^
-4 >                           ^^
-5 >                             ^
-6 >                              ^^^^^^^^^^^^->
-1->
-  >    @
-2 >        PropertyDecorator2
-3 >                          (
-4 >                           40
-5 >                             )
-1->Emitted(37, 9) Source(22, 6) + SourceIndex(0)
-2 >Emitted(37, 27) Source(22, 24) + SourceIndex(0)
-3 >Emitted(37, 28) Source(22, 25) + SourceIndex(0)
-4 >Emitted(37, 30) Source(22, 27) + SourceIndex(0)
-5 >Emitted(37, 31) Source(22, 28) + SourceIndex(0)
----
->>>    ], Greeter.prototype, "greet", null);
-1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(38, 41) Source(22, 28) + SourceIndex(0)
----
->>>    __decorate([
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >    greet() {
-  >        return "<h1>" + this.greeting + "</h1>";
-  >    }
-  >
-  >    
-1 >Emitted(39, 5) Source(27, 5) + SourceIndex(0)
----
->>>        PropertyDecorator1,
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^^->
-1->@
-2 >        PropertyDecorator1
-1->Emitted(40, 9) Source(27, 6) + SourceIndex(0)
-2 >Emitted(40, 27) Source(27, 24) + SourceIndex(0)
----
->>>        PropertyDecorator2(50)
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^
-4 >                           ^^
-5 >                             ^
-6 >                              ^^^^^^^^^^->
-1->
-  >    @
-2 >        PropertyDecorator2
-3 >                          (
-4 >                           50
-5 >                             )
-1->Emitted(41, 9) Source(28, 6) + SourceIndex(0)
-2 >Emitted(41, 27) Source(28, 24) + SourceIndex(0)
-3 >Emitted(41, 28) Source(28, 25) + SourceIndex(0)
-4 >Emitted(41, 30) Source(28, 27) + SourceIndex(0)
-5 >Emitted(41, 31) Source(28, 28) + SourceIndex(0)
----
->>>    ], Greeter.prototype, "x", void 0);
-1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(42, 39) Source(28, 28) + SourceIndex(0)
----
->>>    __decorate([
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >    private x: string;
-  >
-  >    @PropertyDecorator1
-  >    @PropertyDecorator2(60)
-  >    private static x1: number = 10;
-  >    
-  >    private fn(
-  >      
-1 >Emitted(43, 5) Source(36, 7) + SourceIndex(0)
----
->>>        __param(0, ParameterDecorator1),
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^^^^^^->
-1->@
-2 >                   ParameterDecorator1
-1->Emitted(44, 20) Source(36, 8) + SourceIndex(0)
-2 >Emitted(44, 39) Source(36, 27) + SourceIndex(0)
----
->>>        __param(0, ParameterDecorator2(70))
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^
-4 >                                       ^^
-5 >                                         ^
-1-> 
-  >      @
-2 >                   ParameterDecorator2
-3 >                                      (
-4 >                                       70
-5 >                                         )
-1->Emitted(45, 20) Source(37, 8) + SourceIndex(0)
-2 >Emitted(45, 39) Source(37, 27) + SourceIndex(0)
-3 >Emitted(45, 40) Source(37, 28) + SourceIndex(0)
-4 >Emitted(45, 42) Source(37, 30) + SourceIndex(0)
-5 >Emitted(45, 43) Source(37, 31) + SourceIndex(0)
----
->>>    ], Greeter.prototype, "fn", null);
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-1 >Emitted(46, 38) Source(37, 31) + SourceIndex(0)
----
->>>    __decorate([
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
-  >      x: number) {
-  >        return this.greeting;
-  >    }
-  >
-  >    
-1 >Emitted(47, 5) Source(42, 5) + SourceIndex(0)
----
->>>        PropertyDecorator1,
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^^^->
-1->@
-2 >        PropertyDecorator1
-1->Emitted(48, 9) Source(42, 6) + SourceIndex(0)
-2 >Emitted(48, 27) Source(42, 24) + SourceIndex(0)
----
->>>        PropertyDecorator2(80),
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^
-4 >                           ^^
-5 >                             ^
-6 >                              ^^^^^^^^^^^->
-1->
-  >    @
-2 >        PropertyDecorator2
-3 >                          (
-4 >                           80
-5 >                             )
-1->Emitted(49, 9) Source(43, 6) + SourceIndex(0)
-2 >Emitted(49, 27) Source(43, 24) + SourceIndex(0)
-3 >Emitted(49, 28) Source(43, 25) + SourceIndex(0)
-4 >Emitted(49, 30) Source(43, 27) + SourceIndex(0)
-5 >Emitted(49, 31) Source(43, 28) + SourceIndex(0)
----
->>>        __param(0, ParameterDecorator1),
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^^^^^^->
-1->
-  >    get greetings() {
-  >        return this.greeting;
-  >    }
-  >
-  >    set greetings(
-  >      @
-2 >                   ParameterDecorator1
-1->Emitted(50, 20) Source(49, 8) + SourceIndex(0)
-2 >Emitted(50, 39) Source(49, 27) + SourceIndex(0)
----
->>>        __param(0, ParameterDecorator2(90))
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^
-4 >                                       ^^
-5 >                                         ^
-6 >                                          ^^^^->
-1-> 
-  >      @
-2 >                   ParameterDecorator2
-3 >                                      (
-4 >                                       90
-5 >                                         )
-1->Emitted(51, 20) Source(50, 8) + SourceIndex(0)
-2 >Emitted(51, 39) Source(50, 27) + SourceIndex(0)
-3 >Emitted(51, 40) Source(50, 28) + SourceIndex(0)
-4 >Emitted(51, 42) Source(50, 30) + SourceIndex(0)
-5 >Emitted(51, 43) Source(50, 31) + SourceIndex(0)
----
->>>    ], Greeter.prototype, "greetings", null);
-1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(52, 45) Source(43, 28) + SourceIndex(0)
----
->>>    __decorate([
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-1 >Emitted(53, 5) Source(31, 5) + SourceIndex(0)
----
->>>        PropertyDecorator1,
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^^->
-1->@
-2 >        PropertyDecorator1
-1->Emitted(54, 9) Source(31, 6) + SourceIndex(0)
-2 >Emitted(54, 27) Source(31, 24) + SourceIndex(0)
----
->>>        PropertyDecorator2(60)
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^^^^
-3 >                          ^
-4 >                           ^^
-5 >                             ^
-6 >                              ^->
-1->
-  >    @
-2 >        PropertyDecorator2
-3 >                          (
-4 >                           60
-5 >                             )
-1->Emitted(55, 9) Source(32, 6) + SourceIndex(0)
-2 >Emitted(55, 27) Source(32, 24) + SourceIndex(0)
-3 >Emitted(55, 28) Source(32, 25) + SourceIndex(0)
-4 >Emitted(55, 30) Source(32, 27) + SourceIndex(0)
-5 >Emitted(55, 31) Source(32, 28) + SourceIndex(0)
----
->>>    ], Greeter, "x1", void 0);
-1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(56, 30) Source(32, 28) + SourceIndex(0)
----
->>>    Greeter = __decorate([
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^->
-1 >
-1 >Emitted(57, 5) Source(8, 1) + SourceIndex(0)
----
->>>        ClassDecorator1,
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^
-3 >                       ^^^^^^->
-1->@
-2 >        ClassDecorator1
-1->Emitted(58, 9) Source(8, 2) + SourceIndex(0)
-2 >Emitted(58, 24) Source(8, 17) + SourceIndex(0)
----
->>>        ClassDecorator2(10),
-1->^^^^^^^^
-2 >        ^^^^^^^^^^^^^^^
-3 >                       ^
-4 >                        ^^
-5 >                          ^
-6 >                           ^^^^^^^^^^^^^^->
-1->
-  >@
-2 >        ClassDecorator2
-3 >                       (
-4 >                        10
-5 >                          )
-1->Emitted(59, 9) Source(9, 2) + SourceIndex(0)
-2 >Emitted(59, 24) Source(9, 17) + SourceIndex(0)
-3 >Emitted(59, 25) Source(9, 18) + SourceIndex(0)
-4 >Emitted(59, 27) Source(9, 20) + SourceIndex(0)
-5 >Emitted(59, 28) Source(9, 21) + SourceIndex(0)
----
->>>        __param(0, ParameterDecorator1),
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^^^^^^^->
-1->
-  >class Greeter {
-  >    constructor(
-  >      @
-2 >                   ParameterDecorator1
-1->Emitted(60, 20) Source(12, 8) + SourceIndex(0)
-2 >Emitted(60, 39) Source(12, 27) + SourceIndex(0)
----
->>>        __param(0, ParameterDecorator2(20)),
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^
-4 >                                       ^^
-5 >                                         ^
-1-> 
-  >      @
-2 >                   ParameterDecorator2
-3 >                                      (
-4 >                                       20
-5 >                                         )
-1->Emitted(61, 20) Source(13, 8) + SourceIndex(0)
-2 >Emitted(61, 39) Source(13, 27) + SourceIndex(0)
-3 >Emitted(61, 40) Source(13, 28) + SourceIndex(0)
-4 >Emitted(61, 42) Source(13, 30) + SourceIndex(0)
-5 >Emitted(61, 43) Source(13, 31) + SourceIndex(0)
----
->>>        __param(1, ParameterDecorator1),
-1 >^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^^^^^^->
-1 > 
-  >      public greeting: string, 
-  >      
-  >      @
-2 >                   ParameterDecorator1
-1 >Emitted(62, 20) Source(16, 8) + SourceIndex(0)
-2 >Emitted(62, 39) Source(16, 27) + SourceIndex(0)
----
->>>        __param(1, ParameterDecorator2(30))
-1->^^^^^^^^^^^^^^^^^^^
-2 >                   ^^^^^^^^^^^^^^^^^^^
-3 >                                      ^
-4 >                                       ^^
-5 >                                         ^
-1-> 
-  >      @
-2 >                   ParameterDecorator2
-3 >                                      (
-4 >                                       30
-5 >                                         )
-1->Emitted(63, 20) Source(17, 8) + SourceIndex(0)
-2 >Emitted(63, 39) Source(17, 27) + SourceIndex(0)
-3 >Emitted(63, 40) Source(17, 28) + SourceIndex(0)
-4 >Emitted(63, 42) Source(17, 30) + SourceIndex(0)
-5 >Emitted(63, 43) Source(17, 31) + SourceIndex(0)
----
->>>    ], Greeter);
-1 >^^^^^^^^^^^^^^^
-2 >               ^^^^^->
-1 >
-1 >Emitted(64, 16) Source(9, 21) + SourceIndex(0)
----
 >>>    return Greeter;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
-  >class Greeter {
-  >    constructor(
-  >      @ParameterDecorator1 
-  >      @ParameterDecorator2(20) 
-  >      public greeting: string, 
-  >      
-  >      @ParameterDecorator1 
-  >      @ParameterDecorator2(30) 
-  >      ...b: string[]) {
-  >    }
-  >    
-  >    @PropertyDecorator1
-  >    @PropertyDecorator2(40)
-  >    greet() {
-  >        return "<h1>" + this.greeting + "</h1>";
-  >    }
-  >
-  >    @PropertyDecorator1
-  >    @PropertyDecorator2(50)
-  >    private x: string;
-  >
-  >    @PropertyDecorator1
-  >    @PropertyDecorator2(60)
-  >    private static x1: number = 10;
-  >    
-  >    private fn(
-  >      @ParameterDecorator1 
-  >      @ParameterDecorator2(70) 
-  >      x: number) {
-  >        return this.greeting;
-  >    }
-  >
-  >    @PropertyDecorator1
-  >    @PropertyDecorator2(80)
-  >    get greetings() {
-  >        return this.greeting;
-  >    }
   >
   >    set greetings(
   >      @ParameterDecorator1 
@@ -773,15 +373,15 @@ sourceFile:sourceMapValidationDecorators.ts
   >    }    
   >
 2 >    }
-1->Emitted(65, 5) Source(54, 1) + SourceIndex(0)
-2 >Emitted(65, 19) Source(54, 2) + SourceIndex(0)
+1->Emitted(34, 5) Source(54, 1) + SourceIndex(0)
+2 >Emitted(34, 19) Source(54, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >     ^^^^^^^^^^^^->
 1 >
 2 >}
 3 > 
@@ -830,9 +430,462 @@ sourceFile:sourceMapValidationDecorators.ts
   >         this.greeting = greetings;
   >     }    
   > }
-1 >Emitted(66, 1) Source(54, 1) + SourceIndex(0)
-2 >Emitted(66, 2) Source(54, 2) + SourceIndex(0)
-3 >Emitted(66, 2) Source(10, 1) + SourceIndex(0)
-4 >Emitted(66, 6) Source(54, 2) + SourceIndex(0)
+1 >Emitted(35, 1) Source(54, 1) + SourceIndex(0)
+2 >Emitted(35, 2) Source(54, 2) + SourceIndex(0)
+3 >Emitted(35, 2) Source(10, 1) + SourceIndex(0)
+4 >Emitted(35, 6) Source(54, 2) + SourceIndex(0)
+---
+>>>Greeter.x1 = 10;
+1->
+2 >^^^^^^^^^^
+3 >          ^^^
+4 >             ^^
+5 >               ^
+1->
+2 >x1
+3 >          : number = 
+4 >             10
+5 >               ;
+1->Emitted(36, 1) Source(33, 20) + SourceIndex(0)
+2 >Emitted(36, 11) Source(33, 22) + SourceIndex(0)
+3 >Emitted(36, 14) Source(33, 33) + SourceIndex(0)
+4 >Emitted(36, 16) Source(33, 35) + SourceIndex(0)
+5 >Emitted(36, 17) Source(33, 36) + SourceIndex(0)
+---
+>>>__decorate([
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(37, 1) Source(23, 5) + SourceIndex(0)
+---
+>>>    PropertyDecorator1,
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^->
+1->
+2 >    PropertyDecorator1
+1->Emitted(38, 5) Source(21, 6) + SourceIndex(0)
+2 >Emitted(38, 23) Source(21, 24) + SourceIndex(0)
+---
+>>>    PropertyDecorator2(40)
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^
+4 >                       ^^
+5 >                         ^
+6 >                          ^^^^^^^^^^^^->
+1->
+  >    @
+2 >    PropertyDecorator2
+3 >                      (
+4 >                       40
+5 >                         )
+1->Emitted(39, 5) Source(22, 6) + SourceIndex(0)
+2 >Emitted(39, 23) Source(22, 24) + SourceIndex(0)
+3 >Emitted(39, 24) Source(22, 25) + SourceIndex(0)
+4 >Emitted(39, 26) Source(22, 27) + SourceIndex(0)
+5 >Emitted(39, 27) Source(22, 28) + SourceIndex(0)
+---
+>>>], Greeter.prototype, "greet", null);
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >    greet() {
+  >        return "<h1>" + this.greeting + "</h1>";
+  >    }
+1->Emitted(40, 37) Source(25, 6) + SourceIndex(0)
+---
+>>>__decorate([
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(50)
+  >    
+1 >Emitted(41, 1) Source(29, 5) + SourceIndex(0)
+---
+>>>    PropertyDecorator1,
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^->
+1->
+2 >    PropertyDecorator1
+1->Emitted(42, 5) Source(27, 6) + SourceIndex(0)
+2 >Emitted(42, 23) Source(27, 24) + SourceIndex(0)
+---
+>>>    PropertyDecorator2(50)
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^
+4 >                       ^^
+5 >                         ^
+6 >                          ^^^^^^^^^^->
+1->
+  >    @
+2 >    PropertyDecorator2
+3 >                      (
+4 >                       50
+5 >                         )
+1->Emitted(43, 5) Source(28, 6) + SourceIndex(0)
+2 >Emitted(43, 23) Source(28, 24) + SourceIndex(0)
+3 >Emitted(43, 24) Source(28, 25) + SourceIndex(0)
+4 >Emitted(43, 26) Source(28, 27) + SourceIndex(0)
+5 >Emitted(43, 27) Source(28, 28) + SourceIndex(0)
+---
+>>>], Greeter.prototype, "x", void 0);
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >    private x: string;
+1->Emitted(44, 35) Source(29, 23) + SourceIndex(0)
+---
+>>>__decorate([
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(60)
+  >    private static x1: number = 10;
+  >    
+  >    
+1 >Emitted(45, 1) Source(35, 5) + SourceIndex(0)
+---
+>>>    __param(0, ParameterDecorator1),
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^->
+1->private fn(
+  >      @
+2 >    
+3 >               ParameterDecorator1
+4 >                                  
+1->Emitted(46, 5) Source(36, 8) + SourceIndex(0)
+2 >Emitted(46, 16) Source(36, 8) + SourceIndex(0)
+3 >Emitted(46, 35) Source(36, 27) + SourceIndex(0)
+4 >Emitted(46, 36) Source(36, 27) + SourceIndex(0)
+---
+>>>    __param(0, ParameterDecorator2(70))
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
+1-> 
+  >      @
+2 >    
+3 >               ParameterDecorator2
+4 >                                  (
+5 >                                   70
+6 >                                     )
+7 >                                      
+1->Emitted(47, 5) Source(37, 8) + SourceIndex(0)
+2 >Emitted(47, 16) Source(37, 8) + SourceIndex(0)
+3 >Emitted(47, 35) Source(37, 27) + SourceIndex(0)
+4 >Emitted(47, 36) Source(37, 28) + SourceIndex(0)
+5 >Emitted(47, 38) Source(37, 30) + SourceIndex(0)
+6 >Emitted(47, 39) Source(37, 31) + SourceIndex(0)
+7 >Emitted(47, 40) Source(37, 31) + SourceIndex(0)
+---
+>>>], Greeter.prototype, "fn", null);
+1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 > 
+  >      x: number) {
+  >        return this.greeting;
+  >    }
+1 >Emitted(48, 34) Source(40, 6) + SourceIndex(0)
+---
+>>>__decorate([
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(80)
+  >    
+1 >Emitted(49, 1) Source(44, 5) + SourceIndex(0)
+---
+>>>    PropertyDecorator1,
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^^->
+1->
+2 >    PropertyDecorator1
+1->Emitted(50, 5) Source(42, 6) + SourceIndex(0)
+2 >Emitted(50, 23) Source(42, 24) + SourceIndex(0)
+---
+>>>    PropertyDecorator2(80),
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^
+4 >                       ^^
+5 >                         ^
+6 >                          ^^^^^^^^^^^->
+1->
+  >    @
+2 >    PropertyDecorator2
+3 >                      (
+4 >                       80
+5 >                         )
+1->Emitted(51, 5) Source(43, 6) + SourceIndex(0)
+2 >Emitted(51, 23) Source(43, 24) + SourceIndex(0)
+3 >Emitted(51, 24) Source(43, 25) + SourceIndex(0)
+4 >Emitted(51, 26) Source(43, 27) + SourceIndex(0)
+5 >Emitted(51, 27) Source(43, 28) + SourceIndex(0)
+---
+>>>    __param(0, ParameterDecorator1),
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^->
+1->
+  >    get greetings() {
+  >        return this.greeting;
+  >    }
+  >
+  >    set greetings(
+  >      @
+2 >    
+3 >               ParameterDecorator1
+4 >                                  
+1->Emitted(52, 5) Source(49, 8) + SourceIndex(0)
+2 >Emitted(52, 16) Source(49, 8) + SourceIndex(0)
+3 >Emitted(52, 35) Source(49, 27) + SourceIndex(0)
+4 >Emitted(52, 36) Source(49, 27) + SourceIndex(0)
+---
+>>>    __param(0, ParameterDecorator2(90))
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
+8 >                                       ^^^->
+1-> 
+  >      @
+2 >    
+3 >               ParameterDecorator2
+4 >                                  (
+5 >                                   90
+6 >                                     )
+7 >                                      
+1->Emitted(53, 5) Source(50, 8) + SourceIndex(0)
+2 >Emitted(53, 16) Source(50, 8) + SourceIndex(0)
+3 >Emitted(53, 35) Source(50, 27) + SourceIndex(0)
+4 >Emitted(53, 36) Source(50, 28) + SourceIndex(0)
+5 >Emitted(53, 38) Source(50, 30) + SourceIndex(0)
+6 >Emitted(53, 39) Source(50, 31) + SourceIndex(0)
+7 >Emitted(53, 40) Source(50, 31) + SourceIndex(0)
+---
+>>>], Greeter.prototype, "greetings", null);
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+1->Emitted(54, 41) Source(46, 6) + SourceIndex(0)
+---
+>>>__decorate([
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(55, 1) Source(33, 5) + SourceIndex(0)
+---
+>>>    PropertyDecorator1,
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^^^^->
+1->
+2 >    PropertyDecorator1
+1->Emitted(56, 5) Source(31, 6) + SourceIndex(0)
+2 >Emitted(56, 23) Source(31, 24) + SourceIndex(0)
+---
+>>>    PropertyDecorator2(60)
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^
+4 >                       ^^
+5 >                         ^
+6 >                          ^->
+1->
+  >    @
+2 >    PropertyDecorator2
+3 >                      (
+4 >                       60
+5 >                         )
+1->Emitted(57, 5) Source(32, 6) + SourceIndex(0)
+2 >Emitted(57, 23) Source(32, 24) + SourceIndex(0)
+3 >Emitted(57, 24) Source(32, 25) + SourceIndex(0)
+4 >Emitted(57, 26) Source(32, 27) + SourceIndex(0)
+5 >Emitted(57, 27) Source(32, 28) + SourceIndex(0)
+---
+>>>], Greeter, "x1", void 0);
+1->^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >    private static x1: number = 10;
+1->Emitted(58, 26) Source(33, 36) + SourceIndex(0)
+---
+>>>Greeter = __decorate([
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(59, 1) Source(10, 1) + SourceIndex(0)
+---
+>>>    ClassDecorator1,
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^
+3 >                   ^^^^^^->
+1->
+2 >    ClassDecorator1
+1->Emitted(60, 5) Source(8, 2) + SourceIndex(0)
+2 >Emitted(60, 20) Source(8, 17) + SourceIndex(0)
+---
+>>>    ClassDecorator2(10),
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^
+3 >                   ^
+4 >                    ^^
+5 >                      ^
+6 >                       ^^^^^^^^^^^^^^->
+1->
+  >@
+2 >    ClassDecorator2
+3 >                   (
+4 >                    10
+5 >                      )
+1->Emitted(61, 5) Source(9, 2) + SourceIndex(0)
+2 >Emitted(61, 20) Source(9, 17) + SourceIndex(0)
+3 >Emitted(61, 21) Source(9, 18) + SourceIndex(0)
+4 >Emitted(61, 23) Source(9, 20) + SourceIndex(0)
+5 >Emitted(61, 24) Source(9, 21) + SourceIndex(0)
+---
+>>>    __param(0, ParameterDecorator1),
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^^->
+1->
+  >class Greeter {
+  >    constructor(
+  >      @
+2 >    
+3 >               ParameterDecorator1
+4 >                                  
+1->Emitted(62, 5) Source(12, 8) + SourceIndex(0)
+2 >Emitted(62, 16) Source(12, 8) + SourceIndex(0)
+3 >Emitted(62, 35) Source(12, 27) + SourceIndex(0)
+4 >Emitted(62, 36) Source(12, 27) + SourceIndex(0)
+---
+>>>    __param(0, ParameterDecorator2(20)),
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
+1-> 
+  >      @
+2 >    
+3 >               ParameterDecorator2
+4 >                                  (
+5 >                                   20
+6 >                                     )
+7 >                                      
+1->Emitted(63, 5) Source(13, 8) + SourceIndex(0)
+2 >Emitted(63, 16) Source(13, 8) + SourceIndex(0)
+3 >Emitted(63, 35) Source(13, 27) + SourceIndex(0)
+4 >Emitted(63, 36) Source(13, 28) + SourceIndex(0)
+5 >Emitted(63, 38) Source(13, 30) + SourceIndex(0)
+6 >Emitted(63, 39) Source(13, 31) + SourceIndex(0)
+7 >Emitted(63, 40) Source(13, 31) + SourceIndex(0)
+---
+>>>    __param(1, ParameterDecorator1),
+1 >^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^->
+1 > 
+  >      public greeting: string, 
+  >      
+  >      @
+2 >    
+3 >               ParameterDecorator1
+4 >                                  
+1 >Emitted(64, 5) Source(16, 8) + SourceIndex(0)
+2 >Emitted(64, 16) Source(16, 8) + SourceIndex(0)
+3 >Emitted(64, 35) Source(16, 27) + SourceIndex(0)
+4 >Emitted(64, 36) Source(16, 27) + SourceIndex(0)
+---
+>>>    __param(1, ParameterDecorator2(30))
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
+1-> 
+  >      @
+2 >    
+3 >               ParameterDecorator2
+4 >                                  (
+5 >                                   30
+6 >                                     )
+7 >                                      
+1->Emitted(65, 5) Source(17, 8) + SourceIndex(0)
+2 >Emitted(65, 16) Source(17, 8) + SourceIndex(0)
+3 >Emitted(65, 35) Source(17, 27) + SourceIndex(0)
+4 >Emitted(65, 36) Source(17, 28) + SourceIndex(0)
+5 >Emitted(65, 38) Source(17, 30) + SourceIndex(0)
+6 >Emitted(65, 39) Source(17, 31) + SourceIndex(0)
+7 >Emitted(65, 40) Source(17, 31) + SourceIndex(0)
+---
+>>>], Greeter);
+1 >^^^^^^^^^^^
+2 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
+  >      ...b: string[]) {
+  >    }
+  >    
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(40)
+  >    greet() {
+  >        return "<h1>" + this.greeting + "</h1>";
+  >    }
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(50)
+  >    private x: string;
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(60)
+  >    private static x1: number = 10;
+  >    
+  >    private fn(
+  >      @ParameterDecorator1 
+  >      @ParameterDecorator2(70) 
+  >      x: number) {
+  >        return this.greeting;
+  >    }
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(80)
+  >    get greetings() {
+  >        return this.greeting;
+  >    }
+  >
+  >    set greetings(
+  >      @ParameterDecorator1 
+  >      @ParameterDecorator2(90) 
+  >      greetings: string) {
+  >        this.greeting = greetings;
+  >    }    
+  >}
+1 >Emitted(66, 12) Source(54, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationDecorators.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.js.map
index 0ee4a2092e7..79073166e0f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForArrayBindingPattern.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPattern.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAQ,qBAAK,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAA0B,EAAnB,aAAK,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,+BAA0C,EAAnC,aAAK,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAQ,uBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,oBAA0D,EAAnD,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,wCAA8E,EAAvE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAA0C,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAM,uBAAO,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,2BAAO,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,2CAAO,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,0BAAK,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,8BAAK,EAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,kDAAK,EAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAM,wBAAQ,EAAE,kBAAM,EAAE,mBAAO,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAA4C,EAAvC,gBAAQ,EAAE,cAAM,EAAE,eAAO,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,+BAA4D,EAAvD,gBAAQ,EAAE,cAAM,EAAE,eAAO,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAM,2BAAM,EAAE,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,oBAAgE,EAA3D,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,wCAAoF,EAA/E,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAA0C,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAM,wBAAQ,EAAE,4BAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAA0C,EAArC,gBAAQ,EAAE,wBAAa,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,+BAA0D,EAArD,gBAAQ,EAAE,wBAAa,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAM,0CAAkB,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAM,8CAAkB,EAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAM,kEAAkB,EAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPattern.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAQ,IAAA,iBAAK,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAAsB,EAAnB,aAAK,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,+BAAsC,EAAnC,aAAK,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAQ,IAAA,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,oBAAsD,EAAnD,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,wCAA0E,EAAvE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAA0C,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,mBAAO,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,uBAAO,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,uCAAO,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,sBAAK,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,0BAAK,EAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,8CAAK,EAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,oBAAQ,EAAE,kBAAM,EAAE,mBAAO,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAAwC,EAAvC,gBAAQ,EAAE,cAAM,EAAE,eAAO,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,+BAAwD,EAAvD,gBAAQ,EAAE,cAAM,EAAE,eAAO,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,uBAAM,EAAE,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,oBAA4D,EAA3D,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,wCAAgF,EAA/E,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAA0C,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,oBAAQ,EAAE,4BAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAAsC,EAArC,gBAAQ,EAAE,wBAAa,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,+BAAsD,EAArD,gBAAQ,EAAE,wBAAa,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,sCAAkB,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,0CAAkB,EAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,8DAAkB,EAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.sourcemap.txt
index e7ee5c01f2c..d0dbc25229c 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.sourcemap.txt
@@ -219,58 +219,61 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^
-6 >                          ^^
-7 >                            ^
-8 >                             ^^^
-9 >                                ^
-10>                                 ^^
-11>                                   ^
-12>                                    ^^^
-13>                                       ^
-14>                                        ^^
-15>                                          ^
-16>                                           ^^
-17>                                             ^^
-18>                                               ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^
+7 >                          ^^
+8 >                            ^
+9 >                             ^^^
+10>                                ^
+11>                                 ^^
+12>                                   ^
+13>                                    ^^^
+14>                                       ^
+15>                                        ^^
+16>                                          ^
+17>                                           ^^
+18>                                             ^^
+19>                                               ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [, 
-5 >     nameA
-6 >                          ] = robotA, 
-7 >                            i
-8 >                              = 
-9 >                                0
-10>                                 ; 
-11>                                   i
-12>                                     < 
-13>                                       1
-14>                                        ; 
-15>                                          i
-16>                                           ++
-17>                                             ) 
-18>                                               {
+5 >     
+6 >         nameA
+7 >                          ] = robotA, 
+8 >                            i
+9 >                              = 
+10>                                0
+11>                                 ; 
+12>                                   i
+13>                                     < 
+14>                                       1
+15>                                        ; 
+16>                                          i
+17>                                           ++
+18>                                             ) 
+19>                                               {
 1->Emitted(10, 1) Source(18, 1) + SourceIndex(0)
 2 >Emitted(10, 4) Source(18, 4) + SourceIndex(0)
 3 >Emitted(10, 5) Source(18, 5) + SourceIndex(0)
 4 >Emitted(10, 6) Source(18, 13) + SourceIndex(0)
-5 >Emitted(10, 27) Source(18, 18) + SourceIndex(0)
-6 >Emitted(10, 29) Source(18, 30) + SourceIndex(0)
-7 >Emitted(10, 30) Source(18, 31) + SourceIndex(0)
-8 >Emitted(10, 33) Source(18, 34) + SourceIndex(0)
-9 >Emitted(10, 34) Source(18, 35) + SourceIndex(0)
-10>Emitted(10, 36) Source(18, 37) + SourceIndex(0)
-11>Emitted(10, 37) Source(18, 38) + SourceIndex(0)
-12>Emitted(10, 40) Source(18, 41) + SourceIndex(0)
-13>Emitted(10, 41) Source(18, 42) + SourceIndex(0)
-14>Emitted(10, 43) Source(18, 44) + SourceIndex(0)
-15>Emitted(10, 44) Source(18, 45) + SourceIndex(0)
-16>Emitted(10, 46) Source(18, 47) + SourceIndex(0)
-17>Emitted(10, 48) Source(18, 49) + SourceIndex(0)
-18>Emitted(10, 49) Source(18, 50) + SourceIndex(0)
+5 >Emitted(10, 10) Source(18, 13) + SourceIndex(0)
+6 >Emitted(10, 27) Source(18, 18) + SourceIndex(0)
+7 >Emitted(10, 29) Source(18, 30) + SourceIndex(0)
+8 >Emitted(10, 30) Source(18, 31) + SourceIndex(0)
+9 >Emitted(10, 33) Source(18, 34) + SourceIndex(0)
+10>Emitted(10, 34) Source(18, 35) + SourceIndex(0)
+11>Emitted(10, 36) Source(18, 37) + SourceIndex(0)
+12>Emitted(10, 37) Source(18, 38) + SourceIndex(0)
+13>Emitted(10, 40) Source(18, 41) + SourceIndex(0)
+14>Emitted(10, 41) Source(18, 42) + SourceIndex(0)
+15>Emitted(10, 43) Source(18, 44) + SourceIndex(0)
+16>Emitted(10, 44) Source(18, 45) + SourceIndex(0)
+17>Emitted(10, 46) Source(18, 47) + SourceIndex(0)
+18>Emitted(10, 48) Source(18, 49) + SourceIndex(0)
+19>Emitted(10, 49) Source(18, 50) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -335,9 +338,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, nameA] = getRobot()
+6 >         [, nameA] = getRobot()
 7 >                        
 8 >                          nameA
 9 >                                       ] = getRobot(), 
@@ -356,8 +359,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(13, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(13, 4) Source(21, 4) + SourceIndex(0)
 3 >Emitted(13, 5) Source(21, 5) + SourceIndex(0)
-4 >Emitted(13, 6) Source(21, 6) + SourceIndex(0)
-5 >Emitted(13, 10) Source(21, 6) + SourceIndex(0)
+4 >Emitted(13, 6) Source(21, 10) + SourceIndex(0)
+5 >Emitted(13, 10) Source(21, 10) + SourceIndex(0)
 6 >Emitted(13, 25) Source(21, 32) + SourceIndex(0)
 7 >Emitted(13, 27) Source(21, 13) + SourceIndex(0)
 8 >Emitted(13, 40) Source(21, 18) + SourceIndex(0)
@@ -438,9 +441,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, nameA] = [2, "trimmer", "trimming"]
+6 >         [, nameA] = [2, "trimmer", "trimming"]
 7 >                                        
 8 >                                          nameA
 9 >                                                       ] = [2, "trimmer", "trimming"], 
@@ -459,8 +462,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(16, 1) Source(24, 1) + SourceIndex(0)
 2 >Emitted(16, 4) Source(24, 4) + SourceIndex(0)
 3 >Emitted(16, 5) Source(24, 5) + SourceIndex(0)
-4 >Emitted(16, 6) Source(24, 6) + SourceIndex(0)
-5 >Emitted(16, 10) Source(24, 6) + SourceIndex(0)
+4 >Emitted(16, 6) Source(24, 10) + SourceIndex(0)
+5 >Emitted(16, 10) Source(24, 10) + SourceIndex(0)
 6 >Emitted(16, 41) Source(24, 48) + SourceIndex(0)
 7 >Emitted(16, 43) Source(24, 13) + SourceIndex(0)
 8 >Emitted(16, 56) Source(24, 18) + SourceIndex(0)
@@ -520,69 +523,72 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^
-6 >                            ^^
-7 >                              ^^^^^^^^^^^^^^^^^^^^^
-8 >                                                   ^^
-9 >                                                     ^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                            ^^
-11>                                                                              ^
-12>                                                                               ^^^
-13>                                                                                  ^
-14>                                                                                   ^^
-15>                                                                                     ^
-16>                                                                                      ^^^
-17>                                                                                         ^
-18>                                                                                          ^^
-19>                                                                                            ^
-20>                                                                                             ^^
-21>                                                                                               ^^
-22>                                                                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^
+7 >                            ^^
+8 >                              ^^^^^^^^^^^^^^^^^^^^^
+9 >                                                   ^^
+10>                                                     ^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                            ^^
+12>                                                                              ^
+13>                                                                               ^^^
+14>                                                                                  ^
+15>                                                                                   ^^
+16>                                                                                     ^
+17>                                                                                      ^^^
+18>                                                                                         ^
+19>                                                                                          ^^
+20>                                                                                            ^
+21>                                                                                             ^^
+22>                                                                                               ^^
+23>                                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [, 
-5 >     [primarySkillA, secondarySkillA]
-6 >                            
-7 >                              primarySkillA
-8 >                                                   , 
-9 >                                                     secondarySkillA
-10>                                                                            ]] = multiRobotA, 
-11>                                                                              i
-12>                                                                                = 
-13>                                                                                  0
-14>                                                                                   ; 
-15>                                                                                     i
-16>                                                                                       < 
-17>                                                                                         1
-18>                                                                                          ; 
-19>                                                                                            i
-20>                                                                                             ++
-21>                                                                                               ) 
-22>                                                                                                 {
+5 >     
+6 >         [primarySkillA, secondarySkillA]
+7 >                            
+8 >                              primarySkillA
+9 >                                                   , 
+10>                                                     secondarySkillA
+11>                                                                            ]] = multiRobotA, 
+12>                                                                              i
+13>                                                                                = 
+14>                                                                                  0
+15>                                                                                   ; 
+16>                                                                                     i
+17>                                                                                       < 
+18>                                                                                         1
+19>                                                                                          ; 
+20>                                                                                            i
+21>                                                                                             ++
+22>                                                                                               ) 
+23>                                                                                                 {
 1->Emitted(19, 1) Source(27, 1) + SourceIndex(0)
 2 >Emitted(19, 4) Source(27, 4) + SourceIndex(0)
 3 >Emitted(19, 5) Source(27, 5) + SourceIndex(0)
 4 >Emitted(19, 6) Source(27, 13) + SourceIndex(0)
-5 >Emitted(19, 29) Source(27, 45) + SourceIndex(0)
-6 >Emitted(19, 31) Source(27, 14) + SourceIndex(0)
-7 >Emitted(19, 52) Source(27, 27) + SourceIndex(0)
-8 >Emitted(19, 54) Source(27, 29) + SourceIndex(0)
-9 >Emitted(19, 77) Source(27, 44) + SourceIndex(0)
-10>Emitted(19, 79) Source(27, 62) + SourceIndex(0)
-11>Emitted(19, 80) Source(27, 63) + SourceIndex(0)
-12>Emitted(19, 83) Source(27, 66) + SourceIndex(0)
-13>Emitted(19, 84) Source(27, 67) + SourceIndex(0)
-14>Emitted(19, 86) Source(27, 69) + SourceIndex(0)
-15>Emitted(19, 87) Source(27, 70) + SourceIndex(0)
-16>Emitted(19, 90) Source(27, 73) + SourceIndex(0)
-17>Emitted(19, 91) Source(27, 74) + SourceIndex(0)
-18>Emitted(19, 93) Source(27, 76) + SourceIndex(0)
-19>Emitted(19, 94) Source(27, 77) + SourceIndex(0)
-20>Emitted(19, 96) Source(27, 79) + SourceIndex(0)
-21>Emitted(19, 98) Source(27, 81) + SourceIndex(0)
-22>Emitted(19, 99) Source(27, 82) + SourceIndex(0)
+5 >Emitted(19, 10) Source(27, 13) + SourceIndex(0)
+6 >Emitted(19, 29) Source(27, 45) + SourceIndex(0)
+7 >Emitted(19, 31) Source(27, 14) + SourceIndex(0)
+8 >Emitted(19, 52) Source(27, 27) + SourceIndex(0)
+9 >Emitted(19, 54) Source(27, 29) + SourceIndex(0)
+10>Emitted(19, 77) Source(27, 44) + SourceIndex(0)
+11>Emitted(19, 79) Source(27, 62) + SourceIndex(0)
+12>Emitted(19, 80) Source(27, 63) + SourceIndex(0)
+13>Emitted(19, 83) Source(27, 66) + SourceIndex(0)
+14>Emitted(19, 84) Source(27, 67) + SourceIndex(0)
+15>Emitted(19, 86) Source(27, 69) + SourceIndex(0)
+16>Emitted(19, 87) Source(27, 70) + SourceIndex(0)
+17>Emitted(19, 90) Source(27, 73) + SourceIndex(0)
+18>Emitted(19, 91) Source(27, 74) + SourceIndex(0)
+19>Emitted(19, 93) Source(27, 76) + SourceIndex(0)
+20>Emitted(19, 94) Source(27, 77) + SourceIndex(0)
+21>Emitted(19, 96) Source(27, 79) + SourceIndex(0)
+22>Emitted(19, 98) Source(27, 81) + SourceIndex(0)
+23>Emitted(19, 99) Source(27, 82) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -651,9 +657,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, [primarySkillA, secondarySkillA]] = getMultiRobot()
+6 >         [, [primarySkillA, secondarySkillA]] = getMultiRobot()
 7 >                             
 8 >                               [primarySkillA, secondarySkillA]
 9 >                                         
@@ -676,8 +682,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(22, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(22, 4) Source(30, 4) + SourceIndex(0)
 3 >Emitted(22, 5) Source(30, 5) + SourceIndex(0)
-4 >Emitted(22, 6) Source(30, 6) + SourceIndex(0)
-5 >Emitted(22, 10) Source(30, 6) + SourceIndex(0)
+4 >Emitted(22, 6) Source(30, 10) + SourceIndex(0)
+5 >Emitted(22, 10) Source(30, 10) + SourceIndex(0)
 6 >Emitted(22, 30) Source(30, 64) + SourceIndex(0)
 7 >Emitted(22, 32) Source(30, 13) + SourceIndex(0)
 8 >Emitted(22, 42) Source(30, 45) + SourceIndex(0)
@@ -766,9 +772,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
+6 >         [, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
 7 >                                                 
 8 >                                                   [primarySkillA, secondarySkillA]
 9 >                                                             
@@ -791,8 +797,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(25, 1) Source(33, 1) + SourceIndex(0)
 2 >Emitted(25, 4) Source(33, 4) + SourceIndex(0)
 3 >Emitted(25, 5) Source(33, 5) + SourceIndex(0)
-4 >Emitted(25, 6) Source(33, 6) + SourceIndex(0)
-5 >Emitted(25, 10) Source(33, 6) + SourceIndex(0)
+4 >Emitted(25, 6) Source(33, 10) + SourceIndex(0)
+5 >Emitted(25, 10) Source(33, 10) + SourceIndex(0)
 6 >Emitted(25, 50) Source(33, 84) + SourceIndex(0)
 7 >Emitted(25, 52) Source(33, 13) + SourceIndex(0)
 8 >Emitted(25, 62) Source(33, 45) + SourceIndex(0)
@@ -856,58 +862,61 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^
-6 >                            ^^
-7 >                              ^
-8 >                               ^^^
-9 >                                  ^
-10>                                   ^^
-11>                                     ^
-12>                                      ^^^
-13>                                         ^
-14>                                          ^^
-15>                                            ^
-16>                                             ^^
-17>                                               ^^
-18>                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^
+7 >                            ^^
+8 >                              ^
+9 >                               ^^^
+10>                                  ^
+11>                                   ^^
+12>                                     ^
+13>                                      ^^^
+14>                                         ^
+15>                                          ^^
+16>                                            ^
+17>                                             ^^
+18>                                               ^^
+19>                                                 ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberB
-6 >                            ] = robotA, 
-7 >                              i
-8 >                                = 
-9 >                                  0
-10>                                   ; 
-11>                                     i
-12>                                       < 
-13>                                         1
-14>                                          ; 
-15>                                            i
-16>                                             ++
-17>                                               ) 
-18>                                                 {
+5 >     
+6 >         numberB
+7 >                            ] = robotA, 
+8 >                              i
+9 >                                = 
+10>                                  0
+11>                                   ; 
+12>                                     i
+13>                                       < 
+14>                                         1
+15>                                          ; 
+16>                                            i
+17>                                             ++
+18>                                               ) 
+19>                                                 {
 1->Emitted(28, 1) Source(37, 1) + SourceIndex(0)
 2 >Emitted(28, 4) Source(37, 4) + SourceIndex(0)
 3 >Emitted(28, 5) Source(37, 5) + SourceIndex(0)
 4 >Emitted(28, 6) Source(37, 11) + SourceIndex(0)
-5 >Emitted(28, 29) Source(37, 18) + SourceIndex(0)
-6 >Emitted(28, 31) Source(37, 30) + SourceIndex(0)
-7 >Emitted(28, 32) Source(37, 31) + SourceIndex(0)
-8 >Emitted(28, 35) Source(37, 34) + SourceIndex(0)
-9 >Emitted(28, 36) Source(37, 35) + SourceIndex(0)
-10>Emitted(28, 38) Source(37, 37) + SourceIndex(0)
-11>Emitted(28, 39) Source(37, 38) + SourceIndex(0)
-12>Emitted(28, 42) Source(37, 41) + SourceIndex(0)
-13>Emitted(28, 43) Source(37, 42) + SourceIndex(0)
-14>Emitted(28, 45) Source(37, 44) + SourceIndex(0)
-15>Emitted(28, 46) Source(37, 45) + SourceIndex(0)
-16>Emitted(28, 48) Source(37, 47) + SourceIndex(0)
-17>Emitted(28, 50) Source(37, 49) + SourceIndex(0)
-18>Emitted(28, 51) Source(37, 50) + SourceIndex(0)
+5 >Emitted(28, 10) Source(37, 11) + SourceIndex(0)
+6 >Emitted(28, 29) Source(37, 18) + SourceIndex(0)
+7 >Emitted(28, 31) Source(37, 30) + SourceIndex(0)
+8 >Emitted(28, 32) Source(37, 31) + SourceIndex(0)
+9 >Emitted(28, 35) Source(37, 34) + SourceIndex(0)
+10>Emitted(28, 36) Source(37, 35) + SourceIndex(0)
+11>Emitted(28, 38) Source(37, 37) + SourceIndex(0)
+12>Emitted(28, 39) Source(37, 38) + SourceIndex(0)
+13>Emitted(28, 42) Source(37, 41) + SourceIndex(0)
+14>Emitted(28, 43) Source(37, 42) + SourceIndex(0)
+15>Emitted(28, 45) Source(37, 44) + SourceIndex(0)
+16>Emitted(28, 46) Source(37, 45) + SourceIndex(0)
+17>Emitted(28, 48) Source(37, 47) + SourceIndex(0)
+18>Emitted(28, 50) Source(37, 49) + SourceIndex(0)
+19>Emitted(28, 51) Source(37, 50) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -951,57 +960,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                ^^
-7 >                                  ^
-8 >                                   ^^^
-9 >                                      ^
-10>                                       ^^
-11>                                         ^
-12>                                          ^^^
-13>                                             ^
-14>                                              ^^
-15>                                                ^
-16>                                                 ^^
-17>                                                   ^^
-18>                                                     ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                ^^
+8 >                                  ^
+9 >                                   ^^^
+10>                                      ^
+11>                                       ^^
+12>                                         ^
+13>                                          ^^^
+14>                                             ^
+15>                                              ^^
+16>                                                ^
+17>                                                 ^^
+18>                                                   ^^
+19>                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberB
-6 >                                ] = getRobot(), 
-7 >                                  i
-8 >                                    = 
-9 >                                      0
-10>                                       ; 
-11>                                         i
-12>                                           < 
-13>                                             1
-14>                                              ; 
-15>                                                i
-16>                                                 ++
-17>                                                   ) 
-18>                                                     {
+5 >     
+6 >         numberB
+7 >                                ] = getRobot(), 
+8 >                                  i
+9 >                                    = 
+10>                                      0
+11>                                       ; 
+12>                                         i
+13>                                           < 
+14>                                             1
+15>                                              ; 
+16>                                                i
+17>                                                 ++
+18>                                                   ) 
+19>                                                     {
 1->Emitted(31, 1) Source(40, 1) + SourceIndex(0)
 2 >Emitted(31, 4) Source(40, 4) + SourceIndex(0)
 3 >Emitted(31, 5) Source(40, 5) + SourceIndex(0)
 4 >Emitted(31, 6) Source(40, 11) + SourceIndex(0)
-5 >Emitted(31, 33) Source(40, 18) + SourceIndex(0)
-6 >Emitted(31, 35) Source(40, 34) + SourceIndex(0)
-7 >Emitted(31, 36) Source(40, 35) + SourceIndex(0)
-8 >Emitted(31, 39) Source(40, 38) + SourceIndex(0)
-9 >Emitted(31, 40) Source(40, 39) + SourceIndex(0)
-10>Emitted(31, 42) Source(40, 41) + SourceIndex(0)
-11>Emitted(31, 43) Source(40, 42) + SourceIndex(0)
-12>Emitted(31, 46) Source(40, 45) + SourceIndex(0)
-13>Emitted(31, 47) Source(40, 46) + SourceIndex(0)
-14>Emitted(31, 49) Source(40, 48) + SourceIndex(0)
-15>Emitted(31, 50) Source(40, 49) + SourceIndex(0)
-16>Emitted(31, 52) Source(40, 51) + SourceIndex(0)
-17>Emitted(31, 54) Source(40, 53) + SourceIndex(0)
-18>Emitted(31, 55) Source(40, 54) + SourceIndex(0)
+5 >Emitted(31, 10) Source(40, 11) + SourceIndex(0)
+6 >Emitted(31, 33) Source(40, 18) + SourceIndex(0)
+7 >Emitted(31, 35) Source(40, 34) + SourceIndex(0)
+8 >Emitted(31, 36) Source(40, 35) + SourceIndex(0)
+9 >Emitted(31, 39) Source(40, 38) + SourceIndex(0)
+10>Emitted(31, 40) Source(40, 39) + SourceIndex(0)
+11>Emitted(31, 42) Source(40, 41) + SourceIndex(0)
+12>Emitted(31, 43) Source(40, 42) + SourceIndex(0)
+13>Emitted(31, 46) Source(40, 45) + SourceIndex(0)
+14>Emitted(31, 47) Source(40, 46) + SourceIndex(0)
+15>Emitted(31, 49) Source(40, 48) + SourceIndex(0)
+16>Emitted(31, 50) Source(40, 49) + SourceIndex(0)
+17>Emitted(31, 52) Source(40, 51) + SourceIndex(0)
+18>Emitted(31, 54) Source(40, 53) + SourceIndex(0)
+19>Emitted(31, 55) Source(40, 54) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1045,57 +1057,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                ^^
-7 >                                                  ^
-8 >                                                   ^^^
-9 >                                                      ^
-10>                                                       ^^
-11>                                                         ^
-12>                                                          ^^^
-13>                                                             ^
-14>                                                              ^^
-15>                                                                ^
-16>                                                                 ^^
-17>                                                                   ^^
-18>                                                                     ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                ^^
+8 >                                                  ^
+9 >                                                   ^^^
+10>                                                      ^
+11>                                                       ^^
+12>                                                         ^
+13>                                                          ^^^
+14>                                                             ^
+15>                                                              ^^
+16>                                                                ^
+17>                                                                 ^^
+18>                                                                   ^^
+19>                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberB
-6 >                                                ] = [2, "trimmer", "trimming"], 
-7 >                                                  i
-8 >                                                    = 
-9 >                                                      0
-10>                                                       ; 
-11>                                                         i
-12>                                                           < 
-13>                                                             1
-14>                                                              ; 
-15>                                                                i
-16>                                                                 ++
-17>                                                                   ) 
-18>                                                                     {
+5 >     
+6 >         numberB
+7 >                                                ] = [2, "trimmer", "trimming"], 
+8 >                                                  i
+9 >                                                    = 
+10>                                                      0
+11>                                                       ; 
+12>                                                         i
+13>                                                           < 
+14>                                                             1
+15>                                                              ; 
+16>                                                                i
+17>                                                                 ++
+18>                                                                   ) 
+19>                                                                     {
 1->Emitted(34, 1) Source(43, 1) + SourceIndex(0)
 2 >Emitted(34, 4) Source(43, 4) + SourceIndex(0)
 3 >Emitted(34, 5) Source(43, 5) + SourceIndex(0)
 4 >Emitted(34, 6) Source(43, 11) + SourceIndex(0)
-5 >Emitted(34, 49) Source(43, 18) + SourceIndex(0)
-6 >Emitted(34, 51) Source(43, 50) + SourceIndex(0)
-7 >Emitted(34, 52) Source(43, 51) + SourceIndex(0)
-8 >Emitted(34, 55) Source(43, 54) + SourceIndex(0)
-9 >Emitted(34, 56) Source(43, 55) + SourceIndex(0)
-10>Emitted(34, 58) Source(43, 57) + SourceIndex(0)
-11>Emitted(34, 59) Source(43, 58) + SourceIndex(0)
-12>Emitted(34, 62) Source(43, 61) + SourceIndex(0)
-13>Emitted(34, 63) Source(43, 62) + SourceIndex(0)
-14>Emitted(34, 65) Source(43, 64) + SourceIndex(0)
-15>Emitted(34, 66) Source(43, 65) + SourceIndex(0)
-16>Emitted(34, 68) Source(43, 67) + SourceIndex(0)
-17>Emitted(34, 70) Source(43, 69) + SourceIndex(0)
-18>Emitted(34, 71) Source(43, 70) + SourceIndex(0)
+5 >Emitted(34, 10) Source(43, 11) + SourceIndex(0)
+6 >Emitted(34, 49) Source(43, 18) + SourceIndex(0)
+7 >Emitted(34, 51) Source(43, 50) + SourceIndex(0)
+8 >Emitted(34, 52) Source(43, 51) + SourceIndex(0)
+9 >Emitted(34, 55) Source(43, 54) + SourceIndex(0)
+10>Emitted(34, 56) Source(43, 55) + SourceIndex(0)
+11>Emitted(34, 58) Source(43, 57) + SourceIndex(0)
+12>Emitted(34, 59) Source(43, 58) + SourceIndex(0)
+13>Emitted(34, 62) Source(43, 61) + SourceIndex(0)
+14>Emitted(34, 63) Source(43, 62) + SourceIndex(0)
+15>Emitted(34, 65) Source(43, 64) + SourceIndex(0)
+16>Emitted(34, 66) Source(43, 65) + SourceIndex(0)
+17>Emitted(34, 68) Source(43, 67) + SourceIndex(0)
+18>Emitted(34, 70) Source(43, 69) + SourceIndex(0)
+19>Emitted(34, 71) Source(43, 70) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1139,57 +1154,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                               ^^
-7 >                                 ^
-8 >                                  ^^^
-9 >                                     ^
-10>                                      ^^
-11>                                        ^
-12>                                         ^^^
-13>                                            ^
-14>                                             ^^
-15>                                               ^
-16>                                                ^^
-17>                                                  ^^
-18>                                                    ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^
+7 >                               ^^
+8 >                                 ^
+9 >                                  ^^^
+10>                                     ^
+11>                                      ^^
+12>                                        ^
+13>                                         ^^^
+14>                                            ^
+15>                                             ^^
+16>                                               ^
+17>                                                ^^
+18>                                                  ^^
+19>                                                    ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameB
-6 >                               ] = multiRobotA, 
-7 >                                 i
-8 >                                   = 
-9 >                                     0
-10>                                      ; 
-11>                                        i
-12>                                          < 
-13>                                            1
-14>                                             ; 
-15>                                               i
-16>                                                ++
-17>                                                  ) 
-18>                                                    {
+5 >     
+6 >         nameB
+7 >                               ] = multiRobotA, 
+8 >                                 i
+9 >                                   = 
+10>                                     0
+11>                                      ; 
+12>                                        i
+13>                                          < 
+14>                                            1
+15>                                             ; 
+16>                                               i
+17>                                                ++
+18>                                                  ) 
+19>                                                    {
 1->Emitted(37, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(46, 5) + SourceIndex(0)
 4 >Emitted(37, 6) Source(46, 11) + SourceIndex(0)
-5 >Emitted(37, 32) Source(46, 16) + SourceIndex(0)
-6 >Emitted(37, 34) Source(46, 33) + SourceIndex(0)
-7 >Emitted(37, 35) Source(46, 34) + SourceIndex(0)
-8 >Emitted(37, 38) Source(46, 37) + SourceIndex(0)
-9 >Emitted(37, 39) Source(46, 38) + SourceIndex(0)
-10>Emitted(37, 41) Source(46, 40) + SourceIndex(0)
-11>Emitted(37, 42) Source(46, 41) + SourceIndex(0)
-12>Emitted(37, 45) Source(46, 44) + SourceIndex(0)
-13>Emitted(37, 46) Source(46, 45) + SourceIndex(0)
-14>Emitted(37, 48) Source(46, 47) + SourceIndex(0)
-15>Emitted(37, 49) Source(46, 48) + SourceIndex(0)
-16>Emitted(37, 51) Source(46, 50) + SourceIndex(0)
-17>Emitted(37, 53) Source(46, 52) + SourceIndex(0)
-18>Emitted(37, 54) Source(46, 53) + SourceIndex(0)
+5 >Emitted(37, 10) Source(46, 11) + SourceIndex(0)
+6 >Emitted(37, 32) Source(46, 16) + SourceIndex(0)
+7 >Emitted(37, 34) Source(46, 33) + SourceIndex(0)
+8 >Emitted(37, 35) Source(46, 34) + SourceIndex(0)
+9 >Emitted(37, 38) Source(46, 37) + SourceIndex(0)
+10>Emitted(37, 39) Source(46, 38) + SourceIndex(0)
+11>Emitted(37, 41) Source(46, 40) + SourceIndex(0)
+12>Emitted(37, 42) Source(46, 41) + SourceIndex(0)
+13>Emitted(37, 45) Source(46, 44) + SourceIndex(0)
+14>Emitted(37, 46) Source(46, 45) + SourceIndex(0)
+15>Emitted(37, 48) Source(46, 47) + SourceIndex(0)
+16>Emitted(37, 49) Source(46, 48) + SourceIndex(0)
+17>Emitted(37, 51) Source(46, 50) + SourceIndex(0)
+18>Emitted(37, 53) Source(46, 52) + SourceIndex(0)
+19>Emitted(37, 54) Source(46, 53) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1233,57 +1251,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                   ^^
-7 >                                     ^
-8 >                                      ^^^
-9 >                                         ^
-10>                                          ^^
-11>                                            ^
-12>                                             ^^^
-13>                                                ^
-14>                                                 ^^
-15>                                                   ^
-16>                                                    ^^
-17>                                                      ^^
-18>                                                        ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                   ^^
+8 >                                     ^
+9 >                                      ^^^
+10>                                         ^
+11>                                          ^^
+12>                                            ^
+13>                                             ^^^
+14>                                                ^
+15>                                                 ^^
+16>                                                   ^
+17>                                                    ^^
+18>                                                      ^^
+19>                                                        ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameB
-6 >                                   ] = getMultiRobot(), 
-7 >                                     i
-8 >                                       = 
-9 >                                         0
-10>                                          ; 
-11>                                            i
-12>                                              < 
-13>                                                1
-14>                                                 ; 
-15>                                                   i
-16>                                                    ++
-17>                                                      ) 
-18>                                                        {
+5 >     
+6 >         nameB
+7 >                                   ] = getMultiRobot(), 
+8 >                                     i
+9 >                                       = 
+10>                                         0
+11>                                          ; 
+12>                                            i
+13>                                              < 
+14>                                                1
+15>                                                 ; 
+16>                                                   i
+17>                                                    ++
+18>                                                      ) 
+19>                                                        {
 1->Emitted(40, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(40, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(40, 5) Source(49, 5) + SourceIndex(0)
 4 >Emitted(40, 6) Source(49, 11) + SourceIndex(0)
-5 >Emitted(40, 36) Source(49, 16) + SourceIndex(0)
-6 >Emitted(40, 38) Source(49, 37) + SourceIndex(0)
-7 >Emitted(40, 39) Source(49, 38) + SourceIndex(0)
-8 >Emitted(40, 42) Source(49, 41) + SourceIndex(0)
-9 >Emitted(40, 43) Source(49, 42) + SourceIndex(0)
-10>Emitted(40, 45) Source(49, 44) + SourceIndex(0)
-11>Emitted(40, 46) Source(49, 45) + SourceIndex(0)
-12>Emitted(40, 49) Source(49, 48) + SourceIndex(0)
-13>Emitted(40, 50) Source(49, 49) + SourceIndex(0)
-14>Emitted(40, 52) Source(49, 51) + SourceIndex(0)
-15>Emitted(40, 53) Source(49, 52) + SourceIndex(0)
-16>Emitted(40, 55) Source(49, 54) + SourceIndex(0)
-17>Emitted(40, 57) Source(49, 56) + SourceIndex(0)
-18>Emitted(40, 58) Source(49, 57) + SourceIndex(0)
+5 >Emitted(40, 10) Source(49, 11) + SourceIndex(0)
+6 >Emitted(40, 36) Source(49, 16) + SourceIndex(0)
+7 >Emitted(40, 38) Source(49, 37) + SourceIndex(0)
+8 >Emitted(40, 39) Source(49, 38) + SourceIndex(0)
+9 >Emitted(40, 42) Source(49, 41) + SourceIndex(0)
+10>Emitted(40, 43) Source(49, 42) + SourceIndex(0)
+11>Emitted(40, 45) Source(49, 44) + SourceIndex(0)
+12>Emitted(40, 46) Source(49, 45) + SourceIndex(0)
+13>Emitted(40, 49) Source(49, 48) + SourceIndex(0)
+14>Emitted(40, 50) Source(49, 49) + SourceIndex(0)
+15>Emitted(40, 52) Source(49, 51) + SourceIndex(0)
+16>Emitted(40, 53) Source(49, 52) + SourceIndex(0)
+17>Emitted(40, 55) Source(49, 54) + SourceIndex(0)
+18>Emitted(40, 57) Source(49, 56) + SourceIndex(0)
+19>Emitted(40, 58) Source(49, 57) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1327,57 +1348,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                       ^^
-7 >                                                         ^
-8 >                                                          ^^^
-9 >                                                             ^
-10>                                                              ^^
-11>                                                                ^
-12>                                                                 ^^^
-13>                                                                    ^
-14>                                                                     ^^
-15>                                                                       ^
-16>                                                                        ^^
-17>                                                                          ^^
-18>                                                                            ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                       ^^
+8 >                                                         ^
+9 >                                                          ^^^
+10>                                                             ^
+11>                                                              ^^
+12>                                                                ^
+13>                                                                 ^^^
+14>                                                                    ^
+15>                                                                     ^^
+16>                                                                       ^
+17>                                                                        ^^
+18>                                                                          ^^
+19>                                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameB
-6 >                                                       ] = ["trimmer", ["trimming", "edging"]], 
-7 >                                                         i
-8 >                                                           = 
-9 >                                                             0
-10>                                                              ; 
-11>                                                                i
-12>                                                                  < 
-13>                                                                    1
-14>                                                                     ; 
-15>                                                                       i
-16>                                                                        ++
-17>                                                                          ) 
-18>                                                                            {
+5 >     
+6 >         nameB
+7 >                                                       ] = ["trimmer", ["trimming", "edging"]], 
+8 >                                                         i
+9 >                                                           = 
+10>                                                             0
+11>                                                              ; 
+12>                                                                i
+13>                                                                  < 
+14>                                                                    1
+15>                                                                     ; 
+16>                                                                       i
+17>                                                                        ++
+18>                                                                          ) 
+19>                                                                            {
 1->Emitted(43, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(43, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(43, 5) Source(52, 5) + SourceIndex(0)
 4 >Emitted(43, 6) Source(52, 11) + SourceIndex(0)
-5 >Emitted(43, 56) Source(52, 16) + SourceIndex(0)
-6 >Emitted(43, 58) Source(52, 57) + SourceIndex(0)
-7 >Emitted(43, 59) Source(52, 58) + SourceIndex(0)
-8 >Emitted(43, 62) Source(52, 61) + SourceIndex(0)
-9 >Emitted(43, 63) Source(52, 62) + SourceIndex(0)
-10>Emitted(43, 65) Source(52, 64) + SourceIndex(0)
-11>Emitted(43, 66) Source(52, 65) + SourceIndex(0)
-12>Emitted(43, 69) Source(52, 68) + SourceIndex(0)
-13>Emitted(43, 70) Source(52, 69) + SourceIndex(0)
-14>Emitted(43, 72) Source(52, 71) + SourceIndex(0)
-15>Emitted(43, 73) Source(52, 72) + SourceIndex(0)
-16>Emitted(43, 75) Source(52, 74) + SourceIndex(0)
-17>Emitted(43, 77) Source(52, 76) + SourceIndex(0)
-18>Emitted(43, 78) Source(52, 77) + SourceIndex(0)
+5 >Emitted(43, 10) Source(52, 11) + SourceIndex(0)
+6 >Emitted(43, 56) Source(52, 16) + SourceIndex(0)
+7 >Emitted(43, 58) Source(52, 57) + SourceIndex(0)
+8 >Emitted(43, 59) Source(52, 58) + SourceIndex(0)
+9 >Emitted(43, 62) Source(52, 61) + SourceIndex(0)
+10>Emitted(43, 63) Source(52, 62) + SourceIndex(0)
+11>Emitted(43, 65) Source(52, 64) + SourceIndex(0)
+12>Emitted(43, 66) Source(52, 65) + SourceIndex(0)
+13>Emitted(43, 69) Source(52, 68) + SourceIndex(0)
+14>Emitted(43, 70) Source(52, 69) + SourceIndex(0)
+15>Emitted(43, 72) Source(52, 71) + SourceIndex(0)
+16>Emitted(43, 73) Source(52, 72) + SourceIndex(0)
+17>Emitted(43, 75) Source(52, 74) + SourceIndex(0)
+18>Emitted(43, 77) Source(52, 76) + SourceIndex(0)
+19>Emitted(43, 78) Source(52, 77) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1421,70 +1445,73 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^
-8 >                                                 ^^
-9 >                                                   ^^^^^^^^^^^^^^^^^^^
-10>                                                                      ^^
-11>                                                                        ^
-12>                                                                         ^^^
-13>                                                                            ^
-14>                                                                             ^^
-15>                                                                               ^
-16>                                                                                ^^^
-17>                                                                                   ^
-18>                                                                                    ^^
-19>                                                                                      ^
-20>                                                                                       ^^
-21>                                                                                         ^^
-22>                                                                                           ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^
+7 >                             ^^
+8 >                               ^^^^^^^^^^^^^^^^^^
+9 >                                                 ^^
+10>                                                   ^^^^^^^^^^^^^^^^^^^
+11>                                                                      ^^
+12>                                                                        ^
+13>                                                                         ^^^
+14>                                                                            ^
+15>                                                                             ^^
+16>                                                                               ^
+17>                                                                                ^^^
+18>                                                                                   ^
+19>                                                                                    ^^
+20>                                                                                      ^
+21>                                                                                       ^^
+22>                                                                                         ^^
+23>                                                                                           ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberA2
-6 >                             , 
-7 >                               nameA2
-8 >                                                 , 
-9 >                                                   skillA2
-10>                                                                      ] = robotA, 
-11>                                                                        i
-12>                                                                          = 
-13>                                                                            0
-14>                                                                             ; 
-15>                                                                               i
-16>                                                                                 < 
-17>                                                                                   1
-18>                                                                                    ; 
-19>                                                                                      i
-20>                                                                                       ++
-21>                                                                                         ) 
-22>                                                                                           {
+5 >     
+6 >         numberA2
+7 >                             , 
+8 >                               nameA2
+9 >                                                 , 
+10>                                                   skillA2
+11>                                                                      ] = robotA, 
+12>                                                                        i
+13>                                                                          = 
+14>                                                                            0
+15>                                                                             ; 
+16>                                                                               i
+17>                                                                                 < 
+18>                                                                                   1
+19>                                                                                    ; 
+20>                                                                                      i
+21>                                                                                       ++
+22>                                                                                         ) 
+23>                                                                                           {
 1->Emitted(46, 1) Source(56, 1) + SourceIndex(0)
 2 >Emitted(46, 4) Source(56, 4) + SourceIndex(0)
 3 >Emitted(46, 5) Source(56, 5) + SourceIndex(0)
 4 >Emitted(46, 6) Source(56, 11) + SourceIndex(0)
-5 >Emitted(46, 30) Source(56, 19) + SourceIndex(0)
-6 >Emitted(46, 32) Source(56, 21) + SourceIndex(0)
-7 >Emitted(46, 50) Source(56, 27) + SourceIndex(0)
-8 >Emitted(46, 52) Source(56, 29) + SourceIndex(0)
-9 >Emitted(46, 71) Source(56, 36) + SourceIndex(0)
-10>Emitted(46, 73) Source(56, 48) + SourceIndex(0)
-11>Emitted(46, 74) Source(56, 49) + SourceIndex(0)
-12>Emitted(46, 77) Source(56, 52) + SourceIndex(0)
-13>Emitted(46, 78) Source(56, 53) + SourceIndex(0)
-14>Emitted(46, 80) Source(56, 55) + SourceIndex(0)
-15>Emitted(46, 81) Source(56, 56) + SourceIndex(0)
-16>Emitted(46, 84) Source(56, 59) + SourceIndex(0)
-17>Emitted(46, 85) Source(56, 60) + SourceIndex(0)
-18>Emitted(46, 87) Source(56, 62) + SourceIndex(0)
-19>Emitted(46, 88) Source(56, 63) + SourceIndex(0)
-20>Emitted(46, 90) Source(56, 65) + SourceIndex(0)
-21>Emitted(46, 92) Source(56, 67) + SourceIndex(0)
-22>Emitted(46, 93) Source(56, 68) + SourceIndex(0)
+5 >Emitted(46, 10) Source(56, 11) + SourceIndex(0)
+6 >Emitted(46, 30) Source(56, 19) + SourceIndex(0)
+7 >Emitted(46, 32) Source(56, 21) + SourceIndex(0)
+8 >Emitted(46, 50) Source(56, 27) + SourceIndex(0)
+9 >Emitted(46, 52) Source(56, 29) + SourceIndex(0)
+10>Emitted(46, 71) Source(56, 36) + SourceIndex(0)
+11>Emitted(46, 73) Source(56, 48) + SourceIndex(0)
+12>Emitted(46, 74) Source(56, 49) + SourceIndex(0)
+13>Emitted(46, 77) Source(56, 52) + SourceIndex(0)
+14>Emitted(46, 78) Source(56, 53) + SourceIndex(0)
+15>Emitted(46, 80) Source(56, 55) + SourceIndex(0)
+16>Emitted(46, 81) Source(56, 56) + SourceIndex(0)
+17>Emitted(46, 84) Source(56, 59) + SourceIndex(0)
+18>Emitted(46, 85) Source(56, 60) + SourceIndex(0)
+19>Emitted(46, 87) Source(56, 62) + SourceIndex(0)
+20>Emitted(46, 88) Source(56, 63) + SourceIndex(0)
+21>Emitted(46, 90) Source(56, 65) + SourceIndex(0)
+22>Emitted(46, 92) Source(56, 67) + SourceIndex(0)
+23>Emitted(46, 93) Source(56, 68) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1553,9 +1580,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA2, nameA2, skillA2] = getRobot()
+6 >         [numberA2, nameA2, skillA2] = getRobot()
 7 >                        
 8 >                          numberA2
 9 >                                          , 
@@ -1578,8 +1605,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(49, 1) Source(59, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(59, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(59, 5) + SourceIndex(0)
-4 >Emitted(49, 6) Source(59, 6) + SourceIndex(0)
-5 >Emitted(49, 10) Source(59, 6) + SourceIndex(0)
+4 >Emitted(49, 6) Source(59, 10) + SourceIndex(0)
+5 >Emitted(49, 10) Source(59, 10) + SourceIndex(0)
 6 >Emitted(49, 25) Source(59, 50) + SourceIndex(0)
 7 >Emitted(49, 27) Source(59, 11) + SourceIndex(0)
 8 >Emitted(49, 43) Source(59, 19) + SourceIndex(0)
@@ -1668,9 +1695,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"]
+6 >         [numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"]
 7 >                                        
 8 >                                          numberA2
 9 >                                                          , 
@@ -1693,8 +1720,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(52, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(52, 4) Source(62, 4) + SourceIndex(0)
 3 >Emitted(52, 5) Source(62, 5) + SourceIndex(0)
-4 >Emitted(52, 6) Source(62, 6) + SourceIndex(0)
-5 >Emitted(52, 10) Source(62, 6) + SourceIndex(0)
+4 >Emitted(52, 6) Source(62, 10) + SourceIndex(0)
+5 >Emitted(52, 10) Source(62, 10) + SourceIndex(0)
 6 >Emitted(52, 41) Source(62, 66) + SourceIndex(0)
 7 >Emitted(52, 43) Source(62, 11) + SourceIndex(0)
 8 >Emitted(52, 59) Source(62, 19) + SourceIndex(0)
@@ -1758,75 +1785,78 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                ^^
-7 >                                  ^^^^^^^^^^^^^^^^^^^
-8 >                                                     ^^
-9 >                                                       ^^^^^^^^^^^^^^^^^^^^^
-10>                                                                            ^^
-11>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                     ^^
-13>                                                                                                       ^
-14>                                                                                                        ^^^
-15>                                                                                                           ^
-16>                                                                                                            ^^
-17>                                                                                                              ^
-18>                                                                                                               ^^^
-19>                                                                                                                  ^
-20>                                                                                                                   ^^
-21>                                                                                                                     ^
-22>                                                                                                                      ^^
-23>                                                                                                                        ^^
-24>                                                                                                                          ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                ^^
+8 >                                  ^^^^^^^^^^^^^^^^^^^
+9 >                                                     ^^
+10>                                                       ^^^^^^^^^^^^^^^^^^^^^
+11>                                                                            ^^
+12>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                     ^^
+14>                                                                                                       ^
+15>                                                                                                        ^^^
+16>                                                                                                           ^
+17>                                                                                                            ^^
+18>                                                                                                              ^
+19>                                                                                                               ^^^
+20>                                                                                                                  ^
+21>                                                                                                                   ^^
+22>                                                                                                                     ^
+23>                                                                                                                      ^^
+24>                                                                                                                        ^^
+25>                                                                                                                          ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameMA
-6 >                                , 
-7 >                                  [primarySkillA, secondarySkillA]
-8 >                                                     
-9 >                                                       primarySkillA
-10>                                                                            , 
-11>                                                                              secondarySkillA
-12>                                                                                                     ]] = multiRobotA, 
-13>                                                                                                       i
-14>                                                                                                         = 
-15>                                                                                                           0
-16>                                                                                                            ; 
-17>                                                                                                              i
-18>                                                                                                                < 
-19>                                                                                                                  1
-20>                                                                                                                   ; 
-21>                                                                                                                     i
-22>                                                                                                                      ++
-23>                                                                                                                        ) 
-24>                                                                                                                          {
+5 >     
+6 >         nameMA
+7 >                                , 
+8 >                                  [primarySkillA, secondarySkillA]
+9 >                                                     
+10>                                                       primarySkillA
+11>                                                                            , 
+12>                                                                              secondarySkillA
+13>                                                                                                     ]] = multiRobotA, 
+14>                                                                                                       i
+15>                                                                                                         = 
+16>                                                                                                           0
+17>                                                                                                            ; 
+18>                                                                                                              i
+19>                                                                                                                < 
+20>                                                                                                                  1
+21>                                                                                                                   ; 
+22>                                                                                                                     i
+23>                                                                                                                      ++
+24>                                                                                                                        ) 
+25>                                                                                                                          {
 1->Emitted(55, 1) Source(65, 1) + SourceIndex(0)
 2 >Emitted(55, 4) Source(65, 4) + SourceIndex(0)
 3 >Emitted(55, 5) Source(65, 5) + SourceIndex(0)
 4 >Emitted(55, 6) Source(65, 11) + SourceIndex(0)
-5 >Emitted(55, 33) Source(65, 17) + SourceIndex(0)
-6 >Emitted(55, 35) Source(65, 19) + SourceIndex(0)
-7 >Emitted(55, 54) Source(65, 51) + SourceIndex(0)
-8 >Emitted(55, 56) Source(65, 20) + SourceIndex(0)
-9 >Emitted(55, 77) Source(65, 33) + SourceIndex(0)
-10>Emitted(55, 79) Source(65, 35) + SourceIndex(0)
-11>Emitted(55, 102) Source(65, 50) + SourceIndex(0)
-12>Emitted(55, 104) Source(65, 68) + SourceIndex(0)
-13>Emitted(55, 105) Source(65, 69) + SourceIndex(0)
-14>Emitted(55, 108) Source(65, 72) + SourceIndex(0)
-15>Emitted(55, 109) Source(65, 73) + SourceIndex(0)
-16>Emitted(55, 111) Source(65, 75) + SourceIndex(0)
-17>Emitted(55, 112) Source(65, 76) + SourceIndex(0)
-18>Emitted(55, 115) Source(65, 79) + SourceIndex(0)
-19>Emitted(55, 116) Source(65, 80) + SourceIndex(0)
-20>Emitted(55, 118) Source(65, 82) + SourceIndex(0)
-21>Emitted(55, 119) Source(65, 83) + SourceIndex(0)
-22>Emitted(55, 121) Source(65, 85) + SourceIndex(0)
-23>Emitted(55, 123) Source(65, 87) + SourceIndex(0)
-24>Emitted(55, 124) Source(65, 88) + SourceIndex(0)
+5 >Emitted(55, 10) Source(65, 11) + SourceIndex(0)
+6 >Emitted(55, 33) Source(65, 17) + SourceIndex(0)
+7 >Emitted(55, 35) Source(65, 19) + SourceIndex(0)
+8 >Emitted(55, 54) Source(65, 51) + SourceIndex(0)
+9 >Emitted(55, 56) Source(65, 20) + SourceIndex(0)
+10>Emitted(55, 77) Source(65, 33) + SourceIndex(0)
+11>Emitted(55, 79) Source(65, 35) + SourceIndex(0)
+12>Emitted(55, 102) Source(65, 50) + SourceIndex(0)
+13>Emitted(55, 104) Source(65, 68) + SourceIndex(0)
+14>Emitted(55, 105) Source(65, 69) + SourceIndex(0)
+15>Emitted(55, 108) Source(65, 72) + SourceIndex(0)
+16>Emitted(55, 109) Source(65, 73) + SourceIndex(0)
+17>Emitted(55, 111) Source(65, 75) + SourceIndex(0)
+18>Emitted(55, 112) Source(65, 76) + SourceIndex(0)
+19>Emitted(55, 115) Source(65, 79) + SourceIndex(0)
+20>Emitted(55, 116) Source(65, 80) + SourceIndex(0)
+21>Emitted(55, 118) Source(65, 82) + SourceIndex(0)
+22>Emitted(55, 119) Source(65, 83) + SourceIndex(0)
+23>Emitted(55, 121) Source(65, 85) + SourceIndex(0)
+24>Emitted(55, 123) Source(65, 87) + SourceIndex(0)
+25>Emitted(55, 124) Source(65, 88) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -1897,9 +1927,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot()
+6 >         [nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot()
 7 >                             
 8 >                               nameMA
 9 >                                             , 
@@ -1924,8 +1954,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(58, 1) Source(68, 1) + SourceIndex(0)
 2 >Emitted(58, 4) Source(68, 4) + SourceIndex(0)
 3 >Emitted(58, 5) Source(68, 5) + SourceIndex(0)
-4 >Emitted(58, 6) Source(68, 6) + SourceIndex(0)
-5 >Emitted(58, 10) Source(68, 6) + SourceIndex(0)
+4 >Emitted(58, 6) Source(68, 10) + SourceIndex(0)
+5 >Emitted(58, 10) Source(68, 10) + SourceIndex(0)
 6 >Emitted(58, 30) Source(68, 70) + SourceIndex(0)
 7 >Emitted(58, 32) Source(68, 11) + SourceIndex(0)
 8 >Emitted(58, 46) Source(68, 17) + SourceIndex(0)
@@ -2018,9 +2048,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
+6 >         [nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
 7 >                                                 
 8 >                                                   nameMA
 9 >                                                                 , 
@@ -2045,8 +2075,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(61, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(71, 5) + SourceIndex(0)
-4 >Emitted(61, 6) Source(71, 6) + SourceIndex(0)
-5 >Emitted(61, 10) Source(71, 6) + SourceIndex(0)
+4 >Emitted(61, 6) Source(71, 10) + SourceIndex(0)
+5 >Emitted(61, 10) Source(71, 10) + SourceIndex(0)
 6 >Emitted(61, 50) Source(71, 90) + SourceIndex(0)
 7 >Emitted(61, 52) Source(71, 11) + SourceIndex(0)
 8 >Emitted(61, 66) Source(71, 17) + SourceIndex(0)
@@ -2112,64 +2142,67 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                           ^^
-9 >                                                             ^
-10>                                                              ^^^
-11>                                                                 ^
-12>                                                                  ^^
-13>                                                                    ^
-14>                                                                     ^^^
-15>                                                                        ^
-16>                                                                         ^^
-17>                                                                           ^
-18>                                                                            ^^
-19>                                                                              ^^
-20>                                                                                ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^
+7 >                             ^^
+8 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                           ^^
+10>                                                             ^
+11>                                                              ^^^
+12>                                                                 ^
+13>                                                                  ^^
+14>                                                                    ^
+15>                                                                     ^^^
+16>                                                                        ^
+17>                                                                         ^^
+18>                                                                           ^
+19>                                                                            ^^
+20>                                                                              ^^
+21>                                                                                ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberA3
-6 >                             , 
-7 >                               ...robotAInfo
-8 >                                                           ] = robotA, 
-9 >                                                             i
-10>                                                               = 
-11>                                                                 0
-12>                                                                  ; 
-13>                                                                    i
-14>                                                                      < 
-15>                                                                        1
-16>                                                                         ; 
-17>                                                                           i
-18>                                                                            ++
-19>                                                                              ) 
-20>                                                                                {
+5 >     
+6 >         numberA3
+7 >                             , 
+8 >                               ...robotAInfo
+9 >                                                           ] = robotA, 
+10>                                                             i
+11>                                                               = 
+12>                                                                 0
+13>                                                                  ; 
+14>                                                                    i
+15>                                                                      < 
+16>                                                                        1
+17>                                                                         ; 
+18>                                                                           i
+19>                                                                            ++
+20>                                                                              ) 
+21>                                                                                {
 1->Emitted(64, 1) Source(75, 1) + SourceIndex(0)
 2 >Emitted(64, 4) Source(75, 4) + SourceIndex(0)
 3 >Emitted(64, 5) Source(75, 5) + SourceIndex(0)
 4 >Emitted(64, 6) Source(75, 11) + SourceIndex(0)
-5 >Emitted(64, 30) Source(75, 19) + SourceIndex(0)
-6 >Emitted(64, 32) Source(75, 21) + SourceIndex(0)
-7 >Emitted(64, 60) Source(75, 34) + SourceIndex(0)
-8 >Emitted(64, 62) Source(75, 46) + SourceIndex(0)
-9 >Emitted(64, 63) Source(75, 47) + SourceIndex(0)
-10>Emitted(64, 66) Source(75, 50) + SourceIndex(0)
-11>Emitted(64, 67) Source(75, 51) + SourceIndex(0)
-12>Emitted(64, 69) Source(75, 53) + SourceIndex(0)
-13>Emitted(64, 70) Source(75, 54) + SourceIndex(0)
-14>Emitted(64, 73) Source(75, 57) + SourceIndex(0)
-15>Emitted(64, 74) Source(75, 58) + SourceIndex(0)
-16>Emitted(64, 76) Source(75, 60) + SourceIndex(0)
-17>Emitted(64, 77) Source(75, 61) + SourceIndex(0)
-18>Emitted(64, 79) Source(75, 63) + SourceIndex(0)
-19>Emitted(64, 81) Source(75, 65) + SourceIndex(0)
-20>Emitted(64, 82) Source(75, 66) + SourceIndex(0)
+5 >Emitted(64, 10) Source(75, 11) + SourceIndex(0)
+6 >Emitted(64, 30) Source(75, 19) + SourceIndex(0)
+7 >Emitted(64, 32) Source(75, 21) + SourceIndex(0)
+8 >Emitted(64, 60) Source(75, 34) + SourceIndex(0)
+9 >Emitted(64, 62) Source(75, 46) + SourceIndex(0)
+10>Emitted(64, 63) Source(75, 47) + SourceIndex(0)
+11>Emitted(64, 66) Source(75, 50) + SourceIndex(0)
+12>Emitted(64, 67) Source(75, 51) + SourceIndex(0)
+13>Emitted(64, 69) Source(75, 53) + SourceIndex(0)
+14>Emitted(64, 70) Source(75, 54) + SourceIndex(0)
+15>Emitted(64, 73) Source(75, 57) + SourceIndex(0)
+16>Emitted(64, 74) Source(75, 58) + SourceIndex(0)
+17>Emitted(64, 76) Source(75, 60) + SourceIndex(0)
+18>Emitted(64, 77) Source(75, 61) + SourceIndex(0)
+19>Emitted(64, 79) Source(75, 63) + SourceIndex(0)
+20>Emitted(64, 81) Source(75, 65) + SourceIndex(0)
+21>Emitted(64, 82) Source(75, 66) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2236,9 +2269,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA3, ...robotAInfo] = getRobot()
+6 >         [numberA3, ...robotAInfo] = getRobot()
 7 >                        
 8 >                          numberA3
 9 >                                          , 
@@ -2259,8 +2292,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(67, 1) Source(78, 1) + SourceIndex(0)
 2 >Emitted(67, 4) Source(78, 4) + SourceIndex(0)
 3 >Emitted(67, 5) Source(78, 5) + SourceIndex(0)
-4 >Emitted(67, 6) Source(78, 6) + SourceIndex(0)
-5 >Emitted(67, 10) Source(78, 6) + SourceIndex(0)
+4 >Emitted(67, 6) Source(78, 10) + SourceIndex(0)
+5 >Emitted(67, 10) Source(78, 10) + SourceIndex(0)
 6 >Emitted(67, 25) Source(78, 48) + SourceIndex(0)
 7 >Emitted(67, 27) Source(78, 11) + SourceIndex(0)
 8 >Emitted(67, 43) Source(78, 19) + SourceIndex(0)
@@ -2345,9 +2378,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA3, ...robotAInfo] = [2, "trimmer", "trimming"]
+6 >         [numberA3, ...robotAInfo] = [2, "trimmer", "trimming"]
 7 >                                        
 8 >                                          numberA3
 9 >                                                          , 
@@ -2368,8 +2401,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 1->Emitted(70, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(70, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(70, 5) Source(81, 5) + SourceIndex(0)
-4 >Emitted(70, 6) Source(81, 6) + SourceIndex(0)
-5 >Emitted(70, 10) Source(81, 6) + SourceIndex(0)
+4 >Emitted(70, 6) Source(81, 10) + SourceIndex(0)
+5 >Emitted(70, 10) Source(81, 10) + SourceIndex(0)
 6 >Emitted(70, 41) Source(81, 64) + SourceIndex(0)
 7 >Emitted(70, 43) Source(81, 11) + SourceIndex(0)
 8 >Emitted(70, 59) Source(81, 19) + SourceIndex(0)
@@ -2431,57 +2464,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                               ^^
-7 >                                                 ^
-8 >                                                  ^^^
-9 >                                                     ^
-10>                                                      ^^
-11>                                                        ^
-12>                                                         ^^^
-13>                                                            ^
-14>                                                             ^^
-15>                                                               ^
-16>                                                                ^^
-17>                                                                  ^^
-18>                                                                    ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                               ^^
+8 >                                                 ^
+9 >                                                  ^^^
+10>                                                     ^
+11>                                                      ^^
+12>                                                        ^
+13>                                                         ^^^
+14>                                                            ^
+15>                                                             ^^
+16>                                                               ^
+17>                                                                ^^
+18>                                                                  ^^
+19>                                                                    ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     ...multiRobotAInfo
-6 >                                               ] = multiRobotA, 
-7 >                                                 i
-8 >                                                   = 
-9 >                                                     0
-10>                                                      ; 
-11>                                                        i
-12>                                                          < 
-13>                                                            1
-14>                                                             ; 
-15>                                                               i
-16>                                                                ++
-17>                                                                  ) 
-18>                                                                    {
+5 >     
+6 >         ...multiRobotAInfo
+7 >                                               ] = multiRobotA, 
+8 >                                                 i
+9 >                                                   = 
+10>                                                     0
+11>                                                      ; 
+12>                                                        i
+13>                                                          < 
+14>                                                            1
+15>                                                             ; 
+16>                                                               i
+17>                                                                ++
+18>                                                                  ) 
+19>                                                                    {
 1->Emitted(73, 1) Source(84, 1) + SourceIndex(0)
 2 >Emitted(73, 4) Source(84, 4) + SourceIndex(0)
 3 >Emitted(73, 5) Source(84, 5) + SourceIndex(0)
 4 >Emitted(73, 6) Source(84, 11) + SourceIndex(0)
-5 >Emitted(73, 48) Source(84, 29) + SourceIndex(0)
-6 >Emitted(73, 50) Source(84, 46) + SourceIndex(0)
-7 >Emitted(73, 51) Source(84, 47) + SourceIndex(0)
-8 >Emitted(73, 54) Source(84, 50) + SourceIndex(0)
-9 >Emitted(73, 55) Source(84, 51) + SourceIndex(0)
-10>Emitted(73, 57) Source(84, 53) + SourceIndex(0)
-11>Emitted(73, 58) Source(84, 54) + SourceIndex(0)
-12>Emitted(73, 61) Source(84, 57) + SourceIndex(0)
-13>Emitted(73, 62) Source(84, 58) + SourceIndex(0)
-14>Emitted(73, 64) Source(84, 60) + SourceIndex(0)
-15>Emitted(73, 65) Source(84, 61) + SourceIndex(0)
-16>Emitted(73, 67) Source(84, 63) + SourceIndex(0)
-17>Emitted(73, 69) Source(84, 65) + SourceIndex(0)
-18>Emitted(73, 70) Source(84, 66) + SourceIndex(0)
+5 >Emitted(73, 10) Source(84, 11) + SourceIndex(0)
+6 >Emitted(73, 48) Source(84, 29) + SourceIndex(0)
+7 >Emitted(73, 50) Source(84, 46) + SourceIndex(0)
+8 >Emitted(73, 51) Source(84, 47) + SourceIndex(0)
+9 >Emitted(73, 54) Source(84, 50) + SourceIndex(0)
+10>Emitted(73, 55) Source(84, 51) + SourceIndex(0)
+11>Emitted(73, 57) Source(84, 53) + SourceIndex(0)
+12>Emitted(73, 58) Source(84, 54) + SourceIndex(0)
+13>Emitted(73, 61) Source(84, 57) + SourceIndex(0)
+14>Emitted(73, 62) Source(84, 58) + SourceIndex(0)
+15>Emitted(73, 64) Source(84, 60) + SourceIndex(0)
+16>Emitted(73, 65) Source(84, 61) + SourceIndex(0)
+17>Emitted(73, 67) Source(84, 63) + SourceIndex(0)
+18>Emitted(73, 69) Source(84, 65) + SourceIndex(0)
+19>Emitted(73, 70) Source(84, 66) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
@@ -2525,57 +2561,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                   ^^
-7 >                                                     ^
-8 >                                                      ^^^
-9 >                                                         ^
-10>                                                          ^^
-11>                                                            ^
-12>                                                             ^^^
-13>                                                                ^
-14>                                                                 ^^
-15>                                                                   ^
-16>                                                                    ^^
-17>                                                                      ^^
-18>                                                                        ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                   ^^
+8 >                                                     ^
+9 >                                                      ^^^
+10>                                                         ^
+11>                                                          ^^
+12>                                                            ^
+13>                                                             ^^^
+14>                                                                ^
+15>                                                                 ^^
+16>                                                                   ^
+17>                                                                    ^^
+18>                                                                      ^^
+19>                                                                        ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     ...multiRobotAInfo
-6 >                                                   ] = getMultiRobot(), 
-7 >                                                     i
-8 >                                                       = 
-9 >                                                         0
-10>                                                          ; 
-11>                                                            i
-12>                                                              < 
-13>                                                                1
-14>                                                                 ; 
-15>                                                                   i
-16>                                                                    ++
-17>                                                                      ) 
-18>                                                                        {
+5 >     
+6 >         ...multiRobotAInfo
+7 >                                                   ] = getMultiRobot(), 
+8 >                                                     i
+9 >                                                       = 
+10>                                                         0
+11>                                                          ; 
+12>                                                            i
+13>                                                              < 
+14>                                                                1
+15>                                                                 ; 
+16>                                                                   i
+17>                                                                    ++
+18>                                                                      ) 
+19>                                                                        {
 1->Emitted(76, 1) Source(87, 1) + SourceIndex(0)
 2 >Emitted(76, 4) Source(87, 4) + SourceIndex(0)
 3 >Emitted(76, 5) Source(87, 5) + SourceIndex(0)
 4 >Emitted(76, 6) Source(87, 11) + SourceIndex(0)
-5 >Emitted(76, 52) Source(87, 29) + SourceIndex(0)
-6 >Emitted(76, 54) Source(87, 50) + SourceIndex(0)
-7 >Emitted(76, 55) Source(87, 51) + SourceIndex(0)
-8 >Emitted(76, 58) Source(87, 54) + SourceIndex(0)
-9 >Emitted(76, 59) Source(87, 55) + SourceIndex(0)
-10>Emitted(76, 61) Source(87, 57) + SourceIndex(0)
-11>Emitted(76, 62) Source(87, 58) + SourceIndex(0)
-12>Emitted(76, 65) Source(87, 61) + SourceIndex(0)
-13>Emitted(76, 66) Source(87, 62) + SourceIndex(0)
-14>Emitted(76, 68) Source(87, 64) + SourceIndex(0)
-15>Emitted(76, 69) Source(87, 65) + SourceIndex(0)
-16>Emitted(76, 71) Source(87, 67) + SourceIndex(0)
-17>Emitted(76, 73) Source(87, 69) + SourceIndex(0)
-18>Emitted(76, 74) Source(87, 70) + SourceIndex(0)
+5 >Emitted(76, 10) Source(87, 11) + SourceIndex(0)
+6 >Emitted(76, 52) Source(87, 29) + SourceIndex(0)
+7 >Emitted(76, 54) Source(87, 50) + SourceIndex(0)
+8 >Emitted(76, 55) Source(87, 51) + SourceIndex(0)
+9 >Emitted(76, 58) Source(87, 54) + SourceIndex(0)
+10>Emitted(76, 59) Source(87, 55) + SourceIndex(0)
+11>Emitted(76, 61) Source(87, 57) + SourceIndex(0)
+12>Emitted(76, 62) Source(87, 58) + SourceIndex(0)
+13>Emitted(76, 65) Source(87, 61) + SourceIndex(0)
+14>Emitted(76, 66) Source(87, 62) + SourceIndex(0)
+15>Emitted(76, 68) Source(87, 64) + SourceIndex(0)
+16>Emitted(76, 69) Source(87, 65) + SourceIndex(0)
+17>Emitted(76, 71) Source(87, 67) + SourceIndex(0)
+18>Emitted(76, 73) Source(87, 69) + SourceIndex(0)
+19>Emitted(76, 74) Source(87, 70) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
@@ -2619,57 +2658,60 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                       ^^
-7 >                                                                         ^
-8 >                                                                          ^^^
-9 >                                                                             ^
-10>                                                                              ^^
-11>                                                                                ^
-12>                                                                                 ^^^
-13>                                                                                    ^
-14>                                                                                     ^^
-15>                                                                                       ^
-16>                                                                                        ^^
-17>                                                                                          ^^
-18>                                                                                            ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                       ^^
+8 >                                                                         ^
+9 >                                                                          ^^^
+10>                                                                             ^
+11>                                                                              ^^
+12>                                                                                ^
+13>                                                                                 ^^^
+14>                                                                                    ^
+15>                                                                                     ^^
+16>                                                                                       ^
+17>                                                                                        ^^
+18>                                                                                          ^^
+19>                                                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     ...multiRobotAInfo
-6 >                                                                       ] = ["trimmer", ["trimming", "edging"]], 
-7 >                                                                         i
-8 >                                                                           = 
-9 >                                                                             0
-10>                                                                              ; 
-11>                                                                                i
-12>                                                                                  < 
-13>                                                                                    1
-14>                                                                                     ; 
-15>                                                                                       i
-16>                                                                                        ++
-17>                                                                                          ) 
-18>                                                                                            {
+5 >     
+6 >         ...multiRobotAInfo
+7 >                                                                       ] = ["trimmer", ["trimming", "edging"]], 
+8 >                                                                         i
+9 >                                                                           = 
+10>                                                                             0
+11>                                                                              ; 
+12>                                                                                i
+13>                                                                                  < 
+14>                                                                                    1
+15>                                                                                     ; 
+16>                                                                                       i
+17>                                                                                        ++
+18>                                                                                          ) 
+19>                                                                                            {
 1->Emitted(79, 1) Source(90, 1) + SourceIndex(0)
 2 >Emitted(79, 4) Source(90, 4) + SourceIndex(0)
 3 >Emitted(79, 5) Source(90, 5) + SourceIndex(0)
 4 >Emitted(79, 6) Source(90, 11) + SourceIndex(0)
-5 >Emitted(79, 72) Source(90, 29) + SourceIndex(0)
-6 >Emitted(79, 74) Source(90, 70) + SourceIndex(0)
-7 >Emitted(79, 75) Source(90, 71) + SourceIndex(0)
-8 >Emitted(79, 78) Source(90, 74) + SourceIndex(0)
-9 >Emitted(79, 79) Source(90, 75) + SourceIndex(0)
-10>Emitted(79, 81) Source(90, 77) + SourceIndex(0)
-11>Emitted(79, 82) Source(90, 78) + SourceIndex(0)
-12>Emitted(79, 85) Source(90, 81) + SourceIndex(0)
-13>Emitted(79, 86) Source(90, 82) + SourceIndex(0)
-14>Emitted(79, 88) Source(90, 84) + SourceIndex(0)
-15>Emitted(79, 89) Source(90, 85) + SourceIndex(0)
-16>Emitted(79, 91) Source(90, 87) + SourceIndex(0)
-17>Emitted(79, 93) Source(90, 89) + SourceIndex(0)
-18>Emitted(79, 94) Source(90, 90) + SourceIndex(0)
+5 >Emitted(79, 10) Source(90, 11) + SourceIndex(0)
+6 >Emitted(79, 72) Source(90, 29) + SourceIndex(0)
+7 >Emitted(79, 74) Source(90, 70) + SourceIndex(0)
+8 >Emitted(79, 75) Source(90, 71) + SourceIndex(0)
+9 >Emitted(79, 78) Source(90, 74) + SourceIndex(0)
+10>Emitted(79, 79) Source(90, 75) + SourceIndex(0)
+11>Emitted(79, 81) Source(90, 77) + SourceIndex(0)
+12>Emitted(79, 82) Source(90, 78) + SourceIndex(0)
+13>Emitted(79, 85) Source(90, 81) + SourceIndex(0)
+14>Emitted(79, 86) Source(90, 82) + SourceIndex(0)
+15>Emitted(79, 88) Source(90, 84) + SourceIndex(0)
+16>Emitted(79, 89) Source(90, 85) + SourceIndex(0)
+17>Emitted(79, 91) Source(90, 87) + SourceIndex(0)
+18>Emitted(79, 93) Source(90, 89) + SourceIndex(0)
+19>Emitted(79, 94) Source(90, 90) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js
index aad4d79ddd1..8030ead0bba 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js
@@ -113,76 +113,76 @@ var numberB, nameB;
 var numberA2, nameA2, skillA2, nameMA;
 var numberA3, robotAInfo, multiRobotAInfo;
 var i;
-for ((nameA = robotA[1], robotA), i = 0; i < 1; i++) {
+for (nameA = robotA[1], robotA, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_a = getRobot(), nameA = _a[1], _a), i = 0; i < 1; i++) {
+for (_a = getRobot(), nameA = _a[1], _a, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_b = [2, "trimmer", "trimming"], nameA = _b[1], _b), i = 0; i < 1; i++) {
+for (_b = [2, "trimmer", "trimming"], nameA = _b[1], _b, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_c = multiRobotA[1], primarySkillA = _c[0], secondarySkillA = _c[1], multiRobotA), i = 0; i < 1; i++) {
+for (_c = multiRobotA[1], primarySkillA = _c[0], secondarySkillA = _c[1], multiRobotA, i = 0; i < 1; i++) {
     console.log(primarySkillA);
 }
-for ((_d = getMultiRobot(), _e = _d[1], primarySkillA = _e[0], secondarySkillA = _e[1], _d), i = 0; i < 1; i++) {
+for (_d = getMultiRobot(), _e = _d[1], primarySkillA = _e[0], secondarySkillA = _e[1], _d, i = 0; i < 1; i++) {
     console.log(primarySkillA);
 }
-for ((_f = ["trimmer", ["trimming", "edging"]], _g = _f[1], primarySkillA = _g[0], secondarySkillA = _g[1], _f), i = 0; i < 1; i++) {
+for (_f = ["trimmer", ["trimming", "edging"]], _g = _f[1], primarySkillA = _g[0], secondarySkillA = _g[1], _f, i = 0; i < 1; i++) {
     console.log(primarySkillA);
 }
-for ((numberB = robotA[0], robotA), i = 0; i < 1; i++) {
+for (numberB = robotA[0], robotA, i = 0; i < 1; i++) {
     console.log(numberB);
 }
-for ((_h = getRobot(), numberB = _h[0], _h), i = 0; i < 1; i++) {
+for (_h = getRobot(), numberB = _h[0], _h, i = 0; i < 1; i++) {
     console.log(numberB);
 }
-for ((_j = [2, "trimmer", "trimming"], numberB = _j[0], _j), i = 0; i < 1; i++) {
+for (_j = [2, "trimmer", "trimming"], numberB = _j[0], _j, i = 0; i < 1; i++) {
     console.log(numberB);
 }
-for ((nameB = multiRobotA[0], multiRobotA), i = 0; i < 1; i++) {
+for (nameB = multiRobotA[0], multiRobotA, i = 0; i < 1; i++) {
     console.log(nameB);
 }
-for ((_k = getMultiRobot(), nameB = _k[0], _k), i = 0; i < 1; i++) {
+for (_k = getMultiRobot(), nameB = _k[0], _k, i = 0; i < 1; i++) {
     console.log(nameB);
 }
-for ((_l = ["trimmer", ["trimming", "edging"]], nameB = _l[0], _l), i = 0; i < 1; i++) {
+for (_l = ["trimmer", ["trimming", "edging"]], nameB = _l[0], _l, i = 0; i < 1; i++) {
     console.log(nameB);
 }
-for ((numberA2 = robotA[0], nameA2 = robotA[1], skillA2 = robotA[2], robotA), i = 0; i < 1; i++) {
+for (numberA2 = robotA[0], nameA2 = robotA[1], skillA2 = robotA[2], robotA, i = 0; i < 1; i++) {
     console.log(nameA2);
 }
-for ((_m = getRobot(), numberA2 = _m[0], nameA2 = _m[1], skillA2 = _m[2], _m), i = 0; i < 1; i++) {
+for (_m = getRobot(), numberA2 = _m[0], nameA2 = _m[1], skillA2 = _m[2], _m, i = 0; i < 1; i++) {
     console.log(nameA2);
 }
-for ((_o = [2, "trimmer", "trimming"], numberA2 = _o[0], nameA2 = _o[1], skillA2 = _o[2], _o), i = 0; i < 1; i++) {
+for (_o = [2, "trimmer", "trimming"], numberA2 = _o[0], nameA2 = _o[1], skillA2 = _o[2], _o, i = 0; i < 1; i++) {
     console.log(nameA2);
 }
-for ((nameMA = multiRobotA[0], _p = multiRobotA[1], primarySkillA = _p[0], secondarySkillA = _p[1], multiRobotA), i = 0; i < 1; i++) {
+for (nameMA = multiRobotA[0], _p = multiRobotA[1], primarySkillA = _p[0], secondarySkillA = _p[1], multiRobotA, i = 0; i < 1; i++) {
     console.log(nameMA);
 }
-for ((_q = getMultiRobot(), nameMA = _q[0], _r = _q[1], primarySkillA = _r[0], secondarySkillA = _r[1], _q), i = 0; i < 1; i++) {
+for (_q = getMultiRobot(), nameMA = _q[0], _r = _q[1], primarySkillA = _r[0], secondarySkillA = _r[1], _q, i = 0; i < 1; i++) {
     console.log(nameMA);
 }
-for ((_s = ["trimmer", ["trimming", "edging"]], nameMA = _s[0], _t = _s[1], primarySkillA = _t[0], secondarySkillA = _t[1], _s), i = 0; i < 1; i++) {
+for (_s = ["trimmer", ["trimming", "edging"]], nameMA = _s[0], _t = _s[1], primarySkillA = _t[0], secondarySkillA = _t[1], _s, i = 0; i < 1; i++) {
     console.log(nameMA);
 }
-for ((numberA3 = robotA[0], robotAInfo = robotA.slice(1), robotA), i = 0; i < 1; i++) {
+for (numberA3 = robotA[0], robotAInfo = robotA.slice(1), robotA, i = 0; i < 1; i++) {
     console.log(numberA3);
 }
-for ((_u = getRobot(), numberA3 = _u[0], robotAInfo = _u.slice(1), _u), i = 0; i < 1; i++) {
+for (_u = getRobot(), numberA3 = _u[0], robotAInfo = _u.slice(1), _u, i = 0; i < 1; i++) {
     console.log(numberA3);
 }
-for ((_v = [2, "trimmer", "trimming"], numberA3 = _v[0], robotAInfo = _v.slice(1), _v), i = 0; i < 1; i++) {
+for (_v = [2, "trimmer", "trimming"], numberA3 = _v[0], robotAInfo = _v.slice(1), _v, i = 0; i < 1; i++) {
     console.log(numberA3);
 }
-for ((multiRobotAInfo = multiRobotA.slice(0), multiRobotA), i = 0; i < 1; i++) {
+for (multiRobotAInfo = multiRobotA.slice(0), multiRobotA, i = 0; i < 1; i++) {
     console.log(multiRobotAInfo);
 }
-for ((_w = getMultiRobot(), multiRobotAInfo = _w.slice(0), _w), i = 0; i < 1; i++) {
+for (_w = getMultiRobot(), multiRobotAInfo = _w.slice(0), _w, i = 0; i < 1; i++) {
     console.log(multiRobotAInfo);
 }
-for ((_x = ["trimmer", ["trimming", "edging"]], multiRobotAInfo = _x.slice(0), _x), i = 0; i < 1; i++) {
+for (_x = ["trimmer", ["trimming", "edging"]], multiRobotAInfo = _x.slice(0), _x, i = 0; i < 1; i++) {
     console.log(multiRobotAInfo);
 }
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js.map
index 046cd61ad40..4e060bd1d9a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForArrayBindingPattern2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPattern2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AACtG,IAAI,CAAS,CAAC;AAEd,GAAG,CAAC,CAAC,CAAG,iBAAK,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAsB,EAAnB,aAAK,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+BAAsC,EAAnC,aAAK,KAA8B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAG,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAK,WAAW,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAAsD,EAAnD,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,KAAoB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,wCAA0E,EAAvE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,KAAwC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAC,CAAC,mBAAO,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAsB,EAArB,eAAO,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+BAAsC,EAArC,eAAO,KAA8B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,CAAC,sBAAK,EAAI,WAAW,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAAyB,EAAxB,aAAK,KAAmB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,wCAA6C,EAA5C,aAAK,KAAuC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAC,CAAC,oBAAQ,EAAE,kBAAM,EAAE,mBAAO,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAwC,EAAvC,gBAAQ,EAAE,cAAM,EAAE,eAAO,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+BAAwD,EAAvD,gBAAQ,EAAE,cAAM,EAAE,eAAO,KAA8B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAC,uBAAM,EAAE,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAK,WAAW,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAA4D,EAA3D,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,KAAoB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,wCAAgF,EAA/E,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,KAAwC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAC,CAAC,oBAAQ,EAAE,4BAAa,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAsC,EAArC,gBAAQ,EAAE,wBAAa,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+BAA6D,EAA5D,gBAAQ,EAAE,wBAAa,KAAqC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAC,sCAAkB,EAAI,WAAW,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAAsC,EAArC,6BAAkB,KAAmB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,wCAA6E,EAA5E,6BAAkB,KAA0D,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPattern2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AACtG,IAAI,CAAS,CAAC;AAEd,GAAG,CAAC,CAAI,iBAAK,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsB,EAAnB,aAAK,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,+BAAsC,EAAnC,aAAK,MAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAI,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAK,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,oBAAsD,EAAnD,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,MAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,wCAA0E,EAAvE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,MAA0C,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAE,mBAAO,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsB,EAArB,eAAO,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,+BAAsC,EAArC,eAAO,MAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAE,sBAAK,EAAI,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,oBAAyB,EAAxB,aAAK,MAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,wCAA6C,EAA5C,aAAK,MAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAE,oBAAQ,EAAE,kBAAM,EAAE,mBAAO,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,eAAwC,EAAvC,gBAAQ,EAAE,cAAM,EAAE,eAAO,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,+BAAwD,EAAvD,gBAAQ,EAAE,cAAM,EAAE,eAAO,MAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAE,uBAAM,EAAE,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,EAAK,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,oBAA4D,EAA3D,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,MAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,wCAAgF,EAA/E,cAAM,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,MAA0C,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAE,oBAAQ,EAAE,4BAAa,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,eAAsC,EAArC,gBAAQ,EAAE,wBAAa,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+BAA6D,EAA5D,gBAAQ,EAAE,wBAAa,MAAuC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAE,sCAAkB,EAAI,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAC,oBAAsC,EAArC,6BAAkB,MAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC;AACD,GAAG,CAAC,CAAC,wCAA6E,EAA5E,6BAAkB,MAA4D,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.sourcemap.txt
index 186dc717e61..9b6f6146cad 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.sourcemap.txt
@@ -330,7 +330,7 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 2 >^^^^
 3 >    ^
 4 >     ^
-5 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >let 
@@ -341,75 +341,69 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 3 >Emitted(14, 6) Source(22, 14) + SourceIndex(0)
 4 >Emitted(14, 7) Source(22, 15) + SourceIndex(0)
 ---
->>>for ((nameA = robotA[1], robotA), i = 0; i < 1; i++) {
+>>>for (nameA = robotA[1], robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^
-7 >                       ^^
-8 >                         ^^^^^^
-9 >                               ^
-10>                                ^^
-11>                                  ^
-12>                                   ^^^
-13>                                      ^
-14>                                       ^^
-15>                                         ^
-16>                                          ^^^
-17>                                             ^
-18>                                              ^^
-19>                                                ^
-20>                                                 ^^
-21>                                                   ^^
-22>                                                     ^
+5 >     ^^^^^^^^^^^^^^^^^
+6 >                      ^^
+7 >                        ^^^^^^
+8 >                              ^^
+9 >                                ^
+10>                                 ^^^
+11>                                    ^
+12>                                     ^^
+13>                                       ^
+14>                                        ^^^
+15>                                           ^
+16>                                            ^^
+17>                                              ^
+18>                                               ^^
+19>                                                 ^^
+20>                                                   ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [, 
-6 >      nameA
-7 >                       ] = 
-8 >                         robotA
-9 >                               
-10>                                , 
-11>                                  i
-12>                                    = 
-13>                                      0
-14>                                       ; 
-15>                                         i
-16>                                           < 
-17>                                             1
-18>                                              ; 
-19>                                                i
-20>                                                 ++
-21>                                                   ) 
-22>                                                     {
+4 >    ([, 
+5 >     nameA
+6 >                      ] = 
+7 >                        robotA
+8 >                              , 
+9 >                                i
+10>                                  = 
+11>                                    0
+12>                                     ; 
+13>                                       i
+14>                                         < 
+15>                                           1
+16>                                            ; 
+17>                                              i
+18>                                               ++
+19>                                                 ) 
+20>                                                   {
 1->Emitted(15, 1) Source(24, 1) + SourceIndex(0)
 2 >Emitted(15, 4) Source(24, 4) + SourceIndex(0)
 3 >Emitted(15, 5) Source(24, 5) + SourceIndex(0)
-4 >Emitted(15, 6) Source(24, 6) + SourceIndex(0)
-5 >Emitted(15, 7) Source(24, 9) + SourceIndex(0)
-6 >Emitted(15, 24) Source(24, 14) + SourceIndex(0)
-7 >Emitted(15, 26) Source(24, 18) + SourceIndex(0)
-8 >Emitted(15, 32) Source(24, 24) + SourceIndex(0)
-9 >Emitted(15, 33) Source(24, 24) + SourceIndex(0)
-10>Emitted(15, 35) Source(24, 26) + SourceIndex(0)
-11>Emitted(15, 36) Source(24, 27) + SourceIndex(0)
-12>Emitted(15, 39) Source(24, 30) + SourceIndex(0)
-13>Emitted(15, 40) Source(24, 31) + SourceIndex(0)
-14>Emitted(15, 42) Source(24, 33) + SourceIndex(0)
-15>Emitted(15, 43) Source(24, 34) + SourceIndex(0)
-16>Emitted(15, 46) Source(24, 37) + SourceIndex(0)
-17>Emitted(15, 47) Source(24, 38) + SourceIndex(0)
-18>Emitted(15, 49) Source(24, 40) + SourceIndex(0)
-19>Emitted(15, 50) Source(24, 41) + SourceIndex(0)
-20>Emitted(15, 52) Source(24, 43) + SourceIndex(0)
-21>Emitted(15, 54) Source(24, 45) + SourceIndex(0)
-22>Emitted(15, 55) Source(24, 46) + SourceIndex(0)
+4 >Emitted(15, 6) Source(24, 9) + SourceIndex(0)
+5 >Emitted(15, 23) Source(24, 14) + SourceIndex(0)
+6 >Emitted(15, 25) Source(24, 18) + SourceIndex(0)
+7 >Emitted(15, 31) Source(24, 24) + SourceIndex(0)
+8 >Emitted(15, 33) Source(24, 26) + SourceIndex(0)
+9 >Emitted(15, 34) Source(24, 27) + SourceIndex(0)
+10>Emitted(15, 37) Source(24, 30) + SourceIndex(0)
+11>Emitted(15, 38) Source(24, 31) + SourceIndex(0)
+12>Emitted(15, 40) Source(24, 33) + SourceIndex(0)
+13>Emitted(15, 41) Source(24, 34) + SourceIndex(0)
+14>Emitted(15, 44) Source(24, 37) + SourceIndex(0)
+15>Emitted(15, 45) Source(24, 38) + SourceIndex(0)
+16>Emitted(15, 47) Source(24, 40) + SourceIndex(0)
+17>Emitted(15, 48) Source(24, 41) + SourceIndex(0)
+18>Emitted(15, 50) Source(24, 43) + SourceIndex(0)
+19>Emitted(15, 52) Source(24, 45) + SourceIndex(0)
+20>Emitted(15, 53) Source(24, 46) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -441,81 +435,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(17, 1) Source(26, 1) + SourceIndex(0)
 2 >Emitted(17, 2) Source(26, 2) + SourceIndex(0)
 ---
->>>for ((_a = getRobot(), nameA = _a[1], _a), i = 0; i < 1; i++) {
+>>>for (_a = getRobot(), nameA = _a[1], _a, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^
-9 >                                    ^^^^^
-10>                                         ^^
-11>                                           ^
-12>                                            ^^^
-13>                                               ^
-14>                                                ^^
-15>                                                  ^
-16>                                                   ^^^
-17>                                                      ^
-18>                                                       ^^
-19>                                                         ^
-20>                                                          ^^
-21>                                                            ^^
-22>                                                              ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^
+8 >                                   ^^^^^^
+9 >                                         ^
+10>                                          ^^^
+11>                                             ^
+12>                                              ^^
+13>                                                ^
+14>                                                 ^^^
+15>                                                    ^
+16>                                                     ^^
+17>                                                       ^
+18>                                                        ^^
+19>                                                          ^^
+20>                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, nameA] = getRobot()
-7 >                     
-8 >                       nameA
-9 >                                    ] = getRobot()
-10>                                         , 
-11>                                           i
-12>                                             = 
-13>                                               0
-14>                                                ; 
-15>                                                  i
-16>                                                    < 
-17>                                                      1
-18>                                                       ; 
-19>                                                         i
-20>                                                          ++
-21>                                                            ) 
-22>                                                              {
+5 >     [, nameA] = getRobot()
+6 >                    
+7 >                      nameA
+8 >                                   ] = getRobot(), 
+9 >                                         i
+10>                                           = 
+11>                                             0
+12>                                              ; 
+13>                                                i
+14>                                                  < 
+15>                                                    1
+16>                                                     ; 
+17>                                                       i
+18>                                                        ++
+19>                                                          ) 
+20>                                                            {
 1->Emitted(18, 1) Source(27, 1) + SourceIndex(0)
 2 >Emitted(18, 4) Source(27, 4) + SourceIndex(0)
 3 >Emitted(18, 5) Source(27, 5) + SourceIndex(0)
 4 >Emitted(18, 6) Source(27, 6) + SourceIndex(0)
-5 >Emitted(18, 7) Source(27, 6) + SourceIndex(0)
-6 >Emitted(18, 22) Source(27, 28) + SourceIndex(0)
-7 >Emitted(18, 24) Source(27, 9) + SourceIndex(0)
-8 >Emitted(18, 37) Source(27, 14) + SourceIndex(0)
-9 >Emitted(18, 42) Source(27, 28) + SourceIndex(0)
-10>Emitted(18, 44) Source(27, 30) + SourceIndex(0)
-11>Emitted(18, 45) Source(27, 31) + SourceIndex(0)
-12>Emitted(18, 48) Source(27, 34) + SourceIndex(0)
-13>Emitted(18, 49) Source(27, 35) + SourceIndex(0)
-14>Emitted(18, 51) Source(27, 37) + SourceIndex(0)
-15>Emitted(18, 52) Source(27, 38) + SourceIndex(0)
-16>Emitted(18, 55) Source(27, 41) + SourceIndex(0)
-17>Emitted(18, 56) Source(27, 42) + SourceIndex(0)
-18>Emitted(18, 58) Source(27, 44) + SourceIndex(0)
-19>Emitted(18, 59) Source(27, 45) + SourceIndex(0)
-20>Emitted(18, 61) Source(27, 47) + SourceIndex(0)
-21>Emitted(18, 63) Source(27, 49) + SourceIndex(0)
-22>Emitted(18, 64) Source(27, 50) + SourceIndex(0)
+5 >Emitted(18, 21) Source(27, 28) + SourceIndex(0)
+6 >Emitted(18, 23) Source(27, 9) + SourceIndex(0)
+7 >Emitted(18, 36) Source(27, 14) + SourceIndex(0)
+8 >Emitted(18, 42) Source(27, 30) + SourceIndex(0)
+9 >Emitted(18, 43) Source(27, 31) + SourceIndex(0)
+10>Emitted(18, 46) Source(27, 34) + SourceIndex(0)
+11>Emitted(18, 47) Source(27, 35) + SourceIndex(0)
+12>Emitted(18, 49) Source(27, 37) + SourceIndex(0)
+13>Emitted(18, 50) Source(27, 38) + SourceIndex(0)
+14>Emitted(18, 53) Source(27, 41) + SourceIndex(0)
+15>Emitted(18, 54) Source(27, 42) + SourceIndex(0)
+16>Emitted(18, 56) Source(27, 44) + SourceIndex(0)
+17>Emitted(18, 57) Source(27, 45) + SourceIndex(0)
+18>Emitted(18, 59) Source(27, 47) + SourceIndex(0)
+19>Emitted(18, 61) Source(27, 49) + SourceIndex(0)
+20>Emitted(18, 62) Source(27, 50) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -547,81 +535,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(20, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(20, 2) Source(29, 2) + SourceIndex(0)
 ---
->>>for ((_b = [2, "trimmer", "trimming"], nameA = _b[1], _b), i = 0; i < 1; i++) {
+>>>for (_b = [2, "trimmer", "trimming"], nameA = _b[1], _b, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                     ^^
-8 >                                       ^^^^^^^^^^^^^
-9 >                                                    ^^^^^
-10>                                                         ^^
-11>                                                           ^
-12>                                                            ^^^
-13>                                                               ^
-14>                                                                ^^
-15>                                                                  ^
-16>                                                                   ^^^
-17>                                                                      ^
-18>                                                                       ^^
-19>                                                                         ^
-20>                                                                          ^^
-21>                                                                            ^^
-22>                                                                              ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^
+8 >                                                   ^^^^^^
+9 >                                                         ^
+10>                                                          ^^^
+11>                                                             ^
+12>                                                              ^^
+13>                                                                ^
+14>                                                                 ^^^
+15>                                                                    ^
+16>                                                                     ^^
+17>                                                                       ^
+18>                                                                        ^^
+19>                                                                          ^^
+20>                                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, nameA] = [2, "trimmer", "trimming"]
-7 >                                     
-8 >                                       nameA
-9 >                                                    ] = [2, "trimmer", "trimming"]
-10>                                                         , 
-11>                                                           i
-12>                                                             = 
-13>                                                               0
-14>                                                                ; 
-15>                                                                  i
-16>                                                                    < 
-17>                                                                      1
-18>                                                                       ; 
-19>                                                                         i
-20>                                                                          ++
-21>                                                                            ) 
-22>                                                                              {
+5 >     [, nameA] = [2, "trimmer", "trimming"]
+6 >                                    
+7 >                                      nameA
+8 >                                                   ] = [2, "trimmer", "trimming"], 
+9 >                                                         i
+10>                                                           = 
+11>                                                             0
+12>                                                              ; 
+13>                                                                i
+14>                                                                  < 
+15>                                                                    1
+16>                                                                     ; 
+17>                                                                       i
+18>                                                                        ++
+19>                                                                          ) 
+20>                                                                            {
 1->Emitted(21, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(30, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(30, 5) + SourceIndex(0)
 4 >Emitted(21, 6) Source(30, 6) + SourceIndex(0)
-5 >Emitted(21, 7) Source(30, 6) + SourceIndex(0)
-6 >Emitted(21, 38) Source(30, 44) + SourceIndex(0)
-7 >Emitted(21, 40) Source(30, 9) + SourceIndex(0)
-8 >Emitted(21, 53) Source(30, 14) + SourceIndex(0)
-9 >Emitted(21, 58) Source(30, 44) + SourceIndex(0)
-10>Emitted(21, 60) Source(30, 46) + SourceIndex(0)
-11>Emitted(21, 61) Source(30, 47) + SourceIndex(0)
-12>Emitted(21, 64) Source(30, 50) + SourceIndex(0)
-13>Emitted(21, 65) Source(30, 51) + SourceIndex(0)
-14>Emitted(21, 67) Source(30, 53) + SourceIndex(0)
-15>Emitted(21, 68) Source(30, 54) + SourceIndex(0)
-16>Emitted(21, 71) Source(30, 57) + SourceIndex(0)
-17>Emitted(21, 72) Source(30, 58) + SourceIndex(0)
-18>Emitted(21, 74) Source(30, 60) + SourceIndex(0)
-19>Emitted(21, 75) Source(30, 61) + SourceIndex(0)
-20>Emitted(21, 77) Source(30, 63) + SourceIndex(0)
-21>Emitted(21, 79) Source(30, 65) + SourceIndex(0)
-22>Emitted(21, 80) Source(30, 66) + SourceIndex(0)
+5 >Emitted(21, 37) Source(30, 44) + SourceIndex(0)
+6 >Emitted(21, 39) Source(30, 9) + SourceIndex(0)
+7 >Emitted(21, 52) Source(30, 14) + SourceIndex(0)
+8 >Emitted(21, 58) Source(30, 46) + SourceIndex(0)
+9 >Emitted(21, 59) Source(30, 47) + SourceIndex(0)
+10>Emitted(21, 62) Source(30, 50) + SourceIndex(0)
+11>Emitted(21, 63) Source(30, 51) + SourceIndex(0)
+12>Emitted(21, 65) Source(30, 53) + SourceIndex(0)
+13>Emitted(21, 66) Source(30, 54) + SourceIndex(0)
+14>Emitted(21, 69) Source(30, 57) + SourceIndex(0)
+15>Emitted(21, 70) Source(30, 58) + SourceIndex(0)
+16>Emitted(21, 72) Source(30, 60) + SourceIndex(0)
+17>Emitted(21, 73) Source(30, 61) + SourceIndex(0)
+18>Emitted(21, 75) Source(30, 63) + SourceIndex(0)
+19>Emitted(21, 77) Source(30, 65) + SourceIndex(0)
+20>Emitted(21, 78) Source(30, 66) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -653,93 +635,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(23, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(23, 2) Source(32, 2) + SourceIndex(0)
 ---
->>>for ((_c = multiRobotA[1], primarySkillA = _c[0], secondarySkillA = _c[1], multiRobotA), i = 0; i < 1; i++) {
+>>>for (_c = multiRobotA[1], primarySkillA = _c[0], secondarySkillA = _c[1], multiRobotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^
-7 >                         ^^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                ^^
-10>                                                  ^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                         ^^
-12>                                                                           ^^^^^^^^^^^
-13>                                                                                      ^
-14>                                                                                       ^^
-15>                                                                                         ^
-16>                                                                                          ^^^
-17>                                                                                             ^
-18>                                                                                              ^^
-19>                                                                                                ^
-20>                                                                                                 ^^^
-21>                                                                                                    ^
-22>                                                                                                     ^^
-23>                                                                                                       ^
-24>                                                                                                        ^^
-25>                                                                                                          ^^
-26>                                                                                                            ^
+5 >     ^^^^^^^^^^^^^^^^^^^
+6 >                        ^^
+7 >                          ^^^^^^^^^^^^^^^^^^^^^
+8 >                                               ^^
+9 >                                                 ^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                        ^^
+11>                                                                          ^^^^^^^^^^^
+12>                                                                                     ^^
+13>                                                                                       ^
+14>                                                                                        ^^^
+15>                                                                                           ^
+16>                                                                                            ^^
+17>                                                                                              ^
+18>                                                                                               ^^^
+19>                                                                                                  ^
+20>                                                                                                   ^^
+21>                                                                                                     ^
+22>                                                                                                      ^^
+23>                                                                                                        ^^
+24>                                                                                                          ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     [, 
-6 >      [primarySkillA, secondarySkillA]
-7 >                         
-8 >                           primarySkillA
-9 >                                                , 
-10>                                                  secondarySkillA
-11>                                                                         ]] = 
-12>                                                                           multiRobotA
-13>                                                                                      
-14>                                                                                       , 
-15>                                                                                         i
-16>                                                                                           = 
-17>                                                                                             0
-18>                                                                                              ; 
-19>                                                                                                i
-20>                                                                                                  < 
-21>                                                                                                    1
-22>                                                                                                     ; 
-23>                                                                                                       i
-24>                                                                                                        ++
-25>                                                                                                          ) 
-26>                                                                                                            {
+4 >    ([, 
+5 >     [primarySkillA, secondarySkillA]
+6 >                        
+7 >                          primarySkillA
+8 >                                               , 
+9 >                                                 secondarySkillA
+10>                                                                        ]] = 
+11>                                                                          multiRobotA
+12>                                                                                     , 
+13>                                                                                       i
+14>                                                                                         = 
+15>                                                                                           0
+16>                                                                                            ; 
+17>                                                                                              i
+18>                                                                                                < 
+19>                                                                                                  1
+20>                                                                                                   ; 
+21>                                                                                                     i
+22>                                                                                                      ++
+23>                                                                                                        ) 
+24>                                                                                                          {
 1->Emitted(24, 1) Source(33, 1) + SourceIndex(0)
 2 >Emitted(24, 4) Source(33, 4) + SourceIndex(0)
 3 >Emitted(24, 5) Source(33, 5) + SourceIndex(0)
-4 >Emitted(24, 6) Source(33, 6) + SourceIndex(0)
-5 >Emitted(24, 7) Source(33, 9) + SourceIndex(0)
-6 >Emitted(24, 26) Source(33, 41) + SourceIndex(0)
-7 >Emitted(24, 28) Source(33, 10) + SourceIndex(0)
-8 >Emitted(24, 49) Source(33, 23) + SourceIndex(0)
-9 >Emitted(24, 51) Source(33, 25) + SourceIndex(0)
-10>Emitted(24, 74) Source(33, 40) + SourceIndex(0)
-11>Emitted(24, 76) Source(33, 45) + SourceIndex(0)
-12>Emitted(24, 87) Source(33, 56) + SourceIndex(0)
-13>Emitted(24, 88) Source(33, 56) + SourceIndex(0)
-14>Emitted(24, 90) Source(33, 58) + SourceIndex(0)
-15>Emitted(24, 91) Source(33, 59) + SourceIndex(0)
-16>Emitted(24, 94) Source(33, 62) + SourceIndex(0)
-17>Emitted(24, 95) Source(33, 63) + SourceIndex(0)
-18>Emitted(24, 97) Source(33, 65) + SourceIndex(0)
-19>Emitted(24, 98) Source(33, 66) + SourceIndex(0)
-20>Emitted(24, 101) Source(33, 69) + SourceIndex(0)
-21>Emitted(24, 102) Source(33, 70) + SourceIndex(0)
-22>Emitted(24, 104) Source(33, 72) + SourceIndex(0)
-23>Emitted(24, 105) Source(33, 73) + SourceIndex(0)
-24>Emitted(24, 107) Source(33, 75) + SourceIndex(0)
-25>Emitted(24, 109) Source(33, 77) + SourceIndex(0)
-26>Emitted(24, 110) Source(33, 78) + SourceIndex(0)
+4 >Emitted(24, 6) Source(33, 9) + SourceIndex(0)
+5 >Emitted(24, 25) Source(33, 41) + SourceIndex(0)
+6 >Emitted(24, 27) Source(33, 10) + SourceIndex(0)
+7 >Emitted(24, 48) Source(33, 23) + SourceIndex(0)
+8 >Emitted(24, 50) Source(33, 25) + SourceIndex(0)
+9 >Emitted(24, 73) Source(33, 40) + SourceIndex(0)
+10>Emitted(24, 75) Source(33, 45) + SourceIndex(0)
+11>Emitted(24, 86) Source(33, 56) + SourceIndex(0)
+12>Emitted(24, 88) Source(33, 58) + SourceIndex(0)
+13>Emitted(24, 89) Source(33, 59) + SourceIndex(0)
+14>Emitted(24, 92) Source(33, 62) + SourceIndex(0)
+15>Emitted(24, 93) Source(33, 63) + SourceIndex(0)
+16>Emitted(24, 95) Source(33, 65) + SourceIndex(0)
+17>Emitted(24, 96) Source(33, 66) + SourceIndex(0)
+18>Emitted(24, 99) Source(33, 69) + SourceIndex(0)
+19>Emitted(24, 100) Source(33, 70) + SourceIndex(0)
+20>Emitted(24, 102) Source(33, 72) + SourceIndex(0)
+21>Emitted(24, 103) Source(33, 73) + SourceIndex(0)
+22>Emitted(24, 105) Source(33, 75) + SourceIndex(0)
+23>Emitted(24, 107) Source(33, 77) + SourceIndex(0)
+24>Emitted(24, 108) Source(33, 78) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -771,93 +747,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(26, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(26, 2) Source(35, 2) + SourceIndex(0)
 ---
->>>for ((_d = getMultiRobot(), _e = _d[1], primarySkillA = _e[0], secondarySkillA = _e[1], _d), i = 0; i < 1; i++) {
+>>>for (_d = getMultiRobot(), _e = _d[1], primarySkillA = _e[0], secondarySkillA = _e[1], _d, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^
-9 >                                      ^^
-10>                                        ^^^^^^^^^^^^^^^^^^^^^
-11>                                                             ^^
-12>                                                               ^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                      ^^^^^
-14>                                                                                           ^^
-15>                                                                                             ^
-16>                                                                                              ^^^
-17>                                                                                                 ^
-18>                                                                                                  ^^
-19>                                                                                                    ^
-20>                                                                                                     ^^^
-21>                                                                                                        ^
-22>                                                                                                         ^^
-23>                                                                                                           ^
-24>                                                                                                            ^^
-25>                                                                                                              ^^
-26>                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^
+8 >                                     ^^
+9 >                                       ^^^^^^^^^^^^^^^^^^^^^
+10>                                                            ^^
+11>                                                              ^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                     ^^^^^^
+13>                                                                                           ^
+14>                                                                                            ^^^
+15>                                                                                               ^
+16>                                                                                                ^^
+17>                                                                                                  ^
+18>                                                                                                   ^^^
+19>                                                                                                      ^
+20>                                                                                                       ^^
+21>                                                                                                         ^
+22>                                                                                                          ^^
+23>                                                                                                            ^^
+24>                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, [primarySkillA, secondarySkillA]] = getMultiRobot()
-7 >                          
-8 >                            [primarySkillA, secondarySkillA]
-9 >                                      
-10>                                        primarySkillA
-11>                                                             , 
-12>                                                               secondarySkillA
-13>                                                                                      ]] = getMultiRobot()
-14>                                                                                           , 
-15>                                                                                             i
-16>                                                                                               = 
-17>                                                                                                 0
-18>                                                                                                  ; 
-19>                                                                                                    i
-20>                                                                                                      < 
-21>                                                                                                        1
-22>                                                                                                         ; 
-23>                                                                                                           i
-24>                                                                                                            ++
-25>                                                                                                              ) 
-26>                                                                                                                {
+5 >     [, [primarySkillA, secondarySkillA]] = getMultiRobot()
+6 >                         
+7 >                           [primarySkillA, secondarySkillA]
+8 >                                     
+9 >                                       primarySkillA
+10>                                                            , 
+11>                                                              secondarySkillA
+12>                                                                                     ]] = getMultiRobot(), 
+13>                                                                                           i
+14>                                                                                             = 
+15>                                                                                               0
+16>                                                                                                ; 
+17>                                                                                                  i
+18>                                                                                                    < 
+19>                                                                                                      1
+20>                                                                                                       ; 
+21>                                                                                                         i
+22>                                                                                                          ++
+23>                                                                                                            ) 
+24>                                                                                                              {
 1->Emitted(27, 1) Source(36, 1) + SourceIndex(0)
 2 >Emitted(27, 4) Source(36, 4) + SourceIndex(0)
 3 >Emitted(27, 5) Source(36, 5) + SourceIndex(0)
 4 >Emitted(27, 6) Source(36, 6) + SourceIndex(0)
-5 >Emitted(27, 7) Source(36, 6) + SourceIndex(0)
-6 >Emitted(27, 27) Source(36, 60) + SourceIndex(0)
-7 >Emitted(27, 29) Source(36, 9) + SourceIndex(0)
-8 >Emitted(27, 39) Source(36, 41) + SourceIndex(0)
-9 >Emitted(27, 41) Source(36, 10) + SourceIndex(0)
-10>Emitted(27, 62) Source(36, 23) + SourceIndex(0)
-11>Emitted(27, 64) Source(36, 25) + SourceIndex(0)
-12>Emitted(27, 87) Source(36, 40) + SourceIndex(0)
-13>Emitted(27, 92) Source(36, 60) + SourceIndex(0)
-14>Emitted(27, 94) Source(36, 62) + SourceIndex(0)
-15>Emitted(27, 95) Source(36, 63) + SourceIndex(0)
-16>Emitted(27, 98) Source(36, 66) + SourceIndex(0)
-17>Emitted(27, 99) Source(36, 67) + SourceIndex(0)
-18>Emitted(27, 101) Source(36, 69) + SourceIndex(0)
-19>Emitted(27, 102) Source(36, 70) + SourceIndex(0)
-20>Emitted(27, 105) Source(36, 73) + SourceIndex(0)
-21>Emitted(27, 106) Source(36, 74) + SourceIndex(0)
-22>Emitted(27, 108) Source(36, 76) + SourceIndex(0)
-23>Emitted(27, 109) Source(36, 77) + SourceIndex(0)
-24>Emitted(27, 111) Source(36, 79) + SourceIndex(0)
-25>Emitted(27, 113) Source(36, 81) + SourceIndex(0)
-26>Emitted(27, 114) Source(36, 82) + SourceIndex(0)
+5 >Emitted(27, 26) Source(36, 60) + SourceIndex(0)
+6 >Emitted(27, 28) Source(36, 9) + SourceIndex(0)
+7 >Emitted(27, 38) Source(36, 41) + SourceIndex(0)
+8 >Emitted(27, 40) Source(36, 10) + SourceIndex(0)
+9 >Emitted(27, 61) Source(36, 23) + SourceIndex(0)
+10>Emitted(27, 63) Source(36, 25) + SourceIndex(0)
+11>Emitted(27, 86) Source(36, 40) + SourceIndex(0)
+12>Emitted(27, 92) Source(36, 62) + SourceIndex(0)
+13>Emitted(27, 93) Source(36, 63) + SourceIndex(0)
+14>Emitted(27, 96) Source(36, 66) + SourceIndex(0)
+15>Emitted(27, 97) Source(36, 67) + SourceIndex(0)
+16>Emitted(27, 99) Source(36, 69) + SourceIndex(0)
+17>Emitted(27, 100) Source(36, 70) + SourceIndex(0)
+18>Emitted(27, 103) Source(36, 73) + SourceIndex(0)
+19>Emitted(27, 104) Source(36, 74) + SourceIndex(0)
+20>Emitted(27, 106) Source(36, 76) + SourceIndex(0)
+21>Emitted(27, 107) Source(36, 77) + SourceIndex(0)
+22>Emitted(27, 109) Source(36, 79) + SourceIndex(0)
+23>Emitted(27, 111) Source(36, 81) + SourceIndex(0)
+24>Emitted(27, 112) Source(36, 82) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -889,93 +859,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(29, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(29, 2) Source(38, 2) + SourceIndex(0)
 ---
->>>for ((_f = ["trimmer", ["trimming", "edging"]], _g = _f[1], primarySkillA = _g[0], secondarySkillA = _g[1], _f), i = 0; i < 1; i++) {
+>>>for (_f = ["trimmer", ["trimming", "edging"]], _g = _f[1], primarySkillA = _g[0], secondarySkillA = _g[1], _f, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                              ^^
-8 >                                                ^^^^^^^^^^
-9 >                                                          ^^
-10>                                                            ^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                 ^^
-12>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                          ^^^^^
-14>                                                                                                               ^^
-15>                                                                                                                 ^
-16>                                                                                                                  ^^^
-17>                                                                                                                     ^
-18>                                                                                                                      ^^
-19>                                                                                                                        ^
-20>                                                                                                                         ^^^
-21>                                                                                                                            ^
-22>                                                                                                                             ^^
-23>                                                                                                                               ^
-24>                                                                                                                                ^^
-25>                                                                                                                                  ^^
-26>                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^
+8 >                                                         ^^
+9 >                                                           ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                ^^
+11>                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                         ^^^^^^
+13>                                                                                                               ^
+14>                                                                                                                ^^^
+15>                                                                                                                   ^
+16>                                                                                                                    ^^
+17>                                                                                                                      ^
+18>                                                                                                                       ^^^
+19>                                                                                                                          ^
+20>                                                                                                                           ^^
+21>                                                                                                                             ^
+22>                                                                                                                              ^^
+23>                                                                                                                                ^^
+24>                                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
-7 >                                              
-8 >                                                [primarySkillA, secondarySkillA]
-9 >                                                          
-10>                                                            primarySkillA
-11>                                                                                 , 
-12>                                                                                   secondarySkillA
-13>                                                                                                          ]] = ["trimmer", ["trimming", "edging"]]
-14>                                                                                                               , 
-15>                                                                                                                 i
-16>                                                                                                                   = 
-17>                                                                                                                     0
-18>                                                                                                                      ; 
-19>                                                                                                                        i
-20>                                                                                                                          < 
-21>                                                                                                                            1
-22>                                                                                                                             ; 
-23>                                                                                                                               i
-24>                                                                                                                                ++
-25>                                                                                                                                  ) 
-26>                                                                                                                                    {
+5 >     [, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
+6 >                                             
+7 >                                               [primarySkillA, secondarySkillA]
+8 >                                                         
+9 >                                                           primarySkillA
+10>                                                                                , 
+11>                                                                                  secondarySkillA
+12>                                                                                                         ]] = ["trimmer", ["trimming", "edging"]], 
+13>                                                                                                               i
+14>                                                                                                                 = 
+15>                                                                                                                   0
+16>                                                                                                                    ; 
+17>                                                                                                                      i
+18>                                                                                                                        < 
+19>                                                                                                                          1
+20>                                                                                                                           ; 
+21>                                                                                                                             i
+22>                                                                                                                              ++
+23>                                                                                                                                ) 
+24>                                                                                                                                  {
 1->Emitted(30, 1) Source(39, 1) + SourceIndex(0)
 2 >Emitted(30, 4) Source(39, 4) + SourceIndex(0)
 3 >Emitted(30, 5) Source(39, 5) + SourceIndex(0)
 4 >Emitted(30, 6) Source(39, 6) + SourceIndex(0)
-5 >Emitted(30, 7) Source(39, 6) + SourceIndex(0)
-6 >Emitted(30, 47) Source(39, 80) + SourceIndex(0)
-7 >Emitted(30, 49) Source(39, 9) + SourceIndex(0)
-8 >Emitted(30, 59) Source(39, 41) + SourceIndex(0)
-9 >Emitted(30, 61) Source(39, 10) + SourceIndex(0)
-10>Emitted(30, 82) Source(39, 23) + SourceIndex(0)
-11>Emitted(30, 84) Source(39, 25) + SourceIndex(0)
-12>Emitted(30, 107) Source(39, 40) + SourceIndex(0)
-13>Emitted(30, 112) Source(39, 80) + SourceIndex(0)
-14>Emitted(30, 114) Source(39, 82) + SourceIndex(0)
-15>Emitted(30, 115) Source(39, 83) + SourceIndex(0)
-16>Emitted(30, 118) Source(39, 86) + SourceIndex(0)
-17>Emitted(30, 119) Source(39, 87) + SourceIndex(0)
-18>Emitted(30, 121) Source(39, 89) + SourceIndex(0)
-19>Emitted(30, 122) Source(39, 90) + SourceIndex(0)
-20>Emitted(30, 125) Source(39, 93) + SourceIndex(0)
-21>Emitted(30, 126) Source(39, 94) + SourceIndex(0)
-22>Emitted(30, 128) Source(39, 96) + SourceIndex(0)
-23>Emitted(30, 129) Source(39, 97) + SourceIndex(0)
-24>Emitted(30, 131) Source(39, 99) + SourceIndex(0)
-25>Emitted(30, 133) Source(39, 101) + SourceIndex(0)
-26>Emitted(30, 134) Source(39, 102) + SourceIndex(0)
+5 >Emitted(30, 46) Source(39, 80) + SourceIndex(0)
+6 >Emitted(30, 48) Source(39, 9) + SourceIndex(0)
+7 >Emitted(30, 58) Source(39, 41) + SourceIndex(0)
+8 >Emitted(30, 60) Source(39, 10) + SourceIndex(0)
+9 >Emitted(30, 81) Source(39, 23) + SourceIndex(0)
+10>Emitted(30, 83) Source(39, 25) + SourceIndex(0)
+11>Emitted(30, 106) Source(39, 40) + SourceIndex(0)
+12>Emitted(30, 112) Source(39, 82) + SourceIndex(0)
+13>Emitted(30, 113) Source(39, 83) + SourceIndex(0)
+14>Emitted(30, 116) Source(39, 86) + SourceIndex(0)
+15>Emitted(30, 117) Source(39, 87) + SourceIndex(0)
+16>Emitted(30, 119) Source(39, 89) + SourceIndex(0)
+17>Emitted(30, 120) Source(39, 90) + SourceIndex(0)
+18>Emitted(30, 123) Source(39, 93) + SourceIndex(0)
+19>Emitted(30, 124) Source(39, 94) + SourceIndex(0)
+20>Emitted(30, 126) Source(39, 96) + SourceIndex(0)
+21>Emitted(30, 127) Source(39, 97) + SourceIndex(0)
+22>Emitted(30, 129) Source(39, 99) + SourceIndex(0)
+23>Emitted(30, 131) Source(39, 101) + SourceIndex(0)
+24>Emitted(30, 132) Source(39, 102) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -1007,82 +971,76 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(32, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(32, 2) Source(41, 2) + SourceIndex(0)
 ---
->>>for ((numberB = robotA[0], robotA), i = 0; i < 1; i++) {
+>>>for (numberB = robotA[0], robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^
-7 >                         ^^
-8 >                           ^^^^^^
-9 >                                 ^
-10>                                  ^^
-11>                                    ^
-12>                                     ^^^
-13>                                        ^
-14>                                         ^^
-15>                                           ^
-16>                                            ^^^
-17>                                               ^
-18>                                                ^^
-19>                                                  ^
-20>                                                   ^^
-21>                                                     ^^
-22>                                                       ^
+5 >     ^^^^^^^^^^^^^^^^^^^
+6 >                        ^^
+7 >                          ^^^^^^
+8 >                                ^^
+9 >                                  ^
+10>                                   ^^^
+11>                                      ^
+12>                                       ^^
+13>                                         ^
+14>                                          ^^^
+15>                                             ^
+16>                                              ^^
+17>                                                ^
+18>                                                 ^^
+19>                                                   ^^
+20>                                                     ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      numberB
-7 >                         ] = 
-8 >                           robotA
-9 >                                 
-10>                                  , 
-11>                                    i
-12>                                      = 
-13>                                        0
-14>                                         ; 
-15>                                           i
-16>                                             < 
-17>                                               1
-18>                                                ; 
-19>                                                  i
-20>                                                   ++
-21>                                                     ) 
-22>                                                       {
+4 >    ([
+5 >     numberB
+6 >                        ] = 
+7 >                          robotA
+8 >                                , 
+9 >                                  i
+10>                                    = 
+11>                                      0
+12>                                       ; 
+13>                                         i
+14>                                           < 
+15>                                             1
+16>                                              ; 
+17>                                                i
+18>                                                 ++
+19>                                                   ) 
+20>                                                     {
 1->Emitted(33, 1) Source(43, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(43, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(43, 5) + SourceIndex(0)
-4 >Emitted(33, 6) Source(43, 6) + SourceIndex(0)
-5 >Emitted(33, 7) Source(43, 7) + SourceIndex(0)
-6 >Emitted(33, 26) Source(43, 14) + SourceIndex(0)
-7 >Emitted(33, 28) Source(43, 18) + SourceIndex(0)
-8 >Emitted(33, 34) Source(43, 24) + SourceIndex(0)
-9 >Emitted(33, 35) Source(43, 24) + SourceIndex(0)
-10>Emitted(33, 37) Source(43, 26) + SourceIndex(0)
-11>Emitted(33, 38) Source(43, 27) + SourceIndex(0)
-12>Emitted(33, 41) Source(43, 30) + SourceIndex(0)
-13>Emitted(33, 42) Source(43, 31) + SourceIndex(0)
-14>Emitted(33, 44) Source(43, 33) + SourceIndex(0)
-15>Emitted(33, 45) Source(43, 34) + SourceIndex(0)
-16>Emitted(33, 48) Source(43, 37) + SourceIndex(0)
-17>Emitted(33, 49) Source(43, 38) + SourceIndex(0)
-18>Emitted(33, 51) Source(43, 40) + SourceIndex(0)
-19>Emitted(33, 52) Source(43, 41) + SourceIndex(0)
-20>Emitted(33, 54) Source(43, 43) + SourceIndex(0)
-21>Emitted(33, 56) Source(43, 45) + SourceIndex(0)
-22>Emitted(33, 57) Source(43, 46) + SourceIndex(0)
+4 >Emitted(33, 6) Source(43, 7) + SourceIndex(0)
+5 >Emitted(33, 25) Source(43, 14) + SourceIndex(0)
+6 >Emitted(33, 27) Source(43, 18) + SourceIndex(0)
+7 >Emitted(33, 33) Source(43, 24) + SourceIndex(0)
+8 >Emitted(33, 35) Source(43, 26) + SourceIndex(0)
+9 >Emitted(33, 36) Source(43, 27) + SourceIndex(0)
+10>Emitted(33, 39) Source(43, 30) + SourceIndex(0)
+11>Emitted(33, 40) Source(43, 31) + SourceIndex(0)
+12>Emitted(33, 42) Source(43, 33) + SourceIndex(0)
+13>Emitted(33, 43) Source(43, 34) + SourceIndex(0)
+14>Emitted(33, 46) Source(43, 37) + SourceIndex(0)
+15>Emitted(33, 47) Source(43, 38) + SourceIndex(0)
+16>Emitted(33, 49) Source(43, 40) + SourceIndex(0)
+17>Emitted(33, 50) Source(43, 41) + SourceIndex(0)
+18>Emitted(33, 52) Source(43, 43) + SourceIndex(0)
+19>Emitted(33, 54) Source(43, 45) + SourceIndex(0)
+20>Emitted(33, 55) Source(43, 46) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1114,81 +1072,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(35, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(35, 2) Source(45, 2) + SourceIndex(0)
 ---
->>>for ((_h = getRobot(), numberB = _h[0], _h), i = 0; i < 1; i++) {
+>>>for (_h = getRobot(), numberB = _h[0], _h, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^
-9 >                                      ^^^^^
-10>                                           ^^
-11>                                             ^
-12>                                              ^^^
-13>                                                 ^
-14>                                                  ^^
-15>                                                    ^
-16>                                                     ^^^
-17>                                                        ^
-18>                                                         ^^
-19>                                                           ^
-20>                                                            ^^
-21>                                                              ^^
-22>                                                                ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^
+8 >                                     ^^^^^^
+9 >                                           ^
+10>                                            ^^^
+11>                                               ^
+12>                                                ^^
+13>                                                  ^
+14>                                                   ^^^
+15>                                                      ^
+16>                                                       ^^
+17>                                                         ^
+18>                                                          ^^
+19>                                                            ^^
+20>                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberB] = getRobot()
-7 >                     
-8 >                       numberB
-9 >                                      ] = getRobot()
-10>                                           , 
-11>                                             i
-12>                                               = 
-13>                                                 0
-14>                                                  ; 
-15>                                                    i
-16>                                                      < 
-17>                                                        1
-18>                                                         ; 
-19>                                                           i
-20>                                                            ++
-21>                                                              ) 
-22>                                                                {
+5 >     [numberB] = getRobot()
+6 >                    
+7 >                      numberB
+8 >                                     ] = getRobot(), 
+9 >                                           i
+10>                                             = 
+11>                                               0
+12>                                                ; 
+13>                                                  i
+14>                                                    < 
+15>                                                      1
+16>                                                       ; 
+17>                                                         i
+18>                                                          ++
+19>                                                            ) 
+20>                                                              {
 1->Emitted(36, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(36, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(36, 5) Source(46, 5) + SourceIndex(0)
 4 >Emitted(36, 6) Source(46, 6) + SourceIndex(0)
-5 >Emitted(36, 7) Source(46, 6) + SourceIndex(0)
-6 >Emitted(36, 22) Source(46, 28) + SourceIndex(0)
-7 >Emitted(36, 24) Source(46, 7) + SourceIndex(0)
-8 >Emitted(36, 39) Source(46, 14) + SourceIndex(0)
-9 >Emitted(36, 44) Source(46, 28) + SourceIndex(0)
-10>Emitted(36, 46) Source(46, 30) + SourceIndex(0)
-11>Emitted(36, 47) Source(46, 31) + SourceIndex(0)
-12>Emitted(36, 50) Source(46, 34) + SourceIndex(0)
-13>Emitted(36, 51) Source(46, 35) + SourceIndex(0)
-14>Emitted(36, 53) Source(46, 37) + SourceIndex(0)
-15>Emitted(36, 54) Source(46, 38) + SourceIndex(0)
-16>Emitted(36, 57) Source(46, 41) + SourceIndex(0)
-17>Emitted(36, 58) Source(46, 42) + SourceIndex(0)
-18>Emitted(36, 60) Source(46, 44) + SourceIndex(0)
-19>Emitted(36, 61) Source(46, 45) + SourceIndex(0)
-20>Emitted(36, 63) Source(46, 47) + SourceIndex(0)
-21>Emitted(36, 65) Source(46, 49) + SourceIndex(0)
-22>Emitted(36, 66) Source(46, 50) + SourceIndex(0)
+5 >Emitted(36, 21) Source(46, 28) + SourceIndex(0)
+6 >Emitted(36, 23) Source(46, 7) + SourceIndex(0)
+7 >Emitted(36, 38) Source(46, 14) + SourceIndex(0)
+8 >Emitted(36, 44) Source(46, 30) + SourceIndex(0)
+9 >Emitted(36, 45) Source(46, 31) + SourceIndex(0)
+10>Emitted(36, 48) Source(46, 34) + SourceIndex(0)
+11>Emitted(36, 49) Source(46, 35) + SourceIndex(0)
+12>Emitted(36, 51) Source(46, 37) + SourceIndex(0)
+13>Emitted(36, 52) Source(46, 38) + SourceIndex(0)
+14>Emitted(36, 55) Source(46, 41) + SourceIndex(0)
+15>Emitted(36, 56) Source(46, 42) + SourceIndex(0)
+16>Emitted(36, 58) Source(46, 44) + SourceIndex(0)
+17>Emitted(36, 59) Source(46, 45) + SourceIndex(0)
+18>Emitted(36, 61) Source(46, 47) + SourceIndex(0)
+19>Emitted(36, 63) Source(46, 49) + SourceIndex(0)
+20>Emitted(36, 64) Source(46, 50) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1220,81 +1172,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(38, 1) Source(48, 1) + SourceIndex(0)
 2 >Emitted(38, 2) Source(48, 2) + SourceIndex(0)
 ---
->>>for ((_j = [2, "trimmer", "trimming"], numberB = _j[0], _j), i = 0; i < 1; i++) {
+>>>for (_j = [2, "trimmer", "trimming"], numberB = _j[0], _j, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                     ^^
-8 >                                       ^^^^^^^^^^^^^^^
-9 >                                                      ^^^^^
-10>                                                           ^^
-11>                                                             ^
-12>                                                              ^^^
-13>                                                                 ^
-14>                                                                  ^^
-15>                                                                    ^
-16>                                                                     ^^^
-17>                                                                        ^
-18>                                                                         ^^
-19>                                                                           ^
-20>                                                                            ^^
-21>                                                                              ^^
-22>                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^
+8 >                                                     ^^^^^^
+9 >                                                           ^
+10>                                                            ^^^
+11>                                                               ^
+12>                                                                ^^
+13>                                                                  ^
+14>                                                                   ^^^
+15>                                                                      ^
+16>                                                                       ^^
+17>                                                                         ^
+18>                                                                          ^^
+19>                                                                            ^^
+20>                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberB] = [2, "trimmer", "trimming"]
-7 >                                     
-8 >                                       numberB
-9 >                                                      ] = [2, "trimmer", "trimming"]
-10>                                                           , 
-11>                                                             i
-12>                                                               = 
-13>                                                                 0
-14>                                                                  ; 
-15>                                                                    i
-16>                                                                      < 
-17>                                                                        1
-18>                                                                         ; 
-19>                                                                           i
-20>                                                                            ++
-21>                                                                              ) 
-22>                                                                                {
+5 >     [numberB] = [2, "trimmer", "trimming"]
+6 >                                    
+7 >                                      numberB
+8 >                                                     ] = [2, "trimmer", "trimming"], 
+9 >                                                           i
+10>                                                             = 
+11>                                                               0
+12>                                                                ; 
+13>                                                                  i
+14>                                                                    < 
+15>                                                                      1
+16>                                                                       ; 
+17>                                                                         i
+18>                                                                          ++
+19>                                                                            ) 
+20>                                                                              {
 1->Emitted(39, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(49, 5) + SourceIndex(0)
 4 >Emitted(39, 6) Source(49, 6) + SourceIndex(0)
-5 >Emitted(39, 7) Source(49, 6) + SourceIndex(0)
-6 >Emitted(39, 38) Source(49, 44) + SourceIndex(0)
-7 >Emitted(39, 40) Source(49, 7) + SourceIndex(0)
-8 >Emitted(39, 55) Source(49, 14) + SourceIndex(0)
-9 >Emitted(39, 60) Source(49, 44) + SourceIndex(0)
-10>Emitted(39, 62) Source(49, 46) + SourceIndex(0)
-11>Emitted(39, 63) Source(49, 47) + SourceIndex(0)
-12>Emitted(39, 66) Source(49, 50) + SourceIndex(0)
-13>Emitted(39, 67) Source(49, 51) + SourceIndex(0)
-14>Emitted(39, 69) Source(49, 53) + SourceIndex(0)
-15>Emitted(39, 70) Source(49, 54) + SourceIndex(0)
-16>Emitted(39, 73) Source(49, 57) + SourceIndex(0)
-17>Emitted(39, 74) Source(49, 58) + SourceIndex(0)
-18>Emitted(39, 76) Source(49, 60) + SourceIndex(0)
-19>Emitted(39, 77) Source(49, 61) + SourceIndex(0)
-20>Emitted(39, 79) Source(49, 63) + SourceIndex(0)
-21>Emitted(39, 81) Source(49, 65) + SourceIndex(0)
-22>Emitted(39, 82) Source(49, 66) + SourceIndex(0)
+5 >Emitted(39, 37) Source(49, 44) + SourceIndex(0)
+6 >Emitted(39, 39) Source(49, 7) + SourceIndex(0)
+7 >Emitted(39, 54) Source(49, 14) + SourceIndex(0)
+8 >Emitted(39, 60) Source(49, 46) + SourceIndex(0)
+9 >Emitted(39, 61) Source(49, 47) + SourceIndex(0)
+10>Emitted(39, 64) Source(49, 50) + SourceIndex(0)
+11>Emitted(39, 65) Source(49, 51) + SourceIndex(0)
+12>Emitted(39, 67) Source(49, 53) + SourceIndex(0)
+13>Emitted(39, 68) Source(49, 54) + SourceIndex(0)
+14>Emitted(39, 71) Source(49, 57) + SourceIndex(0)
+15>Emitted(39, 72) Source(49, 58) + SourceIndex(0)
+16>Emitted(39, 74) Source(49, 60) + SourceIndex(0)
+17>Emitted(39, 75) Source(49, 61) + SourceIndex(0)
+18>Emitted(39, 77) Source(49, 63) + SourceIndex(0)
+19>Emitted(39, 79) Source(49, 65) + SourceIndex(0)
+20>Emitted(39, 80) Source(49, 66) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1326,81 +1272,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(41, 1) Source(51, 1) + SourceIndex(0)
 2 >Emitted(41, 2) Source(51, 2) + SourceIndex(0)
 ---
->>>for ((nameB = multiRobotA[0], multiRobotA), i = 0; i < 1; i++) {
+>>>for (nameB = multiRobotA[0], multiRobotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^
-7 >                            ^^
-8 >                              ^^^^^^^^^^^
-9 >                                         ^
-10>                                          ^^
-11>                                            ^
-12>                                             ^^^
-13>                                                ^
-14>                                                 ^^
-15>                                                   ^
-16>                                                    ^^^
-17>                                                       ^
-18>                                                        ^^
-19>                                                          ^
-20>                                                           ^^
-21>                                                             ^^
-22>                                                               ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^
+6 >                           ^^
+7 >                             ^^^^^^^^^^^
+8 >                                        ^^
+9 >                                          ^
+10>                                           ^^^
+11>                                              ^
+12>                                               ^^
+13>                                                 ^
+14>                                                  ^^^
+15>                                                     ^
+16>                                                      ^^
+17>                                                        ^
+18>                                                         ^^
+19>                                                           ^^
+20>                                                             ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      nameB
-7 >                            ] = 
-8 >                              multiRobotA
-9 >                                         
-10>                                          , 
-11>                                            i
-12>                                              = 
-13>                                                0
-14>                                                 ; 
-15>                                                   i
-16>                                                     < 
-17>                                                       1
-18>                                                        ; 
-19>                                                          i
-20>                                                           ++
-21>                                                             ) 
-22>                                                               {
+4 >    ([
+5 >     nameB
+6 >                           ] = 
+7 >                             multiRobotA
+8 >                                        , 
+9 >                                          i
+10>                                            = 
+11>                                              0
+12>                                               ; 
+13>                                                 i
+14>                                                   < 
+15>                                                     1
+16>                                                      ; 
+17>                                                        i
+18>                                                         ++
+19>                                                           ) 
+20>                                                             {
 1->Emitted(42, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(52, 5) + SourceIndex(0)
-4 >Emitted(42, 6) Source(52, 6) + SourceIndex(0)
-5 >Emitted(42, 7) Source(52, 7) + SourceIndex(0)
-6 >Emitted(42, 29) Source(52, 12) + SourceIndex(0)
-7 >Emitted(42, 31) Source(52, 16) + SourceIndex(0)
-8 >Emitted(42, 42) Source(52, 27) + SourceIndex(0)
-9 >Emitted(42, 43) Source(52, 27) + SourceIndex(0)
-10>Emitted(42, 45) Source(52, 29) + SourceIndex(0)
-11>Emitted(42, 46) Source(52, 30) + SourceIndex(0)
-12>Emitted(42, 49) Source(52, 33) + SourceIndex(0)
-13>Emitted(42, 50) Source(52, 34) + SourceIndex(0)
-14>Emitted(42, 52) Source(52, 36) + SourceIndex(0)
-15>Emitted(42, 53) Source(52, 37) + SourceIndex(0)
-16>Emitted(42, 56) Source(52, 40) + SourceIndex(0)
-17>Emitted(42, 57) Source(52, 41) + SourceIndex(0)
-18>Emitted(42, 59) Source(52, 43) + SourceIndex(0)
-19>Emitted(42, 60) Source(52, 44) + SourceIndex(0)
-20>Emitted(42, 62) Source(52, 46) + SourceIndex(0)
-21>Emitted(42, 64) Source(52, 48) + SourceIndex(0)
-22>Emitted(42, 65) Source(52, 49) + SourceIndex(0)
+4 >Emitted(42, 6) Source(52, 7) + SourceIndex(0)
+5 >Emitted(42, 28) Source(52, 12) + SourceIndex(0)
+6 >Emitted(42, 30) Source(52, 16) + SourceIndex(0)
+7 >Emitted(42, 41) Source(52, 27) + SourceIndex(0)
+8 >Emitted(42, 43) Source(52, 29) + SourceIndex(0)
+9 >Emitted(42, 44) Source(52, 30) + SourceIndex(0)
+10>Emitted(42, 47) Source(52, 33) + SourceIndex(0)
+11>Emitted(42, 48) Source(52, 34) + SourceIndex(0)
+12>Emitted(42, 50) Source(52, 36) + SourceIndex(0)
+13>Emitted(42, 51) Source(52, 37) + SourceIndex(0)
+14>Emitted(42, 54) Source(52, 40) + SourceIndex(0)
+15>Emitted(42, 55) Source(52, 41) + SourceIndex(0)
+16>Emitted(42, 57) Source(52, 43) + SourceIndex(0)
+17>Emitted(42, 58) Source(52, 44) + SourceIndex(0)
+18>Emitted(42, 60) Source(52, 46) + SourceIndex(0)
+19>Emitted(42, 62) Source(52, 48) + SourceIndex(0)
+20>Emitted(42, 63) Source(52, 49) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1432,81 +1372,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(44, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(44, 2) Source(54, 2) + SourceIndex(0)
 ---
->>>for ((_k = getMultiRobot(), nameB = _k[0], _k), i = 0; i < 1; i++) {
+>>>for (_k = getMultiRobot(), nameB = _k[0], _k, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^
-9 >                                         ^^^^^
-10>                                              ^^
-11>                                                ^
-12>                                                 ^^^
-13>                                                    ^
-14>                                                     ^^
-15>                                                       ^
-16>                                                        ^^^
-17>                                                           ^
-18>                                                            ^^
-19>                                                              ^
-20>                                                               ^^
-21>                                                                 ^^
-22>                                                                   ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^
+8 >                                        ^^^^^^
+9 >                                              ^
+10>                                               ^^^
+11>                                                  ^
+12>                                                   ^^
+13>                                                     ^
+14>                                                      ^^^
+15>                                                         ^
+16>                                                          ^^
+17>                                                            ^
+18>                                                             ^^
+19>                                                               ^^
+20>                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameB] = getMultiRobot()
-7 >                          
-8 >                            nameB
-9 >                                         ] = getMultiRobot()
-10>                                              , 
-11>                                                i
-12>                                                  = 
-13>                                                    0
-14>                                                     ; 
-15>                                                       i
-16>                                                         < 
-17>                                                           1
-18>                                                            ; 
-19>                                                              i
-20>                                                               ++
-21>                                                                 ) 
-22>                                                                   {
+5 >     [nameB] = getMultiRobot()
+6 >                         
+7 >                           nameB
+8 >                                        ] = getMultiRobot(), 
+9 >                                              i
+10>                                                = 
+11>                                                  0
+12>                                                   ; 
+13>                                                     i
+14>                                                       < 
+15>                                                         1
+16>                                                          ; 
+17>                                                            i
+18>                                                             ++
+19>                                                               ) 
+20>                                                                 {
 1->Emitted(45, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(55, 5) + SourceIndex(0)
 4 >Emitted(45, 6) Source(55, 6) + SourceIndex(0)
-5 >Emitted(45, 7) Source(55, 6) + SourceIndex(0)
-6 >Emitted(45, 27) Source(55, 31) + SourceIndex(0)
-7 >Emitted(45, 29) Source(55, 7) + SourceIndex(0)
-8 >Emitted(45, 42) Source(55, 12) + SourceIndex(0)
-9 >Emitted(45, 47) Source(55, 31) + SourceIndex(0)
-10>Emitted(45, 49) Source(55, 33) + SourceIndex(0)
-11>Emitted(45, 50) Source(55, 34) + SourceIndex(0)
-12>Emitted(45, 53) Source(55, 37) + SourceIndex(0)
-13>Emitted(45, 54) Source(55, 38) + SourceIndex(0)
-14>Emitted(45, 56) Source(55, 40) + SourceIndex(0)
-15>Emitted(45, 57) Source(55, 41) + SourceIndex(0)
-16>Emitted(45, 60) Source(55, 44) + SourceIndex(0)
-17>Emitted(45, 61) Source(55, 45) + SourceIndex(0)
-18>Emitted(45, 63) Source(55, 47) + SourceIndex(0)
-19>Emitted(45, 64) Source(55, 48) + SourceIndex(0)
-20>Emitted(45, 66) Source(55, 50) + SourceIndex(0)
-21>Emitted(45, 68) Source(55, 52) + SourceIndex(0)
-22>Emitted(45, 69) Source(55, 53) + SourceIndex(0)
+5 >Emitted(45, 26) Source(55, 31) + SourceIndex(0)
+6 >Emitted(45, 28) Source(55, 7) + SourceIndex(0)
+7 >Emitted(45, 41) Source(55, 12) + SourceIndex(0)
+8 >Emitted(45, 47) Source(55, 33) + SourceIndex(0)
+9 >Emitted(45, 48) Source(55, 34) + SourceIndex(0)
+10>Emitted(45, 51) Source(55, 37) + SourceIndex(0)
+11>Emitted(45, 52) Source(55, 38) + SourceIndex(0)
+12>Emitted(45, 54) Source(55, 40) + SourceIndex(0)
+13>Emitted(45, 55) Source(55, 41) + SourceIndex(0)
+14>Emitted(45, 58) Source(55, 44) + SourceIndex(0)
+15>Emitted(45, 59) Source(55, 45) + SourceIndex(0)
+16>Emitted(45, 61) Source(55, 47) + SourceIndex(0)
+17>Emitted(45, 62) Source(55, 48) + SourceIndex(0)
+18>Emitted(45, 64) Source(55, 50) + SourceIndex(0)
+19>Emitted(45, 66) Source(55, 52) + SourceIndex(0)
+20>Emitted(45, 67) Source(55, 53) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1538,81 +1472,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(47, 1) Source(57, 1) + SourceIndex(0)
 2 >Emitted(47, 2) Source(57, 2) + SourceIndex(0)
 ---
->>>for ((_l = ["trimmer", ["trimming", "edging"]], nameB = _l[0], _l), i = 0; i < 1; i++) {
+>>>for (_l = ["trimmer", ["trimming", "edging"]], nameB = _l[0], _l, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                              ^^
-8 >                                                ^^^^^^^^^^^^^
-9 >                                                             ^^^^^
-10>                                                                  ^^
-11>                                                                    ^
-12>                                                                     ^^^
-13>                                                                        ^
-14>                                                                         ^^
-15>                                                                           ^
-16>                                                                            ^^^
-17>                                                                               ^
-18>                                                                                ^^
-19>                                                                                  ^
-20>                                                                                   ^^
-21>                                                                                     ^^
-22>                                                                                       ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^^^^
+8 >                                                            ^^^^^^
+9 >                                                                  ^
+10>                                                                   ^^^
+11>                                                                      ^
+12>                                                                       ^^
+13>                                                                         ^
+14>                                                                          ^^^
+15>                                                                             ^
+16>                                                                              ^^
+17>                                                                                ^
+18>                                                                                 ^^
+19>                                                                                   ^^
+20>                                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameB] = ["trimmer", ["trimming", "edging"]]
-7 >                                              
-8 >                                                nameB
-9 >                                                             ] = ["trimmer", ["trimming", "edging"]]
-10>                                                                  , 
-11>                                                                    i
-12>                                                                      = 
-13>                                                                        0
-14>                                                                         ; 
-15>                                                                           i
-16>                                                                             < 
-17>                                                                               1
-18>                                                                                ; 
-19>                                                                                  i
-20>                                                                                   ++
-21>                                                                                     ) 
-22>                                                                                       {
+5 >     [nameB] = ["trimmer", ["trimming", "edging"]]
+6 >                                             
+7 >                                               nameB
+8 >                                                            ] = ["trimmer", ["trimming", "edging"]], 
+9 >                                                                  i
+10>                                                                    = 
+11>                                                                      0
+12>                                                                       ; 
+13>                                                                         i
+14>                                                                           < 
+15>                                                                             1
+16>                                                                              ; 
+17>                                                                                i
+18>                                                                                 ++
+19>                                                                                   ) 
+20>                                                                                     {
 1->Emitted(48, 1) Source(58, 1) + SourceIndex(0)
 2 >Emitted(48, 4) Source(58, 4) + SourceIndex(0)
 3 >Emitted(48, 5) Source(58, 5) + SourceIndex(0)
 4 >Emitted(48, 6) Source(58, 6) + SourceIndex(0)
-5 >Emitted(48, 7) Source(58, 6) + SourceIndex(0)
-6 >Emitted(48, 47) Source(58, 51) + SourceIndex(0)
-7 >Emitted(48, 49) Source(58, 7) + SourceIndex(0)
-8 >Emitted(48, 62) Source(58, 12) + SourceIndex(0)
-9 >Emitted(48, 67) Source(58, 51) + SourceIndex(0)
-10>Emitted(48, 69) Source(58, 53) + SourceIndex(0)
-11>Emitted(48, 70) Source(58, 54) + SourceIndex(0)
-12>Emitted(48, 73) Source(58, 57) + SourceIndex(0)
-13>Emitted(48, 74) Source(58, 58) + SourceIndex(0)
-14>Emitted(48, 76) Source(58, 60) + SourceIndex(0)
-15>Emitted(48, 77) Source(58, 61) + SourceIndex(0)
-16>Emitted(48, 80) Source(58, 64) + SourceIndex(0)
-17>Emitted(48, 81) Source(58, 65) + SourceIndex(0)
-18>Emitted(48, 83) Source(58, 67) + SourceIndex(0)
-19>Emitted(48, 84) Source(58, 68) + SourceIndex(0)
-20>Emitted(48, 86) Source(58, 70) + SourceIndex(0)
-21>Emitted(48, 88) Source(58, 72) + SourceIndex(0)
-22>Emitted(48, 89) Source(58, 73) + SourceIndex(0)
+5 >Emitted(48, 46) Source(58, 51) + SourceIndex(0)
+6 >Emitted(48, 48) Source(58, 7) + SourceIndex(0)
+7 >Emitted(48, 61) Source(58, 12) + SourceIndex(0)
+8 >Emitted(48, 67) Source(58, 53) + SourceIndex(0)
+9 >Emitted(48, 68) Source(58, 54) + SourceIndex(0)
+10>Emitted(48, 71) Source(58, 57) + SourceIndex(0)
+11>Emitted(48, 72) Source(58, 58) + SourceIndex(0)
+12>Emitted(48, 74) Source(58, 60) + SourceIndex(0)
+13>Emitted(48, 75) Source(58, 61) + SourceIndex(0)
+14>Emitted(48, 78) Source(58, 64) + SourceIndex(0)
+15>Emitted(48, 79) Source(58, 65) + SourceIndex(0)
+16>Emitted(48, 81) Source(58, 67) + SourceIndex(0)
+17>Emitted(48, 82) Source(58, 68) + SourceIndex(0)
+18>Emitted(48, 84) Source(58, 70) + SourceIndex(0)
+19>Emitted(48, 86) Source(58, 72) + SourceIndex(0)
+20>Emitted(48, 87) Source(58, 73) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1644,94 +1572,88 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(50, 1) Source(60, 1) + SourceIndex(0)
 2 >Emitted(50, 2) Source(60, 2) + SourceIndex(0)
 ---
->>>for ((numberA2 = robotA[0], nameA2 = robotA[1], skillA2 = robotA[2], robotA), i = 0; i < 1; i++) {
+>>>for (numberA2 = robotA[0], nameA2 = robotA[1], skillA2 = robotA[2], robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^^^^^
-9 >                                              ^^
-10>                                                ^^^^^^^^^^^^^^^^^^^
-11>                                                                   ^^
-12>                                                                     ^^^^^^
-13>                                                                           ^
-14>                                                                            ^^
-15>                                                                              ^
-16>                                                                               ^^^
-17>                                                                                  ^
-18>                                                                                   ^^
-19>                                                                                     ^
-20>                                                                                      ^^^
-21>                                                                                         ^
-22>                                                                                          ^^
-23>                                                                                            ^
-24>                                                                                             ^^
-25>                                                                                               ^^
-26>                                                                                                 ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^^^^^
+8 >                                             ^^
+9 >                                               ^^^^^^^^^^^^^^^^^^^
+10>                                                                  ^^
+11>                                                                    ^^^^^^
+12>                                                                          ^^
+13>                                                                            ^
+14>                                                                             ^^^
+15>                                                                                ^
+16>                                                                                 ^^
+17>                                                                                   ^
+18>                                                                                    ^^^
+19>                                                                                       ^
+20>                                                                                        ^^
+21>                                                                                          ^
+22>                                                                                           ^^
+23>                                                                                             ^^
+24>                                                                                               ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      numberA2
-7 >                          , 
-8 >                            nameA2
-9 >                                              , 
-10>                                                skillA2
-11>                                                                   ] = 
-12>                                                                     robotA
-13>                                                                           
-14>                                                                            , 
-15>                                                                              i
-16>                                                                                = 
-17>                                                                                  0
-18>                                                                                   ; 
-19>                                                                                     i
-20>                                                                                       < 
-21>                                                                                         1
-22>                                                                                          ; 
-23>                                                                                            i
-24>                                                                                             ++
-25>                                                                                               ) 
-26>                                                                                                 {
+4 >    ([
+5 >     numberA2
+6 >                         , 
+7 >                           nameA2
+8 >                                             , 
+9 >                                               skillA2
+10>                                                                  ] = 
+11>                                                                    robotA
+12>                                                                          , 
+13>                                                                            i
+14>                                                                              = 
+15>                                                                                0
+16>                                                                                 ; 
+17>                                                                                   i
+18>                                                                                     < 
+19>                                                                                       1
+20>                                                                                        ; 
+21>                                                                                          i
+22>                                                                                           ++
+23>                                                                                             ) 
+24>                                                                                               {
 1->Emitted(51, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(51, 4) Source(62, 4) + SourceIndex(0)
 3 >Emitted(51, 5) Source(62, 5) + SourceIndex(0)
-4 >Emitted(51, 6) Source(62, 6) + SourceIndex(0)
-5 >Emitted(51, 7) Source(62, 7) + SourceIndex(0)
-6 >Emitted(51, 27) Source(62, 15) + SourceIndex(0)
-7 >Emitted(51, 29) Source(62, 17) + SourceIndex(0)
-8 >Emitted(51, 47) Source(62, 23) + SourceIndex(0)
-9 >Emitted(51, 49) Source(62, 25) + SourceIndex(0)
-10>Emitted(51, 68) Source(62, 32) + SourceIndex(0)
-11>Emitted(51, 70) Source(62, 36) + SourceIndex(0)
-12>Emitted(51, 76) Source(62, 42) + SourceIndex(0)
-13>Emitted(51, 77) Source(62, 42) + SourceIndex(0)
-14>Emitted(51, 79) Source(62, 44) + SourceIndex(0)
-15>Emitted(51, 80) Source(62, 45) + SourceIndex(0)
-16>Emitted(51, 83) Source(62, 48) + SourceIndex(0)
-17>Emitted(51, 84) Source(62, 49) + SourceIndex(0)
-18>Emitted(51, 86) Source(62, 51) + SourceIndex(0)
-19>Emitted(51, 87) Source(62, 52) + SourceIndex(0)
-20>Emitted(51, 90) Source(62, 55) + SourceIndex(0)
-21>Emitted(51, 91) Source(62, 56) + SourceIndex(0)
-22>Emitted(51, 93) Source(62, 58) + SourceIndex(0)
-23>Emitted(51, 94) Source(62, 59) + SourceIndex(0)
-24>Emitted(51, 96) Source(62, 61) + SourceIndex(0)
-25>Emitted(51, 98) Source(62, 63) + SourceIndex(0)
-26>Emitted(51, 99) Source(62, 64) + SourceIndex(0)
+4 >Emitted(51, 6) Source(62, 7) + SourceIndex(0)
+5 >Emitted(51, 26) Source(62, 15) + SourceIndex(0)
+6 >Emitted(51, 28) Source(62, 17) + SourceIndex(0)
+7 >Emitted(51, 46) Source(62, 23) + SourceIndex(0)
+8 >Emitted(51, 48) Source(62, 25) + SourceIndex(0)
+9 >Emitted(51, 67) Source(62, 32) + SourceIndex(0)
+10>Emitted(51, 69) Source(62, 36) + SourceIndex(0)
+11>Emitted(51, 75) Source(62, 42) + SourceIndex(0)
+12>Emitted(51, 77) Source(62, 44) + SourceIndex(0)
+13>Emitted(51, 78) Source(62, 45) + SourceIndex(0)
+14>Emitted(51, 81) Source(62, 48) + SourceIndex(0)
+15>Emitted(51, 82) Source(62, 49) + SourceIndex(0)
+16>Emitted(51, 84) Source(62, 51) + SourceIndex(0)
+17>Emitted(51, 85) Source(62, 52) + SourceIndex(0)
+18>Emitted(51, 88) Source(62, 55) + SourceIndex(0)
+19>Emitted(51, 89) Source(62, 56) + SourceIndex(0)
+20>Emitted(51, 91) Source(62, 58) + SourceIndex(0)
+21>Emitted(51, 92) Source(62, 59) + SourceIndex(0)
+22>Emitted(51, 94) Source(62, 61) + SourceIndex(0)
+23>Emitted(51, 96) Source(62, 63) + SourceIndex(0)
+24>Emitted(51, 97) Source(62, 64) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1763,93 +1685,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(53, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(53, 2) Source(64, 2) + SourceIndex(0)
 ---
->>>for ((_m = getRobot(), numberA2 = _m[0], nameA2 = _m[1], skillA2 = _m[2], _m), i = 0; i < 1; i++) {
+>>>for (_m = getRobot(), numberA2 = _m[0], nameA2 = _m[1], skillA2 = _m[2], _m, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^^
-9 >                                       ^^
-10>                                         ^^^^^^^^^^^^^^
-11>                                                       ^^
-12>                                                         ^^^^^^^^^^^^^^^
-13>                                                                        ^^^^^
-14>                                                                             ^^
-15>                                                                               ^
-16>                                                                                ^^^
-17>                                                                                   ^
-18>                                                                                    ^^
-19>                                                                                      ^
-20>                                                                                       ^^^
-21>                                                                                          ^
-22>                                                                                           ^^
-23>                                                                                             ^
-24>                                                                                              ^^
-25>                                                                                                ^^
-26>                                                                                                  ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^^
+8 >                                      ^^
+9 >                                        ^^^^^^^^^^^^^^
+10>                                                      ^^
+11>                                                        ^^^^^^^^^^^^^^^
+12>                                                                       ^^^^^^
+13>                                                                             ^
+14>                                                                              ^^^
+15>                                                                                 ^
+16>                                                                                  ^^
+17>                                                                                    ^
+18>                                                                                     ^^^
+19>                                                                                        ^
+20>                                                                                         ^^
+21>                                                                                           ^
+22>                                                                                            ^^
+23>                                                                                              ^^
+24>                                                                                                ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA2, nameA2, skillA2] = getRobot()
-7 >                     
-8 >                       numberA2
-9 >                                       , 
-10>                                         nameA2
-11>                                                       , 
-12>                                                         skillA2
-13>                                                                        ] = getRobot()
-14>                                                                             , 
-15>                                                                               i
-16>                                                                                 = 
-17>                                                                                   0
-18>                                                                                    ; 
-19>                                                                                      i
-20>                                                                                        < 
-21>                                                                                          1
-22>                                                                                           ; 
-23>                                                                                             i
-24>                                                                                              ++
-25>                                                                                                ) 
-26>                                                                                                  {
+5 >     [numberA2, nameA2, skillA2] = getRobot()
+6 >                    
+7 >                      numberA2
+8 >                                      , 
+9 >                                        nameA2
+10>                                                      , 
+11>                                                        skillA2
+12>                                                                       ] = getRobot(), 
+13>                                                                             i
+14>                                                                               = 
+15>                                                                                 0
+16>                                                                                  ; 
+17>                                                                                    i
+18>                                                                                      < 
+19>                                                                                        1
+20>                                                                                         ; 
+21>                                                                                           i
+22>                                                                                            ++
+23>                                                                                              ) 
+24>                                                                                                {
 1->Emitted(54, 1) Source(65, 1) + SourceIndex(0)
 2 >Emitted(54, 4) Source(65, 4) + SourceIndex(0)
 3 >Emitted(54, 5) Source(65, 5) + SourceIndex(0)
 4 >Emitted(54, 6) Source(65, 6) + SourceIndex(0)
-5 >Emitted(54, 7) Source(65, 6) + SourceIndex(0)
-6 >Emitted(54, 22) Source(65, 46) + SourceIndex(0)
-7 >Emitted(54, 24) Source(65, 7) + SourceIndex(0)
-8 >Emitted(54, 40) Source(65, 15) + SourceIndex(0)
-9 >Emitted(54, 42) Source(65, 17) + SourceIndex(0)
-10>Emitted(54, 56) Source(65, 23) + SourceIndex(0)
-11>Emitted(54, 58) Source(65, 25) + SourceIndex(0)
-12>Emitted(54, 73) Source(65, 32) + SourceIndex(0)
-13>Emitted(54, 78) Source(65, 46) + SourceIndex(0)
-14>Emitted(54, 80) Source(65, 48) + SourceIndex(0)
-15>Emitted(54, 81) Source(65, 49) + SourceIndex(0)
-16>Emitted(54, 84) Source(65, 52) + SourceIndex(0)
-17>Emitted(54, 85) Source(65, 53) + SourceIndex(0)
-18>Emitted(54, 87) Source(65, 55) + SourceIndex(0)
-19>Emitted(54, 88) Source(65, 56) + SourceIndex(0)
-20>Emitted(54, 91) Source(65, 59) + SourceIndex(0)
-21>Emitted(54, 92) Source(65, 60) + SourceIndex(0)
-22>Emitted(54, 94) Source(65, 62) + SourceIndex(0)
-23>Emitted(54, 95) Source(65, 63) + SourceIndex(0)
-24>Emitted(54, 97) Source(65, 65) + SourceIndex(0)
-25>Emitted(54, 99) Source(65, 67) + SourceIndex(0)
-26>Emitted(54, 100) Source(65, 68) + SourceIndex(0)
+5 >Emitted(54, 21) Source(65, 46) + SourceIndex(0)
+6 >Emitted(54, 23) Source(65, 7) + SourceIndex(0)
+7 >Emitted(54, 39) Source(65, 15) + SourceIndex(0)
+8 >Emitted(54, 41) Source(65, 17) + SourceIndex(0)
+9 >Emitted(54, 55) Source(65, 23) + SourceIndex(0)
+10>Emitted(54, 57) Source(65, 25) + SourceIndex(0)
+11>Emitted(54, 72) Source(65, 32) + SourceIndex(0)
+12>Emitted(54, 78) Source(65, 48) + SourceIndex(0)
+13>Emitted(54, 79) Source(65, 49) + SourceIndex(0)
+14>Emitted(54, 82) Source(65, 52) + SourceIndex(0)
+15>Emitted(54, 83) Source(65, 53) + SourceIndex(0)
+16>Emitted(54, 85) Source(65, 55) + SourceIndex(0)
+17>Emitted(54, 86) Source(65, 56) + SourceIndex(0)
+18>Emitted(54, 89) Source(65, 59) + SourceIndex(0)
+19>Emitted(54, 90) Source(65, 60) + SourceIndex(0)
+20>Emitted(54, 92) Source(65, 62) + SourceIndex(0)
+21>Emitted(54, 93) Source(65, 63) + SourceIndex(0)
+22>Emitted(54, 95) Source(65, 65) + SourceIndex(0)
+23>Emitted(54, 97) Source(65, 67) + SourceIndex(0)
+24>Emitted(54, 98) Source(65, 68) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1881,93 +1797,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(56, 1) Source(67, 1) + SourceIndex(0)
 2 >Emitted(56, 2) Source(67, 2) + SourceIndex(0)
 ---
->>>for ((_o = [2, "trimmer", "trimming"], numberA2 = _o[0], nameA2 = _o[1], skillA2 = _o[2], _o), i = 0; i < 1; i++) {
+>>>for (_o = [2, "trimmer", "trimming"], numberA2 = _o[0], nameA2 = _o[1], skillA2 = _o[2], _o, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                     ^^
-8 >                                       ^^^^^^^^^^^^^^^^
-9 >                                                       ^^
-10>                                                         ^^^^^^^^^^^^^^
-11>                                                                       ^^
-12>                                                                         ^^^^^^^^^^^^^^^
-13>                                                                                        ^^^^^
-14>                                                                                             ^^
-15>                                                                                               ^
-16>                                                                                                ^^^
-17>                                                                                                   ^
-18>                                                                                                    ^^
-19>                                                                                                      ^
-20>                                                                                                       ^^^
-21>                                                                                                          ^
-22>                                                                                                           ^^
-23>                                                                                                             ^
-24>                                                                                                              ^^
-25>                                                                                                                ^^
-26>                                                                                                                  ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^
+8 >                                                      ^^
+9 >                                                        ^^^^^^^^^^^^^^
+10>                                                                      ^^
+11>                                                                        ^^^^^^^^^^^^^^^
+12>                                                                                       ^^^^^^
+13>                                                                                             ^
+14>                                                                                              ^^^
+15>                                                                                                 ^
+16>                                                                                                  ^^
+17>                                                                                                    ^
+18>                                                                                                     ^^^
+19>                                                                                                        ^
+20>                                                                                                         ^^
+21>                                                                                                           ^
+22>                                                                                                            ^^
+23>                                                                                                              ^^
+24>                                                                                                                ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"]
-7 >                                     
-8 >                                       numberA2
-9 >                                                       , 
-10>                                                         nameA2
-11>                                                                       , 
-12>                                                                         skillA2
-13>                                                                                        ] = [2, "trimmer", "trimming"]
-14>                                                                                             , 
-15>                                                                                               i
-16>                                                                                                 = 
-17>                                                                                                   0
-18>                                                                                                    ; 
-19>                                                                                                      i
-20>                                                                                                        < 
-21>                                                                                                          1
-22>                                                                                                           ; 
-23>                                                                                                             i
-24>                                                                                                              ++
-25>                                                                                                                ) 
-26>                                                                                                                  {
+5 >     [numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"]
+6 >                                    
+7 >                                      numberA2
+8 >                                                      , 
+9 >                                                        nameA2
+10>                                                                      , 
+11>                                                                        skillA2
+12>                                                                                       ] = [2, "trimmer", "trimming"], 
+13>                                                                                             i
+14>                                                                                               = 
+15>                                                                                                 0
+16>                                                                                                  ; 
+17>                                                                                                    i
+18>                                                                                                      < 
+19>                                                                                                        1
+20>                                                                                                         ; 
+21>                                                                                                           i
+22>                                                                                                            ++
+23>                                                                                                              ) 
+24>                                                                                                                {
 1->Emitted(57, 1) Source(68, 1) + SourceIndex(0)
 2 >Emitted(57, 4) Source(68, 4) + SourceIndex(0)
 3 >Emitted(57, 5) Source(68, 5) + SourceIndex(0)
 4 >Emitted(57, 6) Source(68, 6) + SourceIndex(0)
-5 >Emitted(57, 7) Source(68, 6) + SourceIndex(0)
-6 >Emitted(57, 38) Source(68, 62) + SourceIndex(0)
-7 >Emitted(57, 40) Source(68, 7) + SourceIndex(0)
-8 >Emitted(57, 56) Source(68, 15) + SourceIndex(0)
-9 >Emitted(57, 58) Source(68, 17) + SourceIndex(0)
-10>Emitted(57, 72) Source(68, 23) + SourceIndex(0)
-11>Emitted(57, 74) Source(68, 25) + SourceIndex(0)
-12>Emitted(57, 89) Source(68, 32) + SourceIndex(0)
-13>Emitted(57, 94) Source(68, 62) + SourceIndex(0)
-14>Emitted(57, 96) Source(68, 64) + SourceIndex(0)
-15>Emitted(57, 97) Source(68, 65) + SourceIndex(0)
-16>Emitted(57, 100) Source(68, 68) + SourceIndex(0)
-17>Emitted(57, 101) Source(68, 69) + SourceIndex(0)
-18>Emitted(57, 103) Source(68, 71) + SourceIndex(0)
-19>Emitted(57, 104) Source(68, 72) + SourceIndex(0)
-20>Emitted(57, 107) Source(68, 75) + SourceIndex(0)
-21>Emitted(57, 108) Source(68, 76) + SourceIndex(0)
-22>Emitted(57, 110) Source(68, 78) + SourceIndex(0)
-23>Emitted(57, 111) Source(68, 79) + SourceIndex(0)
-24>Emitted(57, 113) Source(68, 81) + SourceIndex(0)
-25>Emitted(57, 115) Source(68, 83) + SourceIndex(0)
-26>Emitted(57, 116) Source(68, 84) + SourceIndex(0)
+5 >Emitted(57, 37) Source(68, 62) + SourceIndex(0)
+6 >Emitted(57, 39) Source(68, 7) + SourceIndex(0)
+7 >Emitted(57, 55) Source(68, 15) + SourceIndex(0)
+8 >Emitted(57, 57) Source(68, 17) + SourceIndex(0)
+9 >Emitted(57, 71) Source(68, 23) + SourceIndex(0)
+10>Emitted(57, 73) Source(68, 25) + SourceIndex(0)
+11>Emitted(57, 88) Source(68, 32) + SourceIndex(0)
+12>Emitted(57, 94) Source(68, 64) + SourceIndex(0)
+13>Emitted(57, 95) Source(68, 65) + SourceIndex(0)
+14>Emitted(57, 98) Source(68, 68) + SourceIndex(0)
+15>Emitted(57, 99) Source(68, 69) + SourceIndex(0)
+16>Emitted(57, 101) Source(68, 71) + SourceIndex(0)
+17>Emitted(57, 102) Source(68, 72) + SourceIndex(0)
+18>Emitted(57, 105) Source(68, 75) + SourceIndex(0)
+19>Emitted(57, 106) Source(68, 76) + SourceIndex(0)
+20>Emitted(57, 108) Source(68, 78) + SourceIndex(0)
+21>Emitted(57, 109) Source(68, 79) + SourceIndex(0)
+22>Emitted(57, 111) Source(68, 81) + SourceIndex(0)
+23>Emitted(57, 113) Source(68, 83) + SourceIndex(0)
+24>Emitted(57, 114) Source(68, 84) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1999,99 +1909,93 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(59, 1) Source(70, 1) + SourceIndex(0)
 2 >Emitted(59, 2) Source(70, 2) + SourceIndex(0)
 ---
->>>for ((nameMA = multiRobotA[0], _p = multiRobotA[1], primarySkillA = _p[0], secondarySkillA = _p[1], multiRobotA), i = 0; i < 1; i++) {
+>>>for (nameMA = multiRobotA[0], _p = multiRobotA[1], primarySkillA = _p[0], secondarySkillA = _p[1], multiRobotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^
-7 >                             ^^
-8 >                               ^^^^^^^^^^^^^^^^^^^
-9 >                                                  ^^
-10>                                                    ^^^^^^^^^^^^^^^^^^^^^
-11>                                                                         ^^
-12>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                  ^^
-14>                                                                                                    ^^^^^^^^^^^
-15>                                                                                                               ^
-16>                                                                                                                ^^
-17>                                                                                                                  ^
-18>                                                                                                                   ^^^
-19>                                                                                                                      ^
-20>                                                                                                                       ^^
-21>                                                                                                                         ^
-22>                                                                                                                          ^^^
-23>                                                                                                                             ^
-24>                                                                                                                              ^^
-25>                                                                                                                                ^
-26>                                                                                                                                 ^^
-27>                                                                                                                                   ^^
-28>                                                                                                                                     ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^
+6 >                            ^^
+7 >                              ^^^^^^^^^^^^^^^^^^^
+8 >                                                 ^^
+9 >                                                   ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                        ^^
+11>                                                                          ^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                 ^^
+13>                                                                                                   ^^^^^^^^^^^
+14>                                                                                                              ^^
+15>                                                                                                                ^
+16>                                                                                                                 ^^^
+17>                                                                                                                    ^
+18>                                                                                                                     ^^
+19>                                                                                                                       ^
+20>                                                                                                                        ^^^
+21>                                                                                                                           ^
+22>                                                                                                                            ^^
+23>                                                                                                                              ^
+24>                                                                                                                               ^^
+25>                                                                                                                                 ^^
+26>                                                                                                                                   ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      nameMA
-7 >                             , 
-8 >                               [primarySkillA, secondarySkillA]
-9 >                                                  
-10>                                                    primarySkillA
-11>                                                                         , 
-12>                                                                           secondarySkillA
-13>                                                                                                  ]] = 
-14>                                                                                                    multiRobotA
-15>                                                                                                               
-16>                                                                                                                , 
-17>                                                                                                                  i
-18>                                                                                                                    = 
-19>                                                                                                                      0
-20>                                                                                                                       ; 
-21>                                                                                                                         i
-22>                                                                                                                           < 
-23>                                                                                                                             1
-24>                                                                                                                              ; 
-25>                                                                                                                                i
-26>                                                                                                                                 ++
-27>                                                                                                                                   ) 
-28>                                                                                                                                     {
+4 >    ([
+5 >     nameMA
+6 >                            , 
+7 >                              [primarySkillA, secondarySkillA]
+8 >                                                 
+9 >                                                   primarySkillA
+10>                                                                        , 
+11>                                                                          secondarySkillA
+12>                                                                                                 ]] = 
+13>                                                                                                   multiRobotA
+14>                                                                                                              , 
+15>                                                                                                                i
+16>                                                                                                                  = 
+17>                                                                                                                    0
+18>                                                                                                                     ; 
+19>                                                                                                                       i
+20>                                                                                                                         < 
+21>                                                                                                                           1
+22>                                                                                                                            ; 
+23>                                                                                                                              i
+24>                                                                                                                               ++
+25>                                                                                                                                 ) 
+26>                                                                                                                                   {
 1->Emitted(60, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(60, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(60, 5) Source(71, 5) + SourceIndex(0)
-4 >Emitted(60, 6) Source(71, 6) + SourceIndex(0)
-5 >Emitted(60, 7) Source(71, 7) + SourceIndex(0)
-6 >Emitted(60, 30) Source(71, 13) + SourceIndex(0)
-7 >Emitted(60, 32) Source(71, 15) + SourceIndex(0)
-8 >Emitted(60, 51) Source(71, 47) + SourceIndex(0)
-9 >Emitted(60, 53) Source(71, 16) + SourceIndex(0)
-10>Emitted(60, 74) Source(71, 29) + SourceIndex(0)
-11>Emitted(60, 76) Source(71, 31) + SourceIndex(0)
-12>Emitted(60, 99) Source(71, 46) + SourceIndex(0)
-13>Emitted(60, 101) Source(71, 51) + SourceIndex(0)
-14>Emitted(60, 112) Source(71, 62) + SourceIndex(0)
-15>Emitted(60, 113) Source(71, 62) + SourceIndex(0)
-16>Emitted(60, 115) Source(71, 64) + SourceIndex(0)
-17>Emitted(60, 116) Source(71, 65) + SourceIndex(0)
-18>Emitted(60, 119) Source(71, 68) + SourceIndex(0)
-19>Emitted(60, 120) Source(71, 69) + SourceIndex(0)
-20>Emitted(60, 122) Source(71, 71) + SourceIndex(0)
-21>Emitted(60, 123) Source(71, 72) + SourceIndex(0)
-22>Emitted(60, 126) Source(71, 75) + SourceIndex(0)
-23>Emitted(60, 127) Source(71, 76) + SourceIndex(0)
-24>Emitted(60, 129) Source(71, 78) + SourceIndex(0)
-25>Emitted(60, 130) Source(71, 79) + SourceIndex(0)
-26>Emitted(60, 132) Source(71, 81) + SourceIndex(0)
-27>Emitted(60, 134) Source(71, 83) + SourceIndex(0)
-28>Emitted(60, 135) Source(71, 84) + SourceIndex(0)
+4 >Emitted(60, 6) Source(71, 7) + SourceIndex(0)
+5 >Emitted(60, 29) Source(71, 13) + SourceIndex(0)
+6 >Emitted(60, 31) Source(71, 15) + SourceIndex(0)
+7 >Emitted(60, 50) Source(71, 47) + SourceIndex(0)
+8 >Emitted(60, 52) Source(71, 16) + SourceIndex(0)
+9 >Emitted(60, 73) Source(71, 29) + SourceIndex(0)
+10>Emitted(60, 75) Source(71, 31) + SourceIndex(0)
+11>Emitted(60, 98) Source(71, 46) + SourceIndex(0)
+12>Emitted(60, 100) Source(71, 51) + SourceIndex(0)
+13>Emitted(60, 111) Source(71, 62) + SourceIndex(0)
+14>Emitted(60, 113) Source(71, 64) + SourceIndex(0)
+15>Emitted(60, 114) Source(71, 65) + SourceIndex(0)
+16>Emitted(60, 117) Source(71, 68) + SourceIndex(0)
+17>Emitted(60, 118) Source(71, 69) + SourceIndex(0)
+18>Emitted(60, 120) Source(71, 71) + SourceIndex(0)
+19>Emitted(60, 121) Source(71, 72) + SourceIndex(0)
+20>Emitted(60, 124) Source(71, 75) + SourceIndex(0)
+21>Emitted(60, 125) Source(71, 76) + SourceIndex(0)
+22>Emitted(60, 127) Source(71, 78) + SourceIndex(0)
+23>Emitted(60, 128) Source(71, 79) + SourceIndex(0)
+24>Emitted(60, 130) Source(71, 81) + SourceIndex(0)
+25>Emitted(60, 132) Source(71, 83) + SourceIndex(0)
+26>Emitted(60, 133) Source(71, 84) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2123,99 +2027,93 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(62, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(62, 2) Source(73, 2) + SourceIndex(0)
 ---
->>>for ((_q = getMultiRobot(), nameMA = _q[0], _r = _q[1], primarySkillA = _r[0], secondarySkillA = _r[1], _q), i = 0; i < 1; i++) {
+>>>for (_q = getMultiRobot(), nameMA = _q[0], _r = _q[1], primarySkillA = _r[0], secondarySkillA = _r[1], _q, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^
-9 >                                          ^^
-10>                                            ^^^^^^^^^^
-11>                                                      ^^
-12>                                                        ^^^^^^^^^^^^^^^^^^^^^
-13>                                                                             ^^
-14>                                                                               ^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                      ^^^^^
-16>                                                                                                           ^^
-17>                                                                                                             ^
-18>                                                                                                              ^^^
-19>                                                                                                                 ^
-20>                                                                                                                  ^^
-21>                                                                                                                    ^
-22>                                                                                                                     ^^^
-23>                                                                                                                        ^
-24>                                                                                                                         ^^
-25>                                                                                                                           ^
-26>                                                                                                                            ^^
-27>                                                                                                                              ^^
-28>                                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^
+10>                                                     ^^
+11>                                                       ^^^^^^^^^^^^^^^^^^^^^
+12>                                                                            ^^
+13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                     ^^^^^^
+15>                                                                                                           ^
+16>                                                                                                            ^^^
+17>                                                                                                               ^
+18>                                                                                                                ^^
+19>                                                                                                                  ^
+20>                                                                                                                   ^^^
+21>                                                                                                                      ^
+22>                                                                                                                       ^^
+23>                                                                                                                         ^
+24>                                                                                                                          ^^
+25>                                                                                                                            ^^
+26>                                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot()
-7 >                          
-8 >                            nameMA
-9 >                                          , 
-10>                                            [primarySkillA, secondarySkillA]
-11>                                                      
-12>                                                        primarySkillA
-13>                                                                             , 
-14>                                                                               secondarySkillA
-15>                                                                                                      ]] = getMultiRobot()
-16>                                                                                                           , 
-17>                                                                                                             i
-18>                                                                                                               = 
-19>                                                                                                                 0
-20>                                                                                                                  ; 
-21>                                                                                                                    i
-22>                                                                                                                      < 
-23>                                                                                                                        1
-24>                                                                                                                         ; 
-25>                                                                                                                           i
-26>                                                                                                                            ++
-27>                                                                                                                              ) 
-28>                                                                                                                                {
+5 >     [nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot()
+6 >                         
+7 >                           nameMA
+8 >                                         , 
+9 >                                           [primarySkillA, secondarySkillA]
+10>                                                     
+11>                                                       primarySkillA
+12>                                                                            , 
+13>                                                                              secondarySkillA
+14>                                                                                                     ]] = getMultiRobot(), 
+15>                                                                                                           i
+16>                                                                                                             = 
+17>                                                                                                               0
+18>                                                                                                                ; 
+19>                                                                                                                  i
+20>                                                                                                                    < 
+21>                                                                                                                      1
+22>                                                                                                                       ; 
+23>                                                                                                                         i
+24>                                                                                                                          ++
+25>                                                                                                                            ) 
+26>                                                                                                                              {
 1->Emitted(63, 1) Source(74, 1) + SourceIndex(0)
 2 >Emitted(63, 4) Source(74, 4) + SourceIndex(0)
 3 >Emitted(63, 5) Source(74, 5) + SourceIndex(0)
 4 >Emitted(63, 6) Source(74, 6) + SourceIndex(0)
-5 >Emitted(63, 7) Source(74, 6) + SourceIndex(0)
-6 >Emitted(63, 27) Source(74, 66) + SourceIndex(0)
-7 >Emitted(63, 29) Source(74, 7) + SourceIndex(0)
-8 >Emitted(63, 43) Source(74, 13) + SourceIndex(0)
-9 >Emitted(63, 45) Source(74, 15) + SourceIndex(0)
-10>Emitted(63, 55) Source(74, 47) + SourceIndex(0)
-11>Emitted(63, 57) Source(74, 16) + SourceIndex(0)
-12>Emitted(63, 78) Source(74, 29) + SourceIndex(0)
-13>Emitted(63, 80) Source(74, 31) + SourceIndex(0)
-14>Emitted(63, 103) Source(74, 46) + SourceIndex(0)
-15>Emitted(63, 108) Source(74, 66) + SourceIndex(0)
-16>Emitted(63, 110) Source(74, 68) + SourceIndex(0)
-17>Emitted(63, 111) Source(74, 69) + SourceIndex(0)
-18>Emitted(63, 114) Source(74, 72) + SourceIndex(0)
-19>Emitted(63, 115) Source(74, 73) + SourceIndex(0)
-20>Emitted(63, 117) Source(74, 75) + SourceIndex(0)
-21>Emitted(63, 118) Source(74, 76) + SourceIndex(0)
-22>Emitted(63, 121) Source(74, 79) + SourceIndex(0)
-23>Emitted(63, 122) Source(74, 80) + SourceIndex(0)
-24>Emitted(63, 124) Source(74, 82) + SourceIndex(0)
-25>Emitted(63, 125) Source(74, 83) + SourceIndex(0)
-26>Emitted(63, 127) Source(74, 85) + SourceIndex(0)
-27>Emitted(63, 129) Source(74, 87) + SourceIndex(0)
-28>Emitted(63, 130) Source(74, 88) + SourceIndex(0)
+5 >Emitted(63, 26) Source(74, 66) + SourceIndex(0)
+6 >Emitted(63, 28) Source(74, 7) + SourceIndex(0)
+7 >Emitted(63, 42) Source(74, 13) + SourceIndex(0)
+8 >Emitted(63, 44) Source(74, 15) + SourceIndex(0)
+9 >Emitted(63, 54) Source(74, 47) + SourceIndex(0)
+10>Emitted(63, 56) Source(74, 16) + SourceIndex(0)
+11>Emitted(63, 77) Source(74, 29) + SourceIndex(0)
+12>Emitted(63, 79) Source(74, 31) + SourceIndex(0)
+13>Emitted(63, 102) Source(74, 46) + SourceIndex(0)
+14>Emitted(63, 108) Source(74, 68) + SourceIndex(0)
+15>Emitted(63, 109) Source(74, 69) + SourceIndex(0)
+16>Emitted(63, 112) Source(74, 72) + SourceIndex(0)
+17>Emitted(63, 113) Source(74, 73) + SourceIndex(0)
+18>Emitted(63, 115) Source(74, 75) + SourceIndex(0)
+19>Emitted(63, 116) Source(74, 76) + SourceIndex(0)
+20>Emitted(63, 119) Source(74, 79) + SourceIndex(0)
+21>Emitted(63, 120) Source(74, 80) + SourceIndex(0)
+22>Emitted(63, 122) Source(74, 82) + SourceIndex(0)
+23>Emitted(63, 123) Source(74, 83) + SourceIndex(0)
+24>Emitted(63, 125) Source(74, 85) + SourceIndex(0)
+25>Emitted(63, 127) Source(74, 87) + SourceIndex(0)
+26>Emitted(63, 128) Source(74, 88) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2247,99 +2145,93 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(65, 1) Source(76, 1) + SourceIndex(0)
 2 >Emitted(65, 2) Source(76, 2) + SourceIndex(0)
 ---
->>>for ((_s = ["trimmer", ["trimming", "edging"]], nameMA = _s[0], _t = _s[1], primarySkillA = _t[0], secondarySkillA = _t[1], _s), i = 0; i < 1; i++) {
+>>>for (_s = ["trimmer", ["trimming", "edging"]], nameMA = _s[0], _t = _s[1], primarySkillA = _t[0], secondarySkillA = _t[1], _s, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                              ^^
-8 >                                                ^^^^^^^^^^^^^^
-9 >                                                              ^^
-10>                                                                ^^^^^^^^^^
-11>                                                                          ^^
-12>                                                                            ^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                 ^^
-14>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                          ^^^^^
-16>                                                                                                                               ^^
-17>                                                                                                                                 ^
-18>                                                                                                                                  ^^^
-19>                                                                                                                                     ^
-20>                                                                                                                                      ^^
-21>                                                                                                                                        ^
-22>                                                                                                                                         ^^^
-23>                                                                                                                                            ^
-24>                                                                                                                                             ^^
-25>                                                                                                                                               ^
-26>                                                                                                                                                ^^
-27>                                                                                                                                                  ^^
-28>                                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^^^^^
+8 >                                                             ^^
+9 >                                                               ^^^^^^^^^^
+10>                                                                         ^^
+11>                                                                           ^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                ^^
+13>                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                         ^^^^^^
+15>                                                                                                                               ^
+16>                                                                                                                                ^^^
+17>                                                                                                                                   ^
+18>                                                                                                                                    ^^
+19>                                                                                                                                      ^
+20>                                                                                                                                       ^^^
+21>                                                                                                                                          ^
+22>                                                                                                                                           ^^
+23>                                                                                                                                             ^
+24>                                                                                                                                              ^^
+25>                                                                                                                                                ^^
+26>                                                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
-7 >                                              
-8 >                                                nameMA
-9 >                                                              , 
-10>                                                                [primarySkillA, secondarySkillA]
-11>                                                                          
-12>                                                                            primarySkillA
-13>                                                                                                 , 
-14>                                                                                                   secondarySkillA
-15>                                                                                                                          ]] = ["trimmer", ["trimming", "edging"]]
-16>                                                                                                                               , 
-17>                                                                                                                                 i
-18>                                                                                                                                   = 
-19>                                                                                                                                     0
-20>                                                                                                                                      ; 
-21>                                                                                                                                        i
-22>                                                                                                                                          < 
-23>                                                                                                                                            1
-24>                                                                                                                                             ; 
-25>                                                                                                                                               i
-26>                                                                                                                                                ++
-27>                                                                                                                                                  ) 
-28>                                                                                                                                                    {
+5 >     [nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]]
+6 >                                             
+7 >                                               nameMA
+8 >                                                             , 
+9 >                                                               [primarySkillA, secondarySkillA]
+10>                                                                         
+11>                                                                           primarySkillA
+12>                                                                                                , 
+13>                                                                                                  secondarySkillA
+14>                                                                                                                         ]] = ["trimmer", ["trimming", "edging"]], 
+15>                                                                                                                               i
+16>                                                                                                                                 = 
+17>                                                                                                                                   0
+18>                                                                                                                                    ; 
+19>                                                                                                                                      i
+20>                                                                                                                                        < 
+21>                                                                                                                                          1
+22>                                                                                                                                           ; 
+23>                                                                                                                                             i
+24>                                                                                                                                              ++
+25>                                                                                                                                                ) 
+26>                                                                                                                                                  {
 1->Emitted(66, 1) Source(77, 1) + SourceIndex(0)
 2 >Emitted(66, 4) Source(77, 4) + SourceIndex(0)
 3 >Emitted(66, 5) Source(77, 5) + SourceIndex(0)
 4 >Emitted(66, 6) Source(77, 6) + SourceIndex(0)
-5 >Emitted(66, 7) Source(77, 6) + SourceIndex(0)
-6 >Emitted(66, 47) Source(77, 86) + SourceIndex(0)
-7 >Emitted(66, 49) Source(77, 7) + SourceIndex(0)
-8 >Emitted(66, 63) Source(77, 13) + SourceIndex(0)
-9 >Emitted(66, 65) Source(77, 15) + SourceIndex(0)
-10>Emitted(66, 75) Source(77, 47) + SourceIndex(0)
-11>Emitted(66, 77) Source(77, 16) + SourceIndex(0)
-12>Emitted(66, 98) Source(77, 29) + SourceIndex(0)
-13>Emitted(66, 100) Source(77, 31) + SourceIndex(0)
-14>Emitted(66, 123) Source(77, 46) + SourceIndex(0)
-15>Emitted(66, 128) Source(77, 86) + SourceIndex(0)
-16>Emitted(66, 130) Source(77, 88) + SourceIndex(0)
-17>Emitted(66, 131) Source(77, 89) + SourceIndex(0)
-18>Emitted(66, 134) Source(77, 92) + SourceIndex(0)
-19>Emitted(66, 135) Source(77, 93) + SourceIndex(0)
-20>Emitted(66, 137) Source(77, 95) + SourceIndex(0)
-21>Emitted(66, 138) Source(77, 96) + SourceIndex(0)
-22>Emitted(66, 141) Source(77, 99) + SourceIndex(0)
-23>Emitted(66, 142) Source(77, 100) + SourceIndex(0)
-24>Emitted(66, 144) Source(77, 102) + SourceIndex(0)
-25>Emitted(66, 145) Source(77, 103) + SourceIndex(0)
-26>Emitted(66, 147) Source(77, 105) + SourceIndex(0)
-27>Emitted(66, 149) Source(77, 107) + SourceIndex(0)
-28>Emitted(66, 150) Source(77, 108) + SourceIndex(0)
+5 >Emitted(66, 46) Source(77, 86) + SourceIndex(0)
+6 >Emitted(66, 48) Source(77, 7) + SourceIndex(0)
+7 >Emitted(66, 62) Source(77, 13) + SourceIndex(0)
+8 >Emitted(66, 64) Source(77, 15) + SourceIndex(0)
+9 >Emitted(66, 74) Source(77, 47) + SourceIndex(0)
+10>Emitted(66, 76) Source(77, 16) + SourceIndex(0)
+11>Emitted(66, 97) Source(77, 29) + SourceIndex(0)
+12>Emitted(66, 99) Source(77, 31) + SourceIndex(0)
+13>Emitted(66, 122) Source(77, 46) + SourceIndex(0)
+14>Emitted(66, 128) Source(77, 88) + SourceIndex(0)
+15>Emitted(66, 129) Source(77, 89) + SourceIndex(0)
+16>Emitted(66, 132) Source(77, 92) + SourceIndex(0)
+17>Emitted(66, 133) Source(77, 93) + SourceIndex(0)
+18>Emitted(66, 135) Source(77, 95) + SourceIndex(0)
+19>Emitted(66, 136) Source(77, 96) + SourceIndex(0)
+20>Emitted(66, 139) Source(77, 99) + SourceIndex(0)
+21>Emitted(66, 140) Source(77, 100) + SourceIndex(0)
+22>Emitted(66, 142) Source(77, 102) + SourceIndex(0)
+23>Emitted(66, 143) Source(77, 103) + SourceIndex(0)
+24>Emitted(66, 145) Source(77, 105) + SourceIndex(0)
+25>Emitted(66, 147) Source(77, 107) + SourceIndex(0)
+26>Emitted(66, 148) Source(77, 108) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2371,88 +2263,82 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(68, 1) Source(79, 1) + SourceIndex(0)
 2 >Emitted(68, 2) Source(79, 2) + SourceIndex(0)
 ---
->>>for ((numberA3 = robotA[0], robotAInfo = robotA.slice(1), robotA), i = 0; i < 1; i++) {
+>>>for (numberA3 = robotA[0], robotAInfo = robotA.slice(1), robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                        ^^
-10>                                                          ^^^^^^
-11>                                                                ^
-12>                                                                 ^^
-13>                                                                   ^
-14>                                                                    ^^^
-15>                                                                       ^
-16>                                                                        ^^
-17>                                                                          ^
-18>                                                                           ^^^
-19>                                                                              ^
-20>                                                                               ^^
-21>                                                                                 ^
-22>                                                                                  ^^
-23>                                                                                    ^^
-24>                                                                                      ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                       ^^
+9 >                                                         ^^^^^^
+10>                                                               ^^
+11>                                                                 ^
+12>                                                                  ^^^
+13>                                                                     ^
+14>                                                                      ^^
+15>                                                                        ^
+16>                                                                         ^^^
+17>                                                                            ^
+18>                                                                             ^^
+19>                                                                               ^
+20>                                                                                ^^
+21>                                                                                  ^^
+22>                                                                                    ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      numberA3
-7 >                          , 
-8 >                            ...robotAInfo
-9 >                                                        ] = 
-10>                                                          robotA
-11>                                                                
-12>                                                                 , 
-13>                                                                   i
-14>                                                                     = 
-15>                                                                       0
-16>                                                                        ; 
-17>                                                                          i
-18>                                                                            < 
-19>                                                                              1
-20>                                                                               ; 
-21>                                                                                 i
-22>                                                                                  ++
-23>                                                                                    ) 
-24>                                                                                      {
+4 >    ([
+5 >     numberA3
+6 >                         , 
+7 >                           ...robotAInfo
+8 >                                                       ] = 
+9 >                                                         robotA
+10>                                                               , 
+11>                                                                 i
+12>                                                                   = 
+13>                                                                     0
+14>                                                                      ; 
+15>                                                                        i
+16>                                                                          < 
+17>                                                                            1
+18>                                                                             ; 
+19>                                                                               i
+20>                                                                                ++
+21>                                                                                  ) 
+22>                                                                                    {
 1->Emitted(69, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(69, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(69, 5) Source(81, 5) + SourceIndex(0)
-4 >Emitted(69, 6) Source(81, 6) + SourceIndex(0)
-5 >Emitted(69, 7) Source(81, 7) + SourceIndex(0)
-6 >Emitted(69, 27) Source(81, 15) + SourceIndex(0)
-7 >Emitted(69, 29) Source(81, 17) + SourceIndex(0)
-8 >Emitted(69, 57) Source(81, 30) + SourceIndex(0)
-9 >Emitted(69, 59) Source(81, 34) + SourceIndex(0)
-10>Emitted(69, 65) Source(81, 40) + SourceIndex(0)
-11>Emitted(69, 66) Source(81, 40) + SourceIndex(0)
-12>Emitted(69, 68) Source(81, 42) + SourceIndex(0)
-13>Emitted(69, 69) Source(81, 43) + SourceIndex(0)
-14>Emitted(69, 72) Source(81, 46) + SourceIndex(0)
-15>Emitted(69, 73) Source(81, 47) + SourceIndex(0)
-16>Emitted(69, 75) Source(81, 49) + SourceIndex(0)
-17>Emitted(69, 76) Source(81, 50) + SourceIndex(0)
-18>Emitted(69, 79) Source(81, 53) + SourceIndex(0)
-19>Emitted(69, 80) Source(81, 54) + SourceIndex(0)
-20>Emitted(69, 82) Source(81, 56) + SourceIndex(0)
-21>Emitted(69, 83) Source(81, 57) + SourceIndex(0)
-22>Emitted(69, 85) Source(81, 59) + SourceIndex(0)
-23>Emitted(69, 87) Source(81, 61) + SourceIndex(0)
-24>Emitted(69, 88) Source(81, 62) + SourceIndex(0)
+4 >Emitted(69, 6) Source(81, 7) + SourceIndex(0)
+5 >Emitted(69, 26) Source(81, 15) + SourceIndex(0)
+6 >Emitted(69, 28) Source(81, 17) + SourceIndex(0)
+7 >Emitted(69, 56) Source(81, 30) + SourceIndex(0)
+8 >Emitted(69, 58) Source(81, 34) + SourceIndex(0)
+9 >Emitted(69, 64) Source(81, 40) + SourceIndex(0)
+10>Emitted(69, 66) Source(81, 42) + SourceIndex(0)
+11>Emitted(69, 67) Source(81, 43) + SourceIndex(0)
+12>Emitted(69, 70) Source(81, 46) + SourceIndex(0)
+13>Emitted(69, 71) Source(81, 47) + SourceIndex(0)
+14>Emitted(69, 73) Source(81, 49) + SourceIndex(0)
+15>Emitted(69, 74) Source(81, 50) + SourceIndex(0)
+16>Emitted(69, 77) Source(81, 53) + SourceIndex(0)
+17>Emitted(69, 78) Source(81, 54) + SourceIndex(0)
+18>Emitted(69, 80) Source(81, 56) + SourceIndex(0)
+19>Emitted(69, 81) Source(81, 57) + SourceIndex(0)
+20>Emitted(69, 83) Source(81, 59) + SourceIndex(0)
+21>Emitted(69, 85) Source(81, 61) + SourceIndex(0)
+22>Emitted(69, 86) Source(81, 62) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2484,87 +2370,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(71, 1) Source(83, 1) + SourceIndex(0)
 2 >Emitted(71, 2) Source(83, 2) + SourceIndex(0)
 ---
->>>for ((_u = getRobot(), numberA3 = _u[0], robotAInfo = _u.slice(1), _u), i = 0; i < 1; i++) {
+>>>for (_u = getRobot(), numberA3 = _u[0], robotAInfo = _u.slice(1), _u, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^^
-9 >                                       ^^
-10>                                         ^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                 ^^^^^
-12>                                                                      ^^
-13>                                                                        ^
-14>                                                                         ^^^
-15>                                                                            ^
-16>                                                                             ^^
-17>                                                                               ^
-18>                                                                                ^^^
-19>                                                                                   ^
-20>                                                                                    ^^
-21>                                                                                      ^
-22>                                                                                       ^^
-23>                                                                                         ^^
-24>                                                                                           ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^^
+8 >                                      ^^
+9 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                ^^^^^^
+11>                                                                      ^
+12>                                                                       ^^^
+13>                                                                          ^
+14>                                                                           ^^
+15>                                                                             ^
+16>                                                                              ^^^
+17>                                                                                 ^
+18>                                                                                  ^^
+19>                                                                                    ^
+20>                                                                                     ^^
+21>                                                                                       ^^
+22>                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA3, ...robotAInfo] = getRobot()
-7 >                     
-8 >                       numberA3
-9 >                                       , 
-10>                                         ...robotAInfo
-11>                                                                 ] = getRobot()
-12>                                                                      , 
-13>                                                                        i
-14>                                                                          = 
-15>                                                                            0
-16>                                                                             ; 
-17>                                                                               i
-18>                                                                                 < 
-19>                                                                                   1
-20>                                                                                    ; 
-21>                                                                                      i
-22>                                                                                       ++
-23>                                                                                         ) 
-24>                                                                                           {
+5 >     [numberA3, ...robotAInfo] = getRobot()
+6 >                    
+7 >                      numberA3
+8 >                                      , 
+9 >                                        ...robotAInfo
+10>                                                                ] = getRobot(), 
+11>                                                                      i
+12>                                                                        = 
+13>                                                                          0
+14>                                                                           ; 
+15>                                                                             i
+16>                                                                               < 
+17>                                                                                 1
+18>                                                                                  ; 
+19>                                                                                    i
+20>                                                                                     ++
+21>                                                                                       ) 
+22>                                                                                         {
 1->Emitted(72, 1) Source(84, 1) + SourceIndex(0)
 2 >Emitted(72, 4) Source(84, 4) + SourceIndex(0)
 3 >Emitted(72, 5) Source(84, 5) + SourceIndex(0)
 4 >Emitted(72, 6) Source(84, 6) + SourceIndex(0)
-5 >Emitted(72, 7) Source(84, 6) + SourceIndex(0)
-6 >Emitted(72, 22) Source(84, 44) + SourceIndex(0)
-7 >Emitted(72, 24) Source(84, 7) + SourceIndex(0)
-8 >Emitted(72, 40) Source(84, 15) + SourceIndex(0)
-9 >Emitted(72, 42) Source(84, 17) + SourceIndex(0)
-10>Emitted(72, 66) Source(84, 30) + SourceIndex(0)
-11>Emitted(72, 71) Source(84, 44) + SourceIndex(0)
-12>Emitted(72, 73) Source(84, 46) + SourceIndex(0)
-13>Emitted(72, 74) Source(84, 47) + SourceIndex(0)
-14>Emitted(72, 77) Source(84, 50) + SourceIndex(0)
-15>Emitted(72, 78) Source(84, 51) + SourceIndex(0)
-16>Emitted(72, 80) Source(84, 53) + SourceIndex(0)
-17>Emitted(72, 81) Source(84, 54) + SourceIndex(0)
-18>Emitted(72, 84) Source(84, 57) + SourceIndex(0)
-19>Emitted(72, 85) Source(84, 58) + SourceIndex(0)
-20>Emitted(72, 87) Source(84, 60) + SourceIndex(0)
-21>Emitted(72, 88) Source(84, 61) + SourceIndex(0)
-22>Emitted(72, 90) Source(84, 63) + SourceIndex(0)
-23>Emitted(72, 92) Source(84, 65) + SourceIndex(0)
-24>Emitted(72, 93) Source(84, 66) + SourceIndex(0)
+5 >Emitted(72, 21) Source(84, 44) + SourceIndex(0)
+6 >Emitted(72, 23) Source(84, 7) + SourceIndex(0)
+7 >Emitted(72, 39) Source(84, 15) + SourceIndex(0)
+8 >Emitted(72, 41) Source(84, 17) + SourceIndex(0)
+9 >Emitted(72, 65) Source(84, 30) + SourceIndex(0)
+10>Emitted(72, 71) Source(84, 46) + SourceIndex(0)
+11>Emitted(72, 72) Source(84, 47) + SourceIndex(0)
+12>Emitted(72, 75) Source(84, 50) + SourceIndex(0)
+13>Emitted(72, 76) Source(84, 51) + SourceIndex(0)
+14>Emitted(72, 78) Source(84, 53) + SourceIndex(0)
+15>Emitted(72, 79) Source(84, 54) + SourceIndex(0)
+16>Emitted(72, 82) Source(84, 57) + SourceIndex(0)
+17>Emitted(72, 83) Source(84, 58) + SourceIndex(0)
+18>Emitted(72, 85) Source(84, 60) + SourceIndex(0)
+19>Emitted(72, 86) Source(84, 61) + SourceIndex(0)
+20>Emitted(72, 88) Source(84, 63) + SourceIndex(0)
+21>Emitted(72, 90) Source(84, 65) + SourceIndex(0)
+22>Emitted(72, 91) Source(84, 66) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2596,87 +2476,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(74, 1) Source(86, 1) + SourceIndex(0)
 2 >Emitted(74, 2) Source(86, 2) + SourceIndex(0)
 ---
->>>for ((_v = [2, "trimmer", "trimming"], numberA3 = _v[0], robotAInfo = _v.slice(1), _v), i = 0; i < 1; i++) {
+>>>for (_v = [2, "trimmer", "trimming"], numberA3 = _v[0], robotAInfo = _v.slice(1), _v, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                     ^^
-8 >                                       ^^^^^^^^^^^^^^^^
-9 >                                                       ^^
-10>                                                         ^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                 ^^^^^
-12>                                                                                      ^^
-13>                                                                                        ^
-14>                                                                                         ^^^
-15>                                                                                            ^
-16>                                                                                             ^^
-17>                                                                                               ^
-18>                                                                                                ^^^
-19>                                                                                                   ^
-20>                                                                                                    ^^
-21>                                                                                                      ^
-22>                                                                                                       ^^
-23>                                                                                                         ^^
-24>                                                                                                           ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^
+8 >                                                      ^^
+9 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                ^^^^^^
+11>                                                                                      ^
+12>                                                                                       ^^^
+13>                                                                                          ^
+14>                                                                                           ^^
+15>                                                                                             ^
+16>                                                                                              ^^^
+17>                                                                                                 ^
+18>                                                                                                  ^^
+19>                                                                                                    ^
+20>                                                                                                     ^^
+21>                                                                                                       ^^
+22>                                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"]
-7 >                                     
-8 >                                       numberA3
-9 >                                                       , 
-10>                                                         ...robotAInfo
-11>                                                                                 ] = <Robot>[2, "trimmer", "trimming"]
-12>                                                                                      , 
-13>                                                                                        i
-14>                                                                                          = 
-15>                                                                                            0
-16>                                                                                             ; 
-17>                                                                                               i
-18>                                                                                                 < 
-19>                                                                                                   1
-20>                                                                                                    ; 
-21>                                                                                                      i
-22>                                                                                                       ++
-23>                                                                                                         ) 
-24>                                                                                                           {
+5 >     [numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"]
+6 >                                    
+7 >                                      numberA3
+8 >                                                      , 
+9 >                                                        ...robotAInfo
+10>                                                                                ] = <Robot>[2, "trimmer", "trimming"], 
+11>                                                                                      i
+12>                                                                                        = 
+13>                                                                                          0
+14>                                                                                           ; 
+15>                                                                                             i
+16>                                                                                               < 
+17>                                                                                                 1
+18>                                                                                                  ; 
+19>                                                                                                    i
+20>                                                                                                     ++
+21>                                                                                                       ) 
+22>                                                                                                         {
 1->Emitted(75, 1) Source(87, 1) + SourceIndex(0)
 2 >Emitted(75, 4) Source(87, 4) + SourceIndex(0)
 3 >Emitted(75, 5) Source(87, 5) + SourceIndex(0)
 4 >Emitted(75, 6) Source(87, 6) + SourceIndex(0)
-5 >Emitted(75, 7) Source(87, 6) + SourceIndex(0)
-6 >Emitted(75, 38) Source(87, 67) + SourceIndex(0)
-7 >Emitted(75, 40) Source(87, 7) + SourceIndex(0)
-8 >Emitted(75, 56) Source(87, 15) + SourceIndex(0)
-9 >Emitted(75, 58) Source(87, 17) + SourceIndex(0)
-10>Emitted(75, 82) Source(87, 30) + SourceIndex(0)
-11>Emitted(75, 87) Source(87, 67) + SourceIndex(0)
-12>Emitted(75, 89) Source(87, 69) + SourceIndex(0)
-13>Emitted(75, 90) Source(87, 70) + SourceIndex(0)
-14>Emitted(75, 93) Source(87, 73) + SourceIndex(0)
-15>Emitted(75, 94) Source(87, 74) + SourceIndex(0)
-16>Emitted(75, 96) Source(87, 76) + SourceIndex(0)
-17>Emitted(75, 97) Source(87, 77) + SourceIndex(0)
-18>Emitted(75, 100) Source(87, 80) + SourceIndex(0)
-19>Emitted(75, 101) Source(87, 81) + SourceIndex(0)
-20>Emitted(75, 103) Source(87, 83) + SourceIndex(0)
-21>Emitted(75, 104) Source(87, 84) + SourceIndex(0)
-22>Emitted(75, 106) Source(87, 86) + SourceIndex(0)
-23>Emitted(75, 108) Source(87, 88) + SourceIndex(0)
-24>Emitted(75, 109) Source(87, 89) + SourceIndex(0)
+5 >Emitted(75, 37) Source(87, 67) + SourceIndex(0)
+6 >Emitted(75, 39) Source(87, 7) + SourceIndex(0)
+7 >Emitted(75, 55) Source(87, 15) + SourceIndex(0)
+8 >Emitted(75, 57) Source(87, 17) + SourceIndex(0)
+9 >Emitted(75, 81) Source(87, 30) + SourceIndex(0)
+10>Emitted(75, 87) Source(87, 69) + SourceIndex(0)
+11>Emitted(75, 88) Source(87, 70) + SourceIndex(0)
+12>Emitted(75, 91) Source(87, 73) + SourceIndex(0)
+13>Emitted(75, 92) Source(87, 74) + SourceIndex(0)
+14>Emitted(75, 94) Source(87, 76) + SourceIndex(0)
+15>Emitted(75, 95) Source(87, 77) + SourceIndex(0)
+16>Emitted(75, 98) Source(87, 80) + SourceIndex(0)
+17>Emitted(75, 99) Source(87, 81) + SourceIndex(0)
+18>Emitted(75, 101) Source(87, 83) + SourceIndex(0)
+19>Emitted(75, 102) Source(87, 84) + SourceIndex(0)
+20>Emitted(75, 104) Source(87, 86) + SourceIndex(0)
+21>Emitted(75, 106) Source(87, 88) + SourceIndex(0)
+22>Emitted(75, 107) Source(87, 89) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2708,81 +2582,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(77, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(77, 2) Source(89, 2) + SourceIndex(0)
 ---
->>>for ((multiRobotAInfo = multiRobotA.slice(0), multiRobotA), i = 0; i < 1; i++) {
+>>>for (multiRobotAInfo = multiRobotA.slice(0), multiRobotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                            ^^
-8 >                                              ^^^^^^^^^^^
-9 >                                                         ^
-10>                                                          ^^
-11>                                                            ^
-12>                                                             ^^^
-13>                                                                ^
-14>                                                                 ^^
-15>                                                                   ^
-16>                                                                    ^^^
-17>                                                                       ^
-18>                                                                        ^^
-19>                                                                          ^
-20>                                                                           ^^
-21>                                                                             ^^
-22>                                                                               ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                           ^^
+7 >                                             ^^^^^^^^^^^
+8 >                                                        ^^
+9 >                                                          ^
+10>                                                           ^^^
+11>                                                              ^
+12>                                                               ^^
+13>                                                                 ^
+14>                                                                  ^^^
+15>                                                                     ^
+16>                                                                      ^^
+17>                                                                        ^
+18>                                                                         ^^
+19>                                                                           ^^
+20>                                                                             ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      ...multiRobotAInfo
-7 >                                            ] = 
-8 >                                              multiRobotA
-9 >                                                         
-10>                                                          , 
-11>                                                            i
-12>                                                              = 
-13>                                                                0
-14>                                                                 ; 
-15>                                                                   i
-16>                                                                     < 
-17>                                                                       1
-18>                                                                        ; 
-19>                                                                          i
-20>                                                                           ++
-21>                                                                             ) 
-22>                                                                               {
+4 >    ([
+5 >     ...multiRobotAInfo
+6 >                                           ] = 
+7 >                                             multiRobotA
+8 >                                                        , 
+9 >                                                          i
+10>                                                            = 
+11>                                                              0
+12>                                                               ; 
+13>                                                                 i
+14>                                                                   < 
+15>                                                                     1
+16>                                                                      ; 
+17>                                                                        i
+18>                                                                         ++
+19>                                                                           ) 
+20>                                                                             {
 1->Emitted(78, 1) Source(90, 1) + SourceIndex(0)
 2 >Emitted(78, 4) Source(90, 4) + SourceIndex(0)
 3 >Emitted(78, 5) Source(90, 5) + SourceIndex(0)
-4 >Emitted(78, 6) Source(90, 6) + SourceIndex(0)
-5 >Emitted(78, 7) Source(90, 7) + SourceIndex(0)
-6 >Emitted(78, 45) Source(90, 25) + SourceIndex(0)
-7 >Emitted(78, 47) Source(90, 29) + SourceIndex(0)
-8 >Emitted(78, 58) Source(90, 40) + SourceIndex(0)
-9 >Emitted(78, 59) Source(90, 40) + SourceIndex(0)
-10>Emitted(78, 61) Source(90, 42) + SourceIndex(0)
-11>Emitted(78, 62) Source(90, 43) + SourceIndex(0)
-12>Emitted(78, 65) Source(90, 46) + SourceIndex(0)
-13>Emitted(78, 66) Source(90, 47) + SourceIndex(0)
-14>Emitted(78, 68) Source(90, 49) + SourceIndex(0)
-15>Emitted(78, 69) Source(90, 50) + SourceIndex(0)
-16>Emitted(78, 72) Source(90, 53) + SourceIndex(0)
-17>Emitted(78, 73) Source(90, 54) + SourceIndex(0)
-18>Emitted(78, 75) Source(90, 56) + SourceIndex(0)
-19>Emitted(78, 76) Source(90, 57) + SourceIndex(0)
-20>Emitted(78, 78) Source(90, 59) + SourceIndex(0)
-21>Emitted(78, 80) Source(90, 61) + SourceIndex(0)
-22>Emitted(78, 81) Source(90, 62) + SourceIndex(0)
+4 >Emitted(78, 6) Source(90, 7) + SourceIndex(0)
+5 >Emitted(78, 44) Source(90, 25) + SourceIndex(0)
+6 >Emitted(78, 46) Source(90, 29) + SourceIndex(0)
+7 >Emitted(78, 57) Source(90, 40) + SourceIndex(0)
+8 >Emitted(78, 59) Source(90, 42) + SourceIndex(0)
+9 >Emitted(78, 60) Source(90, 43) + SourceIndex(0)
+10>Emitted(78, 63) Source(90, 46) + SourceIndex(0)
+11>Emitted(78, 64) Source(90, 47) + SourceIndex(0)
+12>Emitted(78, 66) Source(90, 49) + SourceIndex(0)
+13>Emitted(78, 67) Source(90, 50) + SourceIndex(0)
+14>Emitted(78, 70) Source(90, 53) + SourceIndex(0)
+15>Emitted(78, 71) Source(90, 54) + SourceIndex(0)
+16>Emitted(78, 73) Source(90, 56) + SourceIndex(0)
+17>Emitted(78, 74) Source(90, 57) + SourceIndex(0)
+18>Emitted(78, 76) Source(90, 59) + SourceIndex(0)
+19>Emitted(78, 78) Source(90, 61) + SourceIndex(0)
+20>Emitted(78, 79) Source(90, 62) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
@@ -2814,81 +2682,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(80, 1) Source(92, 1) + SourceIndex(0)
 2 >Emitted(80, 2) Source(92, 2) + SourceIndex(0)
 ---
->>>for ((_w = getMultiRobot(), multiRobotAInfo = _w.slice(0), _w), i = 0; i < 1; i++) {
+>>>for (_w = getMultiRobot(), multiRobotAInfo = _w.slice(0), _w, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                         ^^^^^
-10>                                                              ^^
-11>                                                                ^
-12>                                                                 ^^^
-13>                                                                    ^
-14>                                                                     ^^
-15>                                                                       ^
-16>                                                                        ^^^
-17>                                                                           ^
-18>                                                                            ^^
-19>                                                                              ^
-20>                                                                               ^^
-21>                                                                                 ^^
-22>                                                                                   ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                        ^^^^^^
+9 >                                                              ^
+10>                                                               ^^^
+11>                                                                  ^
+12>                                                                   ^^
+13>                                                                     ^
+14>                                                                      ^^^
+15>                                                                         ^
+16>                                                                          ^^
+17>                                                                            ^
+18>                                                                             ^^
+19>                                                                               ^^
+20>                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [...multiRobotAInfo] = getMultiRobot()
-7 >                          
-8 >                            ...multiRobotAInfo
-9 >                                                         ] = getMultiRobot()
-10>                                                              , 
-11>                                                                i
-12>                                                                  = 
-13>                                                                    0
-14>                                                                     ; 
-15>                                                                       i
-16>                                                                         < 
-17>                                                                           1
-18>                                                                            ; 
-19>                                                                              i
-20>                                                                               ++
-21>                                                                                 ) 
-22>                                                                                   {
+5 >     [...multiRobotAInfo] = getMultiRobot()
+6 >                         
+7 >                           ...multiRobotAInfo
+8 >                                                        ] = getMultiRobot(), 
+9 >                                                              i
+10>                                                                = 
+11>                                                                  0
+12>                                                                   ; 
+13>                                                                     i
+14>                                                                       < 
+15>                                                                         1
+16>                                                                          ; 
+17>                                                                            i
+18>                                                                             ++
+19>                                                                               ) 
+20>                                                                                 {
 1->Emitted(81, 1) Source(93, 1) + SourceIndex(0)
 2 >Emitted(81, 4) Source(93, 4) + SourceIndex(0)
 3 >Emitted(81, 5) Source(93, 5) + SourceIndex(0)
 4 >Emitted(81, 6) Source(93, 6) + SourceIndex(0)
-5 >Emitted(81, 7) Source(93, 6) + SourceIndex(0)
-6 >Emitted(81, 27) Source(93, 44) + SourceIndex(0)
-7 >Emitted(81, 29) Source(93, 7) + SourceIndex(0)
-8 >Emitted(81, 58) Source(93, 25) + SourceIndex(0)
-9 >Emitted(81, 63) Source(93, 44) + SourceIndex(0)
-10>Emitted(81, 65) Source(93, 46) + SourceIndex(0)
-11>Emitted(81, 66) Source(93, 47) + SourceIndex(0)
-12>Emitted(81, 69) Source(93, 50) + SourceIndex(0)
-13>Emitted(81, 70) Source(93, 51) + SourceIndex(0)
-14>Emitted(81, 72) Source(93, 53) + SourceIndex(0)
-15>Emitted(81, 73) Source(93, 54) + SourceIndex(0)
-16>Emitted(81, 76) Source(93, 57) + SourceIndex(0)
-17>Emitted(81, 77) Source(93, 58) + SourceIndex(0)
-18>Emitted(81, 79) Source(93, 60) + SourceIndex(0)
-19>Emitted(81, 80) Source(93, 61) + SourceIndex(0)
-20>Emitted(81, 82) Source(93, 63) + SourceIndex(0)
-21>Emitted(81, 84) Source(93, 65) + SourceIndex(0)
-22>Emitted(81, 85) Source(93, 66) + SourceIndex(0)
+5 >Emitted(81, 26) Source(93, 44) + SourceIndex(0)
+6 >Emitted(81, 28) Source(93, 7) + SourceIndex(0)
+7 >Emitted(81, 57) Source(93, 25) + SourceIndex(0)
+8 >Emitted(81, 63) Source(93, 46) + SourceIndex(0)
+9 >Emitted(81, 64) Source(93, 47) + SourceIndex(0)
+10>Emitted(81, 67) Source(93, 50) + SourceIndex(0)
+11>Emitted(81, 68) Source(93, 51) + SourceIndex(0)
+12>Emitted(81, 70) Source(93, 53) + SourceIndex(0)
+13>Emitted(81, 71) Source(93, 54) + SourceIndex(0)
+14>Emitted(81, 74) Source(93, 57) + SourceIndex(0)
+15>Emitted(81, 75) Source(93, 58) + SourceIndex(0)
+16>Emitted(81, 77) Source(93, 60) + SourceIndex(0)
+17>Emitted(81, 78) Source(93, 61) + SourceIndex(0)
+18>Emitted(81, 80) Source(93, 63) + SourceIndex(0)
+19>Emitted(81, 82) Source(93, 65) + SourceIndex(0)
+20>Emitted(81, 83) Source(93, 66) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
@@ -2920,81 +2782,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(83, 1) Source(95, 1) + SourceIndex(0)
 2 >Emitted(83, 2) Source(95, 2) + SourceIndex(0)
 ---
->>>for ((_x = ["trimmer", ["trimming", "edging"]], multiRobotAInfo = _x.slice(0), _x), i = 0; i < 1; i++) {
+>>>for (_x = ["trimmer", ["trimming", "edging"]], multiRobotAInfo = _x.slice(0), _x, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                              ^^
-8 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                             ^^^^^
-10>                                                                                  ^^
-11>                                                                                    ^
-12>                                                                                     ^^^
-13>                                                                                        ^
-14>                                                                                         ^^
-15>                                                                                           ^
-16>                                                                                            ^^^
-17>                                                                                               ^
-18>                                                                                                ^^
-19>                                                                                                  ^
-20>                                                                                                   ^^
-21>                                                                                                     ^^
-22>                                                                                                       ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                            ^^^^^^
+9 >                                                                                  ^
+10>                                                                                   ^^^
+11>                                                                                      ^
+12>                                                                                       ^^
+13>                                                                                         ^
+14>                                                                                          ^^^
+15>                                                                                             ^
+16>                                                                                              ^^
+17>                                                                                                ^
+18>                                                                                                 ^^
+19>                                                                                                   ^^
+20>                                                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]]
-7 >                                              
-8 >                                                ...multiRobotAInfo
-9 >                                                                             ] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]]
-10>                                                                                  , 
-11>                                                                                    i
-12>                                                                                      = 
-13>                                                                                        0
-14>                                                                                         ; 
-15>                                                                                           i
-16>                                                                                             < 
-17>                                                                                               1
-18>                                                                                                ; 
-19>                                                                                                  i
-20>                                                                                                   ++
-21>                                                                                                     ) 
-22>                                                                                                       {
+5 >     [...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]]
+6 >                                             
+7 >                                               ...multiRobotAInfo
+8 >                                                                            ] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"]], 
+9 >                                                                                  i
+10>                                                                                    = 
+11>                                                                                      0
+12>                                                                                       ; 
+13>                                                                                         i
+14>                                                                                           < 
+15>                                                                                             1
+16>                                                                                              ; 
+17>                                                                                                i
+18>                                                                                                 ++
+19>                                                                                                   ) 
+20>                                                                                                     {
 1->Emitted(84, 1) Source(96, 1) + SourceIndex(0)
 2 >Emitted(84, 4) Source(96, 4) + SourceIndex(0)
 3 >Emitted(84, 5) Source(96, 5) + SourceIndex(0)
 4 >Emitted(84, 6) Source(96, 6) + SourceIndex(0)
-5 >Emitted(84, 7) Source(96, 6) + SourceIndex(0)
-6 >Emitted(84, 47) Source(96, 83) + SourceIndex(0)
-7 >Emitted(84, 49) Source(96, 7) + SourceIndex(0)
-8 >Emitted(84, 78) Source(96, 25) + SourceIndex(0)
-9 >Emitted(84, 83) Source(96, 83) + SourceIndex(0)
-10>Emitted(84, 85) Source(96, 85) + SourceIndex(0)
-11>Emitted(84, 86) Source(96, 86) + SourceIndex(0)
-12>Emitted(84, 89) Source(96, 89) + SourceIndex(0)
-13>Emitted(84, 90) Source(96, 90) + SourceIndex(0)
-14>Emitted(84, 92) Source(96, 92) + SourceIndex(0)
-15>Emitted(84, 93) Source(96, 93) + SourceIndex(0)
-16>Emitted(84, 96) Source(96, 96) + SourceIndex(0)
-17>Emitted(84, 97) Source(96, 97) + SourceIndex(0)
-18>Emitted(84, 99) Source(96, 99) + SourceIndex(0)
-19>Emitted(84, 100) Source(96, 100) + SourceIndex(0)
-20>Emitted(84, 102) Source(96, 102) + SourceIndex(0)
-21>Emitted(84, 104) Source(96, 104) + SourceIndex(0)
-22>Emitted(84, 105) Source(96, 105) + SourceIndex(0)
+5 >Emitted(84, 46) Source(96, 83) + SourceIndex(0)
+6 >Emitted(84, 48) Source(96, 7) + SourceIndex(0)
+7 >Emitted(84, 77) Source(96, 25) + SourceIndex(0)
+8 >Emitted(84, 83) Source(96, 85) + SourceIndex(0)
+9 >Emitted(84, 84) Source(96, 86) + SourceIndex(0)
+10>Emitted(84, 87) Source(96, 89) + SourceIndex(0)
+11>Emitted(84, 88) Source(96, 90) + SourceIndex(0)
+12>Emitted(84, 90) Source(96, 92) + SourceIndex(0)
+13>Emitted(84, 91) Source(96, 93) + SourceIndex(0)
+14>Emitted(84, 94) Source(96, 96) + SourceIndex(0)
+15>Emitted(84, 95) Source(96, 97) + SourceIndex(0)
+16>Emitted(84, 97) Source(96, 99) + SourceIndex(0)
+17>Emitted(84, 98) Source(96, 100) + SourceIndex(0)
+18>Emitted(84, 100) Source(96, 102) + SourceIndex(0)
+19>Emitted(84, 102) Source(96, 104) + SourceIndex(0)
+20>Emitted(84, 103) Source(96, 105) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js.map
index 28053eaf603..58097c096a5 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAQ,kBAAa,EAAb,mCAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAAmC,EAA5B,UAAc,EAAd,mCAAc,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,+BAAmD,EAA5C,UAAc,EAAd,mCAAc,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAQ,uBAGQ,EAHR,0CAGQ,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EACI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,oBAGkC,EAH3B,UAGQ,EAHR,0CAGQ,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EACQ,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,wCAGsD,EAH/C,UAGQ,EAHR,0CAGQ,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EAC4B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAM,kBAAY,EAAZ,iCAAY,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,sBAAY,EAAZ,iCAAY,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,sCAAY,EAAZ,iCAAY,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,uBAAc,EAAd,mCAAc,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,2BAAc,EAAd,mCAAc,EAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,+CAAc,EAAd,mCAAc,EAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAM,kBAAa,EAAb,kCAAa,EAAE,cAAe,EAAf,oCAAe,EAAE,cAAiB,EAAjB,sCAAiB,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAAoE,EAA/D,UAAa,EAAb,kCAAa,EAAE,UAAe,EAAf,oCAAe,EAAE,UAAiB,EAAjB,sCAAiB,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3F,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,+BAAoF,EAA/E,UAAa,EAAb,kCAAa,EAAE,WAAe,EAAf,sCAAe,EAAE,WAAiB,EAAjB,wCAAiB,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CACC,wBAAiB,EAAjB,wCAAiB,EACd,oBAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,EAEpB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,qBAKe,EALV,YAAiB,EAAjB,wCAAiB,EACvB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,EAEf,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,yCAKmC,EAL9B,YAAiB,EAAjB,wCAAiB,EACvB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,EAEK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAM,mBAAa,EAAb,oCAAa,EAAE,4BAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,gBAA+C,EAA1C,YAAa,EAAb,oCAAa,EAAE,yBAAa,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,gCAA+D,EAA1D,YAAa,EAAb,oCAAa,EAAE,yBAAa,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAQ,IAAA,cAAa,EAAb,mCAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAA+B,EAA5B,UAAc,EAAd,mCAAc,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,+BAA+C,EAA5C,UAAc,EAAd,mCAAc,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAQ,IAAA,mBAGQ,EAHR,0CAGQ,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EACI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,oBAG8B,EAH3B,UAGQ,EAHR,0CAGQ,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EACQ,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,wCAGkD,EAH/C,UAGQ,EAHR,0CAGQ,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EAC4B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,cAAY,EAAZ,iCAAY,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,kBAAY,EAAZ,iCAAY,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,kCAAY,EAAZ,iCAAY,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,mBAAc,EAAd,mCAAc,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,uBAAc,EAAd,mCAAc,EAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,2CAAc,EAAd,mCAAc,EAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,cAAa,EAAb,kCAAa,EAAE,cAAe,EAAf,oCAAe,EAAE,cAAiB,EAAjB,sCAAiB,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAAgE,EAA/D,UAAa,EAAb,kCAAa,EAAE,UAAe,EAAf,oCAAe,EAAE,UAAiB,EAAjB,sCAAiB,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3F,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,+BAAgF,EAA/E,UAAa,EAAb,kCAAa,EAAE,WAAe,EAAf,sCAAe,EAAE,WAAiB,EAAjB,wCAAiB,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CACC,IAAA,oBAAiB,EAAjB,wCAAiB,EACd,oBAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,EAEpB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,qBAKW,EALV,YAAiB,EAAjB,wCAAiB,EACvB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,EAEf,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,yCAK+B,EAL9B,YAAiB,EAAjB,wCAAiB,EACvB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,EAEK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,eAAa,EAAb,oCAAa,EAAE,4BAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,gBAA2C,EAA1C,YAAa,EAAb,oCAAa,EAAE,yBAAa,EAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,gCAA2D,EAA1D,YAAa,EAAb,oCAAa,EAAE,yBAAa,EAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.sourcemap.txt
index 764825e68a2..1a8dde7dee4 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.sourcemap.txt
@@ -219,64 +219,67 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^
-6 >                       ^^
-7 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                            ^^
-9 >                                                              ^
-10>                                                               ^^^
-11>                                                                  ^
-12>                                                                   ^^
-13>                                                                     ^
-14>                                                                      ^^^
-15>                                                                         ^
-16>                                                                          ^^
-17>                                                                            ^
-18>                                                                             ^^
-19>                                                                               ^^
-20>                                                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^
+7 >                       ^^
+8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                            ^^
+10>                                                              ^
+11>                                                               ^^^
+12>                                                                  ^
+13>                                                                   ^^
+14>                                                                     ^
+15>                                                                      ^^^
+16>                                                                         ^
+17>                                                                          ^^
+18>                                                                            ^
+19>                                                                             ^^
+20>                                                                               ^^
+21>                                                                                 ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [, 
-5 >     nameA ="name"
-6 >                       
-7 >                         nameA ="name"
-8 >                                                            ] = robotA, 
-9 >                                                              i
-10>                                                                = 
-11>                                                                  0
-12>                                                                   ; 
-13>                                                                     i
-14>                                                                       < 
-15>                                                                         1
-16>                                                                          ; 
-17>                                                                            i
-18>                                                                             ++
-19>                                                                               ) 
-20>                                                                                 {
+5 >     
+6 >         nameA ="name"
+7 >                       
+8 >                         nameA ="name"
+9 >                                                            ] = robotA, 
+10>                                                              i
+11>                                                                = 
+12>                                                                  0
+13>                                                                   ; 
+14>                                                                     i
+15>                                                                       < 
+16>                                                                         1
+17>                                                                          ; 
+18>                                                                            i
+19>                                                                             ++
+20>                                                                               ) 
+21>                                                                                 {
 1->Emitted(10, 1) Source(18, 1) + SourceIndex(0)
 2 >Emitted(10, 4) Source(18, 4) + SourceIndex(0)
 3 >Emitted(10, 5) Source(18, 5) + SourceIndex(0)
 4 >Emitted(10, 6) Source(18, 13) + SourceIndex(0)
-5 >Emitted(10, 24) Source(18, 26) + SourceIndex(0)
-6 >Emitted(10, 26) Source(18, 13) + SourceIndex(0)
-7 >Emitted(10, 61) Source(18, 26) + SourceIndex(0)
-8 >Emitted(10, 63) Source(18, 38) + SourceIndex(0)
-9 >Emitted(10, 64) Source(18, 39) + SourceIndex(0)
-10>Emitted(10, 67) Source(18, 42) + SourceIndex(0)
-11>Emitted(10, 68) Source(18, 43) + SourceIndex(0)
-12>Emitted(10, 70) Source(18, 45) + SourceIndex(0)
-13>Emitted(10, 71) Source(18, 46) + SourceIndex(0)
-14>Emitted(10, 74) Source(18, 49) + SourceIndex(0)
-15>Emitted(10, 75) Source(18, 50) + SourceIndex(0)
-16>Emitted(10, 77) Source(18, 52) + SourceIndex(0)
-17>Emitted(10, 78) Source(18, 53) + SourceIndex(0)
-18>Emitted(10, 80) Source(18, 55) + SourceIndex(0)
-19>Emitted(10, 82) Source(18, 57) + SourceIndex(0)
-20>Emitted(10, 83) Source(18, 58) + SourceIndex(0)
+5 >Emitted(10, 10) Source(18, 13) + SourceIndex(0)
+6 >Emitted(10, 24) Source(18, 26) + SourceIndex(0)
+7 >Emitted(10, 26) Source(18, 13) + SourceIndex(0)
+8 >Emitted(10, 61) Source(18, 26) + SourceIndex(0)
+9 >Emitted(10, 63) Source(18, 38) + SourceIndex(0)
+10>Emitted(10, 64) Source(18, 39) + SourceIndex(0)
+11>Emitted(10, 67) Source(18, 42) + SourceIndex(0)
+12>Emitted(10, 68) Source(18, 43) + SourceIndex(0)
+13>Emitted(10, 70) Source(18, 45) + SourceIndex(0)
+14>Emitted(10, 71) Source(18, 46) + SourceIndex(0)
+15>Emitted(10, 74) Source(18, 49) + SourceIndex(0)
+16>Emitted(10, 75) Source(18, 50) + SourceIndex(0)
+17>Emitted(10, 77) Source(18, 52) + SourceIndex(0)
+18>Emitted(10, 78) Source(18, 53) + SourceIndex(0)
+19>Emitted(10, 80) Source(18, 55) + SourceIndex(0)
+20>Emitted(10, 82) Source(18, 57) + SourceIndex(0)
+21>Emitted(10, 83) Source(18, 58) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -343,9 +346,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, nameA = "name"] = getRobot()
+6 >         [, nameA = "name"] = getRobot()
 7 >                        
 8 >                          nameA = "name"
 9 >                                    
@@ -366,8 +369,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(13, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(13, 4) Source(21, 4) + SourceIndex(0)
 3 >Emitted(13, 5) Source(21, 5) + SourceIndex(0)
-4 >Emitted(13, 6) Source(21, 6) + SourceIndex(0)
-5 >Emitted(13, 10) Source(21, 6) + SourceIndex(0)
+4 >Emitted(13, 6) Source(21, 10) + SourceIndex(0)
+5 >Emitted(13, 10) Source(21, 10) + SourceIndex(0)
 6 >Emitted(13, 25) Source(21, 41) + SourceIndex(0)
 7 >Emitted(13, 27) Source(21, 13) + SourceIndex(0)
 8 >Emitted(13, 37) Source(21, 27) + SourceIndex(0)
@@ -452,9 +455,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, nameA = "name"] = [2, "trimmer", "trimming"]
+6 >         [, nameA = "name"] = [2, "trimmer", "trimming"]
 7 >                                        
 8 >                                          nameA = "name"
 9 >                                                    
@@ -475,8 +478,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(16, 1) Source(24, 1) + SourceIndex(0)
 2 >Emitted(16, 4) Source(24, 4) + SourceIndex(0)
 3 >Emitted(16, 5) Source(24, 5) + SourceIndex(0)
-4 >Emitted(16, 6) Source(24, 6) + SourceIndex(0)
-5 >Emitted(16, 10) Source(24, 6) + SourceIndex(0)
+4 >Emitted(16, 6) Source(24, 10) + SourceIndex(0)
+5 >Emitted(16, 10) Source(24, 10) + SourceIndex(0)
 6 >Emitted(16, 41) Source(24, 57) + SourceIndex(0)
 7 >Emitted(16, 43) Source(24, 13) + SourceIndex(0)
 8 >Emitted(16, 53) Source(24, 27) + SourceIndex(0)
@@ -538,95 +541,98 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^
-6 >                            ^^
-7 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                        ^^
-9 >                                                                          ^^^^^^^^^^
-10>                                                                                    ^^
-11>                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                    ^^
-13>                                                                                                                                      ^^^^^^^^^^
-14>                                                                                                                                                ^^
-15>                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                    ^^
-17>                                                                                                                                                                                                      ^
-18>                                                                                                                                                                                                       ^^^
-19>                                                                                                                                                                                                          ^
-20>                                                                                                                                                                                                           ^^
-21>                                                                                                                                                                                                             ^
-22>                                                                                                                                                                                                              ^^^
-23>                                                                                                                                                                                                                 ^
-24>                                                                                                                                                                                                                  ^^
-25>                                                                                                                                                                                                                    ^
-26>                                                                                                                                                                                                                     ^^
-27>                                                                                                                                                                                                                       ^^
-28>                                                                                                                                                                                                                         ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^
+7 >                            ^^
+8 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                        ^^
+10>                                                                          ^^^^^^^^^^
+11>                                                                                    ^^
+12>                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                    ^^
+14>                                                                                                                                      ^^^^^^^^^^
+15>                                                                                                                                                ^^
+16>                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                    ^^
+18>                                                                                                                                                                                                      ^
+19>                                                                                                                                                                                                       ^^^
+20>                                                                                                                                                                                                          ^
+21>                                                                                                                                                                                                           ^^
+22>                                                                                                                                                                                                             ^
+23>                                                                                                                                                                                                              ^^^
+24>                                                                                                                                                                                                                 ^
+25>                                                                                                                                                                                                                  ^^
+26>                                                                                                                                                                                                                    ^
+27>                                                                                                                                                                                                                     ^^
+28>                                                                                                                                                                                                                       ^^
+29>                                                                                                                                                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [, 
-5 >     [
-  >         primarySkillA = "primary",
-  >         secondarySkillA = "secondary"
-  >     ] = ["none", "none"]
-6 >                            
-7 >                              [
+5 >     
+6 >         [
+  >             primarySkillA = "primary",
+  >             secondarySkillA = "secondary"
+  >         ] = ["none", "none"]
+7 >                            
+8 >                              [
   >                                  primarySkillA = "primary",
   >                                  secondarySkillA = "secondary"
   >                              ] = ["none", "none"]
-8 >                                                                        
-9 >                                                                          primarySkillA = "primary"
-10>                                                                                    
-11>                                                                                      primarySkillA = "primary"
-12>                                                                                                                                    ,
+9 >                                                                        
+10>                                                                          primarySkillA = "primary"
+11>                                                                                    
+12>                                                                                      primarySkillA = "primary"
+13>                                                                                                                                    ,
   >                                                                                                                                        
-13>                                                                                                                                      secondarySkillA = "secondary"
-14>                                                                                                                                                
-15>                                                                                                                                                  secondarySkillA = "secondary"
-16>                                                                                                                                                                                                    
+14>                                                                                                                                      secondarySkillA = "secondary"
+15>                                                                                                                                                
+16>                                                                                                                                                  secondarySkillA = "secondary"
+17>                                                                                                                                                                                                    
   >                                                                                                                                                                                                    ] = ["none", "none"]] = multiRobotA, 
-17>                                                                                                                                                                                                      i
-18>                                                                                                                                                                                                        = 
-19>                                                                                                                                                                                                          0
-20>                                                                                                                                                                                                           ; 
-21>                                                                                                                                                                                                             i
-22>                                                                                                                                                                                                               < 
-23>                                                                                                                                                                                                                 1
-24>                                                                                                                                                                                                                  ; 
-25>                                                                                                                                                                                                                    i
-26>                                                                                                                                                                                                                     ++
-27>                                                                                                                                                                                                                       ) 
-28>                                                                                                                                                                                                                         {
+18>                                                                                                                                                                                                      i
+19>                                                                                                                                                                                                        = 
+20>                                                                                                                                                                                                          0
+21>                                                                                                                                                                                                           ; 
+22>                                                                                                                                                                                                             i
+23>                                                                                                                                                                                                               < 
+24>                                                                                                                                                                                                                 1
+25>                                                                                                                                                                                                                  ; 
+26>                                                                                                                                                                                                                    i
+27>                                                                                                                                                                                                                     ++
+28>                                                                                                                                                                                                                       ) 
+29>                                                                                                                                                                                                                         {
 1->Emitted(19, 1) Source(27, 1) + SourceIndex(0)
 2 >Emitted(19, 4) Source(27, 4) + SourceIndex(0)
 3 >Emitted(19, 5) Source(27, 5) + SourceIndex(0)
 4 >Emitted(19, 6) Source(27, 13) + SourceIndex(0)
-5 >Emitted(19, 29) Source(30, 21) + SourceIndex(0)
-6 >Emitted(19, 31) Source(27, 13) + SourceIndex(0)
-7 >Emitted(19, 73) Source(30, 21) + SourceIndex(0)
-8 >Emitted(19, 75) Source(28, 5) + SourceIndex(0)
-9 >Emitted(19, 85) Source(28, 30) + SourceIndex(0)
-10>Emitted(19, 87) Source(28, 5) + SourceIndex(0)
-11>Emitted(19, 133) Source(28, 30) + SourceIndex(0)
-12>Emitted(19, 135) Source(29, 5) + SourceIndex(0)
-13>Emitted(19, 145) Source(29, 34) + SourceIndex(0)
-14>Emitted(19, 147) Source(29, 5) + SourceIndex(0)
-15>Emitted(19, 197) Source(29, 34) + SourceIndex(0)
-16>Emitted(19, 199) Source(30, 38) + SourceIndex(0)
-17>Emitted(19, 200) Source(30, 39) + SourceIndex(0)
-18>Emitted(19, 203) Source(30, 42) + SourceIndex(0)
-19>Emitted(19, 204) Source(30, 43) + SourceIndex(0)
-20>Emitted(19, 206) Source(30, 45) + SourceIndex(0)
-21>Emitted(19, 207) Source(30, 46) + SourceIndex(0)
-22>Emitted(19, 210) Source(30, 49) + SourceIndex(0)
-23>Emitted(19, 211) Source(30, 50) + SourceIndex(0)
-24>Emitted(19, 213) Source(30, 52) + SourceIndex(0)
-25>Emitted(19, 214) Source(30, 53) + SourceIndex(0)
-26>Emitted(19, 216) Source(30, 55) + SourceIndex(0)
-27>Emitted(19, 218) Source(30, 57) + SourceIndex(0)
-28>Emitted(19, 219) Source(30, 58) + SourceIndex(0)
+5 >Emitted(19, 10) Source(27, 13) + SourceIndex(0)
+6 >Emitted(19, 29) Source(30, 21) + SourceIndex(0)
+7 >Emitted(19, 31) Source(27, 13) + SourceIndex(0)
+8 >Emitted(19, 73) Source(30, 21) + SourceIndex(0)
+9 >Emitted(19, 75) Source(28, 5) + SourceIndex(0)
+10>Emitted(19, 85) Source(28, 30) + SourceIndex(0)
+11>Emitted(19, 87) Source(28, 5) + SourceIndex(0)
+12>Emitted(19, 133) Source(28, 30) + SourceIndex(0)
+13>Emitted(19, 135) Source(29, 5) + SourceIndex(0)
+14>Emitted(19, 145) Source(29, 34) + SourceIndex(0)
+15>Emitted(19, 147) Source(29, 5) + SourceIndex(0)
+16>Emitted(19, 197) Source(29, 34) + SourceIndex(0)
+17>Emitted(19, 199) Source(30, 38) + SourceIndex(0)
+18>Emitted(19, 200) Source(30, 39) + SourceIndex(0)
+19>Emitted(19, 203) Source(30, 42) + SourceIndex(0)
+20>Emitted(19, 204) Source(30, 43) + SourceIndex(0)
+21>Emitted(19, 206) Source(30, 45) + SourceIndex(0)
+22>Emitted(19, 207) Source(30, 46) + SourceIndex(0)
+23>Emitted(19, 210) Source(30, 49) + SourceIndex(0)
+24>Emitted(19, 211) Source(30, 50) + SourceIndex(0)
+25>Emitted(19, 213) Source(30, 52) + SourceIndex(0)
+26>Emitted(19, 214) Source(30, 53) + SourceIndex(0)
+27>Emitted(19, 216) Source(30, 55) + SourceIndex(0)
+28>Emitted(19, 218) Source(30, 57) + SourceIndex(0)
+29>Emitted(19, 219) Source(30, 58) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -701,9 +707,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, [
+6 >         [, [
   >             primarySkillA = "primary",
   >             secondarySkillA = "secondary"
   >         ] = ["none", "none"]] = getMultiRobot()
@@ -743,8 +749,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(22, 1) Source(33, 1) + SourceIndex(0)
 2 >Emitted(22, 4) Source(33, 4) + SourceIndex(0)
 3 >Emitted(22, 5) Source(33, 5) + SourceIndex(0)
-4 >Emitted(22, 6) Source(33, 6) + SourceIndex(0)
-5 >Emitted(22, 10) Source(33, 6) + SourceIndex(0)
+4 >Emitted(22, 6) Source(33, 10) + SourceIndex(0)
+5 >Emitted(22, 10) Source(33, 10) + SourceIndex(0)
 6 >Emitted(22, 30) Source(36, 40) + SourceIndex(0)
 7 >Emitted(22, 32) Source(33, 13) + SourceIndex(0)
 8 >Emitted(22, 42) Source(36, 21) + SourceIndex(0)
@@ -845,9 +851,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [, [
+6 >         [, [
   >             primarySkillA = "primary",
   >             secondarySkillA = "secondary"
   >         ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]]
@@ -887,8 +893,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(25, 1) Source(39, 1) + SourceIndex(0)
 2 >Emitted(25, 4) Source(39, 4) + SourceIndex(0)
 3 >Emitted(25, 5) Source(39, 5) + SourceIndex(0)
-4 >Emitted(25, 6) Source(39, 6) + SourceIndex(0)
-5 >Emitted(25, 10) Source(39, 6) + SourceIndex(0)
+4 >Emitted(25, 6) Source(39, 10) + SourceIndex(0)
+5 >Emitted(25, 10) Source(39, 10) + SourceIndex(0)
 6 >Emitted(25, 50) Source(42, 60) + SourceIndex(0)
 7 >Emitted(25, 52) Source(39, 13) + SourceIndex(0)
 8 >Emitted(25, 62) Source(42, 21) + SourceIndex(0)
@@ -958,64 +964,67 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^
-6 >                       ^^
-7 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                          ^^
-9 >                                                            ^
-10>                                                             ^^^
-11>                                                                ^
-12>                                                                 ^^
-13>                                                                   ^
-14>                                                                    ^^^
-15>                                                                       ^
-16>                                                                        ^^
-17>                                                                          ^
-18>                                                                           ^^
-19>                                                                             ^^
-20>                                                                               ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^
+7 >                       ^^
+8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                          ^^
+10>                                                            ^
+11>                                                             ^^^
+12>                                                                ^
+13>                                                                 ^^
+14>                                                                   ^
+15>                                                                    ^^^
+16>                                                                       ^
+17>                                                                        ^^
+18>                                                                          ^
+19>                                                                           ^^
+20>                                                                             ^^
+21>                                                                               ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberB = -1
-6 >                       
-7 >                         numberB = -1
-8 >                                                          ] = robotA, 
-9 >                                                            i
-10>                                                              = 
-11>                                                                0
-12>                                                                 ; 
-13>                                                                   i
-14>                                                                     < 
-15>                                                                       1
-16>                                                                        ; 
-17>                                                                          i
-18>                                                                           ++
-19>                                                                             ) 
-20>                                                                               {
+5 >     
+6 >         numberB = -1
+7 >                       
+8 >                         numberB = -1
+9 >                                                          ] = robotA, 
+10>                                                            i
+11>                                                              = 
+12>                                                                0
+13>                                                                 ; 
+14>                                                                   i
+15>                                                                     < 
+16>                                                                       1
+17>                                                                        ; 
+18>                                                                          i
+19>                                                                           ++
+20>                                                                             ) 
+21>                                                                               {
 1->Emitted(28, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(28, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(28, 5) Source(46, 5) + SourceIndex(0)
 4 >Emitted(28, 6) Source(46, 11) + SourceIndex(0)
-5 >Emitted(28, 24) Source(46, 23) + SourceIndex(0)
-6 >Emitted(28, 26) Source(46, 11) + SourceIndex(0)
-7 >Emitted(28, 59) Source(46, 23) + SourceIndex(0)
-8 >Emitted(28, 61) Source(46, 35) + SourceIndex(0)
-9 >Emitted(28, 62) Source(46, 36) + SourceIndex(0)
-10>Emitted(28, 65) Source(46, 39) + SourceIndex(0)
-11>Emitted(28, 66) Source(46, 40) + SourceIndex(0)
-12>Emitted(28, 68) Source(46, 42) + SourceIndex(0)
-13>Emitted(28, 69) Source(46, 43) + SourceIndex(0)
-14>Emitted(28, 72) Source(46, 46) + SourceIndex(0)
-15>Emitted(28, 73) Source(46, 47) + SourceIndex(0)
-16>Emitted(28, 75) Source(46, 49) + SourceIndex(0)
-17>Emitted(28, 76) Source(46, 50) + SourceIndex(0)
-18>Emitted(28, 78) Source(46, 52) + SourceIndex(0)
-19>Emitted(28, 80) Source(46, 54) + SourceIndex(0)
-20>Emitted(28, 81) Source(46, 55) + SourceIndex(0)
+5 >Emitted(28, 10) Source(46, 11) + SourceIndex(0)
+6 >Emitted(28, 24) Source(46, 23) + SourceIndex(0)
+7 >Emitted(28, 26) Source(46, 11) + SourceIndex(0)
+8 >Emitted(28, 59) Source(46, 23) + SourceIndex(0)
+9 >Emitted(28, 61) Source(46, 35) + SourceIndex(0)
+10>Emitted(28, 62) Source(46, 36) + SourceIndex(0)
+11>Emitted(28, 65) Source(46, 39) + SourceIndex(0)
+12>Emitted(28, 66) Source(46, 40) + SourceIndex(0)
+13>Emitted(28, 68) Source(46, 42) + SourceIndex(0)
+14>Emitted(28, 69) Source(46, 43) + SourceIndex(0)
+15>Emitted(28, 72) Source(46, 46) + SourceIndex(0)
+16>Emitted(28, 73) Source(46, 47) + SourceIndex(0)
+17>Emitted(28, 75) Source(46, 49) + SourceIndex(0)
+18>Emitted(28, 76) Source(46, 50) + SourceIndex(0)
+19>Emitted(28, 78) Source(46, 52) + SourceIndex(0)
+20>Emitted(28, 80) Source(46, 54) + SourceIndex(0)
+21>Emitted(28, 81) Source(46, 55) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1059,63 +1068,66 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^
-6 >                           ^^
-7 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                              ^^
-9 >                                                                ^
-10>                                                                 ^^^
-11>                                                                    ^
-12>                                                                     ^^
-13>                                                                       ^
-14>                                                                        ^^^
-15>                                                                           ^
-16>                                                                            ^^
-17>                                                                              ^
-18>                                                                               ^^
-19>                                                                                 ^^
-20>                                                                                   ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^
+7 >                           ^^
+8 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                              ^^
+10>                                                                ^
+11>                                                                 ^^^
+12>                                                                    ^
+13>                                                                     ^^
+14>                                                                       ^
+15>                                                                        ^^^
+16>                                                                           ^
+17>                                                                            ^^
+18>                                                                              ^
+19>                                                                               ^^
+20>                                                                                 ^^
+21>                                                                                   ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberB = -1
-6 >                           
-7 >                             numberB = -1
-8 >                                                              ] = getRobot(), 
-9 >                                                                i
-10>                                                                  = 
-11>                                                                    0
-12>                                                                     ; 
-13>                                                                       i
-14>                                                                         < 
-15>                                                                           1
-16>                                                                            ; 
-17>                                                                              i
-18>                                                                               ++
-19>                                                                                 ) 
-20>                                                                                   {
+5 >     
+6 >         numberB = -1
+7 >                           
+8 >                             numberB = -1
+9 >                                                              ] = getRobot(), 
+10>                                                                i
+11>                                                                  = 
+12>                                                                    0
+13>                                                                     ; 
+14>                                                                       i
+15>                                                                         < 
+16>                                                                           1
+17>                                                                            ; 
+18>                                                                              i
+19>                                                                               ++
+20>                                                                                 ) 
+21>                                                                                   {
 1->Emitted(31, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(31, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(31, 5) Source(49, 5) + SourceIndex(0)
 4 >Emitted(31, 6) Source(49, 11) + SourceIndex(0)
-5 >Emitted(31, 28) Source(49, 23) + SourceIndex(0)
-6 >Emitted(31, 30) Source(49, 11) + SourceIndex(0)
-7 >Emitted(31, 63) Source(49, 23) + SourceIndex(0)
-8 >Emitted(31, 65) Source(49, 39) + SourceIndex(0)
-9 >Emitted(31, 66) Source(49, 40) + SourceIndex(0)
-10>Emitted(31, 69) Source(49, 43) + SourceIndex(0)
-11>Emitted(31, 70) Source(49, 44) + SourceIndex(0)
-12>Emitted(31, 72) Source(49, 46) + SourceIndex(0)
-13>Emitted(31, 73) Source(49, 47) + SourceIndex(0)
-14>Emitted(31, 76) Source(49, 50) + SourceIndex(0)
-15>Emitted(31, 77) Source(49, 51) + SourceIndex(0)
-16>Emitted(31, 79) Source(49, 53) + SourceIndex(0)
-17>Emitted(31, 80) Source(49, 54) + SourceIndex(0)
-18>Emitted(31, 82) Source(49, 56) + SourceIndex(0)
-19>Emitted(31, 84) Source(49, 58) + SourceIndex(0)
-20>Emitted(31, 85) Source(49, 59) + SourceIndex(0)
+5 >Emitted(31, 10) Source(49, 11) + SourceIndex(0)
+6 >Emitted(31, 28) Source(49, 23) + SourceIndex(0)
+7 >Emitted(31, 30) Source(49, 11) + SourceIndex(0)
+8 >Emitted(31, 63) Source(49, 23) + SourceIndex(0)
+9 >Emitted(31, 65) Source(49, 39) + SourceIndex(0)
+10>Emitted(31, 66) Source(49, 40) + SourceIndex(0)
+11>Emitted(31, 69) Source(49, 43) + SourceIndex(0)
+12>Emitted(31, 70) Source(49, 44) + SourceIndex(0)
+13>Emitted(31, 72) Source(49, 46) + SourceIndex(0)
+14>Emitted(31, 73) Source(49, 47) + SourceIndex(0)
+15>Emitted(31, 76) Source(49, 50) + SourceIndex(0)
+16>Emitted(31, 77) Source(49, 51) + SourceIndex(0)
+17>Emitted(31, 79) Source(49, 53) + SourceIndex(0)
+18>Emitted(31, 80) Source(49, 54) + SourceIndex(0)
+19>Emitted(31, 82) Source(49, 56) + SourceIndex(0)
+20>Emitted(31, 84) Source(49, 58) + SourceIndex(0)
+21>Emitted(31, 85) Source(49, 59) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1159,63 +1171,66 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                           ^^
-7 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                              ^^
-9 >                                                                                ^
-10>                                                                                 ^^^
-11>                                                                                    ^
-12>                                                                                     ^^
-13>                                                                                       ^
-14>                                                                                        ^^^
-15>                                                                                           ^
-16>                                                                                            ^^
-17>                                                                                              ^
-18>                                                                                               ^^
-19>                                                                                                 ^^
-20>                                                                                                   ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                           ^^
+8 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                              ^^
+10>                                                                                ^
+11>                                                                                 ^^^
+12>                                                                                    ^
+13>                                                                                     ^^
+14>                                                                                       ^
+15>                                                                                        ^^^
+16>                                                                                           ^
+17>                                                                                            ^^
+18>                                                                                              ^
+19>                                                                                               ^^
+20>                                                                                                 ^^
+21>                                                                                                   ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberB = -1
-6 >                                           
-7 >                                             numberB = -1
-8 >                                                                              ] = [2, "trimmer", "trimming"], 
-9 >                                                                                i
-10>                                                                                  = 
-11>                                                                                    0
-12>                                                                                     ; 
-13>                                                                                       i
-14>                                                                                         < 
-15>                                                                                           1
-16>                                                                                            ; 
-17>                                                                                              i
-18>                                                                                               ++
-19>                                                                                                 ) 
-20>                                                                                                   {
+5 >     
+6 >         numberB = -1
+7 >                                           
+8 >                                             numberB = -1
+9 >                                                                              ] = [2, "trimmer", "trimming"], 
+10>                                                                                i
+11>                                                                                  = 
+12>                                                                                    0
+13>                                                                                     ; 
+14>                                                                                       i
+15>                                                                                         < 
+16>                                                                                           1
+17>                                                                                            ; 
+18>                                                                                              i
+19>                                                                                               ++
+20>                                                                                                 ) 
+21>                                                                                                   {
 1->Emitted(34, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(34, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(34, 5) Source(52, 5) + SourceIndex(0)
 4 >Emitted(34, 6) Source(52, 11) + SourceIndex(0)
-5 >Emitted(34, 44) Source(52, 23) + SourceIndex(0)
-6 >Emitted(34, 46) Source(52, 11) + SourceIndex(0)
-7 >Emitted(34, 79) Source(52, 23) + SourceIndex(0)
-8 >Emitted(34, 81) Source(52, 55) + SourceIndex(0)
-9 >Emitted(34, 82) Source(52, 56) + SourceIndex(0)
-10>Emitted(34, 85) Source(52, 59) + SourceIndex(0)
-11>Emitted(34, 86) Source(52, 60) + SourceIndex(0)
-12>Emitted(34, 88) Source(52, 62) + SourceIndex(0)
-13>Emitted(34, 89) Source(52, 63) + SourceIndex(0)
-14>Emitted(34, 92) Source(52, 66) + SourceIndex(0)
-15>Emitted(34, 93) Source(52, 67) + SourceIndex(0)
-16>Emitted(34, 95) Source(52, 69) + SourceIndex(0)
-17>Emitted(34, 96) Source(52, 70) + SourceIndex(0)
-18>Emitted(34, 98) Source(52, 72) + SourceIndex(0)
-19>Emitted(34, 100) Source(52, 74) + SourceIndex(0)
-20>Emitted(34, 101) Source(52, 75) + SourceIndex(0)
+5 >Emitted(34, 10) Source(52, 11) + SourceIndex(0)
+6 >Emitted(34, 44) Source(52, 23) + SourceIndex(0)
+7 >Emitted(34, 46) Source(52, 11) + SourceIndex(0)
+8 >Emitted(34, 79) Source(52, 23) + SourceIndex(0)
+9 >Emitted(34, 81) Source(52, 55) + SourceIndex(0)
+10>Emitted(34, 82) Source(52, 56) + SourceIndex(0)
+11>Emitted(34, 85) Source(52, 59) + SourceIndex(0)
+12>Emitted(34, 86) Source(52, 60) + SourceIndex(0)
+13>Emitted(34, 88) Source(52, 62) + SourceIndex(0)
+14>Emitted(34, 89) Source(52, 63) + SourceIndex(0)
+15>Emitted(34, 92) Source(52, 66) + SourceIndex(0)
+16>Emitted(34, 93) Source(52, 67) + SourceIndex(0)
+17>Emitted(34, 95) Source(52, 69) + SourceIndex(0)
+18>Emitted(34, 96) Source(52, 70) + SourceIndex(0)
+19>Emitted(34, 98) Source(52, 72) + SourceIndex(0)
+20>Emitted(34, 100) Source(52, 74) + SourceIndex(0)
+21>Emitted(34, 101) Source(52, 75) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1259,63 +1274,66 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^
-6 >                            ^^
-7 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                 ^^
-9 >                                                                   ^
-10>                                                                    ^^^
-11>                                                                       ^
-12>                                                                        ^^
-13>                                                                          ^
-14>                                                                           ^^^
-15>                                                                              ^
-16>                                                                               ^^
-17>                                                                                 ^
-18>                                                                                  ^^
-19>                                                                                    ^^
-20>                                                                                      ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^
+7 >                            ^^
+8 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                 ^^
+10>                                                                   ^
+11>                                                                    ^^^
+12>                                                                       ^
+13>                                                                        ^^
+14>                                                                          ^
+15>                                                                           ^^^
+16>                                                                              ^
+17>                                                                               ^^
+18>                                                                                 ^
+19>                                                                                  ^^
+20>                                                                                    ^^
+21>                                                                                      ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameB = "name"
-6 >                            
-7 >                              nameB = "name"
-8 >                                                                 ] = multiRobotA, 
-9 >                                                                   i
-10>                                                                     = 
-11>                                                                       0
-12>                                                                        ; 
-13>                                                                          i
-14>                                                                            < 
-15>                                                                              1
-16>                                                                               ; 
-17>                                                                                 i
-18>                                                                                  ++
-19>                                                                                    ) 
-20>                                                                                      {
+5 >     
+6 >         nameB = "name"
+7 >                            
+8 >                              nameB = "name"
+9 >                                                                 ] = multiRobotA, 
+10>                                                                   i
+11>                                                                     = 
+12>                                                                       0
+13>                                                                        ; 
+14>                                                                          i
+15>                                                                            < 
+16>                                                                              1
+17>                                                                               ; 
+18>                                                                                 i
+19>                                                                                  ++
+20>                                                                                    ) 
+21>                                                                                      {
 1->Emitted(37, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(55, 5) + SourceIndex(0)
 4 >Emitted(37, 6) Source(55, 11) + SourceIndex(0)
-5 >Emitted(37, 29) Source(55, 25) + SourceIndex(0)
-6 >Emitted(37, 31) Source(55, 11) + SourceIndex(0)
-7 >Emitted(37, 66) Source(55, 25) + SourceIndex(0)
-8 >Emitted(37, 68) Source(55, 42) + SourceIndex(0)
-9 >Emitted(37, 69) Source(55, 43) + SourceIndex(0)
-10>Emitted(37, 72) Source(55, 46) + SourceIndex(0)
-11>Emitted(37, 73) Source(55, 47) + SourceIndex(0)
-12>Emitted(37, 75) Source(55, 49) + SourceIndex(0)
-13>Emitted(37, 76) Source(55, 50) + SourceIndex(0)
-14>Emitted(37, 79) Source(55, 53) + SourceIndex(0)
-15>Emitted(37, 80) Source(55, 54) + SourceIndex(0)
-16>Emitted(37, 82) Source(55, 56) + SourceIndex(0)
-17>Emitted(37, 83) Source(55, 57) + SourceIndex(0)
-18>Emitted(37, 85) Source(55, 59) + SourceIndex(0)
-19>Emitted(37, 87) Source(55, 61) + SourceIndex(0)
-20>Emitted(37, 88) Source(55, 62) + SourceIndex(0)
+5 >Emitted(37, 10) Source(55, 11) + SourceIndex(0)
+6 >Emitted(37, 29) Source(55, 25) + SourceIndex(0)
+7 >Emitted(37, 31) Source(55, 11) + SourceIndex(0)
+8 >Emitted(37, 66) Source(55, 25) + SourceIndex(0)
+9 >Emitted(37, 68) Source(55, 42) + SourceIndex(0)
+10>Emitted(37, 69) Source(55, 43) + SourceIndex(0)
+11>Emitted(37, 72) Source(55, 46) + SourceIndex(0)
+12>Emitted(37, 73) Source(55, 47) + SourceIndex(0)
+13>Emitted(37, 75) Source(55, 49) + SourceIndex(0)
+14>Emitted(37, 76) Source(55, 50) + SourceIndex(0)
+15>Emitted(37, 79) Source(55, 53) + SourceIndex(0)
+16>Emitted(37, 80) Source(55, 54) + SourceIndex(0)
+17>Emitted(37, 82) Source(55, 56) + SourceIndex(0)
+18>Emitted(37, 83) Source(55, 57) + SourceIndex(0)
+19>Emitted(37, 85) Source(55, 59) + SourceIndex(0)
+20>Emitted(37, 87) Source(55, 61) + SourceIndex(0)
+21>Emitted(37, 88) Source(55, 62) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1359,63 +1377,66 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                ^^
-7 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                     ^^
-9 >                                                                       ^
-10>                                                                        ^^^
-11>                                                                           ^
-12>                                                                            ^^
-13>                                                                              ^
-14>                                                                               ^^^
-15>                                                                                  ^
-16>                                                                                   ^^
-17>                                                                                     ^
-18>                                                                                      ^^
-19>                                                                                        ^^
-20>                                                                                          ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                ^^
+8 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                     ^^
+10>                                                                       ^
+11>                                                                        ^^^
+12>                                                                           ^
+13>                                                                            ^^
+14>                                                                              ^
+15>                                                                               ^^^
+16>                                                                                  ^
+17>                                                                                   ^^
+18>                                                                                     ^
+19>                                                                                      ^^
+20>                                                                                        ^^
+21>                                                                                          ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameB = "name"
-6 >                                
-7 >                                  nameB = "name"
-8 >                                                                     ] = getMultiRobot(), 
-9 >                                                                       i
-10>                                                                         = 
-11>                                                                           0
-12>                                                                            ; 
-13>                                                                              i
-14>                                                                                < 
-15>                                                                                  1
-16>                                                                                   ; 
-17>                                                                                     i
-18>                                                                                      ++
-19>                                                                                        ) 
-20>                                                                                          {
+5 >     
+6 >         nameB = "name"
+7 >                                
+8 >                                  nameB = "name"
+9 >                                                                     ] = getMultiRobot(), 
+10>                                                                       i
+11>                                                                         = 
+12>                                                                           0
+13>                                                                            ; 
+14>                                                                              i
+15>                                                                                < 
+16>                                                                                  1
+17>                                                                                   ; 
+18>                                                                                     i
+19>                                                                                      ++
+20>                                                                                        ) 
+21>                                                                                          {
 1->Emitted(40, 1) Source(58, 1) + SourceIndex(0)
 2 >Emitted(40, 4) Source(58, 4) + SourceIndex(0)
 3 >Emitted(40, 5) Source(58, 5) + SourceIndex(0)
 4 >Emitted(40, 6) Source(58, 11) + SourceIndex(0)
-5 >Emitted(40, 33) Source(58, 25) + SourceIndex(0)
-6 >Emitted(40, 35) Source(58, 11) + SourceIndex(0)
-7 >Emitted(40, 70) Source(58, 25) + SourceIndex(0)
-8 >Emitted(40, 72) Source(58, 46) + SourceIndex(0)
-9 >Emitted(40, 73) Source(58, 47) + SourceIndex(0)
-10>Emitted(40, 76) Source(58, 50) + SourceIndex(0)
-11>Emitted(40, 77) Source(58, 51) + SourceIndex(0)
-12>Emitted(40, 79) Source(58, 53) + SourceIndex(0)
-13>Emitted(40, 80) Source(58, 54) + SourceIndex(0)
-14>Emitted(40, 83) Source(58, 57) + SourceIndex(0)
-15>Emitted(40, 84) Source(58, 58) + SourceIndex(0)
-16>Emitted(40, 86) Source(58, 60) + SourceIndex(0)
-17>Emitted(40, 87) Source(58, 61) + SourceIndex(0)
-18>Emitted(40, 89) Source(58, 63) + SourceIndex(0)
-19>Emitted(40, 91) Source(58, 65) + SourceIndex(0)
-20>Emitted(40, 92) Source(58, 66) + SourceIndex(0)
+5 >Emitted(40, 10) Source(58, 11) + SourceIndex(0)
+6 >Emitted(40, 33) Source(58, 25) + SourceIndex(0)
+7 >Emitted(40, 35) Source(58, 11) + SourceIndex(0)
+8 >Emitted(40, 70) Source(58, 25) + SourceIndex(0)
+9 >Emitted(40, 72) Source(58, 46) + SourceIndex(0)
+10>Emitted(40, 73) Source(58, 47) + SourceIndex(0)
+11>Emitted(40, 76) Source(58, 50) + SourceIndex(0)
+12>Emitted(40, 77) Source(58, 51) + SourceIndex(0)
+13>Emitted(40, 79) Source(58, 53) + SourceIndex(0)
+14>Emitted(40, 80) Source(58, 54) + SourceIndex(0)
+15>Emitted(40, 83) Source(58, 57) + SourceIndex(0)
+16>Emitted(40, 84) Source(58, 58) + SourceIndex(0)
+17>Emitted(40, 86) Source(58, 60) + SourceIndex(0)
+18>Emitted(40, 87) Source(58, 61) + SourceIndex(0)
+19>Emitted(40, 89) Source(58, 63) + SourceIndex(0)
+20>Emitted(40, 91) Source(58, 65) + SourceIndex(0)
+21>Emitted(40, 92) Source(58, 66) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1459,63 +1480,66 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                    ^^
-7 >                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                                         ^^
-9 >                                                                                           ^
-10>                                                                                            ^^^
-11>                                                                                               ^
-12>                                                                                                ^^
-13>                                                                                                  ^
-14>                                                                                                   ^^^
-15>                                                                                                      ^
-16>                                                                                                       ^^
-17>                                                                                                         ^
-18>                                                                                                          ^^
-19>                                                                                                            ^^
-20>                                                                                                              ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                    ^^
+8 >                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                         ^^
+10>                                                                                           ^
+11>                                                                                            ^^^
+12>                                                                                               ^
+13>                                                                                                ^^
+14>                                                                                                  ^
+15>                                                                                                   ^^^
+16>                                                                                                      ^
+17>                                                                                                       ^^
+18>                                                                                                         ^
+19>                                                                                                          ^^
+20>                                                                                                            ^^
+21>                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     nameB = "name"
-6 >                                                    
-7 >                                                      nameB = "name"
-8 >                                                                                         ] = ["trimmer", ["trimming", "edging"]], 
-9 >                                                                                           i
-10>                                                                                             = 
-11>                                                                                               0
-12>                                                                                                ; 
-13>                                                                                                  i
-14>                                                                                                    < 
-15>                                                                                                      1
-16>                                                                                                       ; 
-17>                                                                                                         i
-18>                                                                                                          ++
-19>                                                                                                            ) 
-20>                                                                                                              {
+5 >     
+6 >         nameB = "name"
+7 >                                                    
+8 >                                                      nameB = "name"
+9 >                                                                                         ] = ["trimmer", ["trimming", "edging"]], 
+10>                                                                                           i
+11>                                                                                             = 
+12>                                                                                               0
+13>                                                                                                ; 
+14>                                                                                                  i
+15>                                                                                                    < 
+16>                                                                                                      1
+17>                                                                                                       ; 
+18>                                                                                                         i
+19>                                                                                                          ++
+20>                                                                                                            ) 
+21>                                                                                                              {
 1->Emitted(43, 1) Source(61, 1) + SourceIndex(0)
 2 >Emitted(43, 4) Source(61, 4) + SourceIndex(0)
 3 >Emitted(43, 5) Source(61, 5) + SourceIndex(0)
 4 >Emitted(43, 6) Source(61, 11) + SourceIndex(0)
-5 >Emitted(43, 53) Source(61, 25) + SourceIndex(0)
-6 >Emitted(43, 55) Source(61, 11) + SourceIndex(0)
-7 >Emitted(43, 90) Source(61, 25) + SourceIndex(0)
-8 >Emitted(43, 92) Source(61, 66) + SourceIndex(0)
-9 >Emitted(43, 93) Source(61, 67) + SourceIndex(0)
-10>Emitted(43, 96) Source(61, 70) + SourceIndex(0)
-11>Emitted(43, 97) Source(61, 71) + SourceIndex(0)
-12>Emitted(43, 99) Source(61, 73) + SourceIndex(0)
-13>Emitted(43, 100) Source(61, 74) + SourceIndex(0)
-14>Emitted(43, 103) Source(61, 77) + SourceIndex(0)
-15>Emitted(43, 104) Source(61, 78) + SourceIndex(0)
-16>Emitted(43, 106) Source(61, 80) + SourceIndex(0)
-17>Emitted(43, 107) Source(61, 81) + SourceIndex(0)
-18>Emitted(43, 109) Source(61, 83) + SourceIndex(0)
-19>Emitted(43, 111) Source(61, 85) + SourceIndex(0)
-20>Emitted(43, 112) Source(61, 86) + SourceIndex(0)
+5 >Emitted(43, 10) Source(61, 11) + SourceIndex(0)
+6 >Emitted(43, 53) Source(61, 25) + SourceIndex(0)
+7 >Emitted(43, 55) Source(61, 11) + SourceIndex(0)
+8 >Emitted(43, 90) Source(61, 25) + SourceIndex(0)
+9 >Emitted(43, 92) Source(61, 66) + SourceIndex(0)
+10>Emitted(43, 93) Source(61, 67) + SourceIndex(0)
+11>Emitted(43, 96) Source(61, 70) + SourceIndex(0)
+12>Emitted(43, 97) Source(61, 71) + SourceIndex(0)
+13>Emitted(43, 99) Source(61, 73) + SourceIndex(0)
+14>Emitted(43, 100) Source(61, 74) + SourceIndex(0)
+15>Emitted(43, 103) Source(61, 77) + SourceIndex(0)
+16>Emitted(43, 104) Source(61, 78) + SourceIndex(0)
+17>Emitted(43, 106) Source(61, 80) + SourceIndex(0)
+18>Emitted(43, 107) Source(61, 81) + SourceIndex(0)
+19>Emitted(43, 109) Source(61, 83) + SourceIndex(0)
+20>Emitted(43, 111) Source(61, 85) + SourceIndex(0)
+21>Emitted(43, 112) Source(61, 86) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1559,88 +1583,91 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^
-6 >                       ^^
-7 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                           ^^
-9 >                                                             ^^^^^^^^^^^^^^
-10>                                                                           ^^
-11>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                 ^^
-13>                                                                                                                   ^^^^^^^^^^^^^^
-14>                                                                                                                                 ^^
-15>                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                         ^^
-17>                                                                                                                                                                           ^
-18>                                                                                                                                                                            ^^^
-19>                                                                                                                                                                               ^
-20>                                                                                                                                                                                ^^
-21>                                                                                                                                                                                  ^
-22>                                                                                                                                                                                   ^^^
-23>                                                                                                                                                                                      ^
-24>                                                                                                                                                                                       ^^
-25>                                                                                                                                                                                         ^
-26>                                                                                                                                                                                          ^^
-27>                                                                                                                                                                                            ^^
-28>                                                                                                                                                                                              ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^
+7 >                       ^^
+8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                           ^^
+10>                                                             ^^^^^^^^^^^^^^
+11>                                                                           ^^
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                 ^^
+14>                                                                                                                   ^^^^^^^^^^^^^^
+15>                                                                                                                                 ^^
+16>                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                         ^^
+18>                                                                                                                                                                           ^
+19>                                                                                                                                                                            ^^^
+20>                                                                                                                                                                               ^
+21>                                                                                                                                                                                ^^
+22>                                                                                                                                                                                  ^
+23>                                                                                                                                                                                   ^^^
+24>                                                                                                                                                                                      ^
+25>                                                                                                                                                                                       ^^
+26>                                                                                                                                                                                         ^
+27>                                                                                                                                                                                          ^^
+28>                                                                                                                                                                                            ^^
+29>                                                                                                                                                                                              ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberA2 = -1
-6 >                       
-7 >                         numberA2 = -1
-8 >                                                           , 
-9 >                                                             nameA2 = "name"
-10>                                                                           
-11>                                                                             nameA2 = "name"
-12>                                                                                                                 , 
-13>                                                                                                                   skillA2 = "skill"
-14>                                                                                                                                 
-15>                                                                                                                                   skillA2 = "skill"
-16>                                                                                                                                                                         ] = robotA, 
-17>                                                                                                                                                                           i
-18>                                                                                                                                                                             = 
-19>                                                                                                                                                                               0
-20>                                                                                                                                                                                ; 
-21>                                                                                                                                                                                  i
-22>                                                                                                                                                                                    < 
-23>                                                                                                                                                                                      1
-24>                                                                                                                                                                                       ; 
-25>                                                                                                                                                                                         i
-26>                                                                                                                                                                                          ++
-27>                                                                                                                                                                                            ) 
-28>                                                                                                                                                                                              {
+5 >     
+6 >         numberA2 = -1
+7 >                       
+8 >                         numberA2 = -1
+9 >                                                           , 
+10>                                                             nameA2 = "name"
+11>                                                                           
+12>                                                                             nameA2 = "name"
+13>                                                                                                                 , 
+14>                                                                                                                   skillA2 = "skill"
+15>                                                                                                                                 
+16>                                                                                                                                   skillA2 = "skill"
+17>                                                                                                                                                                         ] = robotA, 
+18>                                                                                                                                                                           i
+19>                                                                                                                                                                             = 
+20>                                                                                                                                                                               0
+21>                                                                                                                                                                                ; 
+22>                                                                                                                                                                                  i
+23>                                                                                                                                                                                    < 
+24>                                                                                                                                                                                      1
+25>                                                                                                                                                                                       ; 
+26>                                                                                                                                                                                         i
+27>                                                                                                                                                                                          ++
+28>                                                                                                                                                                                            ) 
+29>                                                                                                                                                                                              {
 1->Emitted(46, 1) Source(65, 1) + SourceIndex(0)
 2 >Emitted(46, 4) Source(65, 4) + SourceIndex(0)
 3 >Emitted(46, 5) Source(65, 5) + SourceIndex(0)
 4 >Emitted(46, 6) Source(65, 11) + SourceIndex(0)
-5 >Emitted(46, 24) Source(65, 24) + SourceIndex(0)
-6 >Emitted(46, 26) Source(65, 11) + SourceIndex(0)
-7 >Emitted(46, 60) Source(65, 24) + SourceIndex(0)
-8 >Emitted(46, 62) Source(65, 26) + SourceIndex(0)
-9 >Emitted(46, 76) Source(65, 41) + SourceIndex(0)
-10>Emitted(46, 78) Source(65, 26) + SourceIndex(0)
-11>Emitted(46, 114) Source(65, 41) + SourceIndex(0)
-12>Emitted(46, 116) Source(65, 43) + SourceIndex(0)
-13>Emitted(46, 130) Source(65, 60) + SourceIndex(0)
-14>Emitted(46, 132) Source(65, 43) + SourceIndex(0)
-15>Emitted(46, 170) Source(65, 60) + SourceIndex(0)
-16>Emitted(46, 172) Source(65, 72) + SourceIndex(0)
-17>Emitted(46, 173) Source(65, 73) + SourceIndex(0)
-18>Emitted(46, 176) Source(65, 76) + SourceIndex(0)
-19>Emitted(46, 177) Source(65, 77) + SourceIndex(0)
-20>Emitted(46, 179) Source(65, 79) + SourceIndex(0)
-21>Emitted(46, 180) Source(65, 80) + SourceIndex(0)
-22>Emitted(46, 183) Source(65, 83) + SourceIndex(0)
-23>Emitted(46, 184) Source(65, 84) + SourceIndex(0)
-24>Emitted(46, 186) Source(65, 86) + SourceIndex(0)
-25>Emitted(46, 187) Source(65, 87) + SourceIndex(0)
-26>Emitted(46, 189) Source(65, 89) + SourceIndex(0)
-27>Emitted(46, 191) Source(65, 91) + SourceIndex(0)
-28>Emitted(46, 192) Source(65, 92) + SourceIndex(0)
+5 >Emitted(46, 10) Source(65, 11) + SourceIndex(0)
+6 >Emitted(46, 24) Source(65, 24) + SourceIndex(0)
+7 >Emitted(46, 26) Source(65, 11) + SourceIndex(0)
+8 >Emitted(46, 60) Source(65, 24) + SourceIndex(0)
+9 >Emitted(46, 62) Source(65, 26) + SourceIndex(0)
+10>Emitted(46, 76) Source(65, 41) + SourceIndex(0)
+11>Emitted(46, 78) Source(65, 26) + SourceIndex(0)
+12>Emitted(46, 114) Source(65, 41) + SourceIndex(0)
+13>Emitted(46, 116) Source(65, 43) + SourceIndex(0)
+14>Emitted(46, 130) Source(65, 60) + SourceIndex(0)
+15>Emitted(46, 132) Source(65, 43) + SourceIndex(0)
+16>Emitted(46, 170) Source(65, 60) + SourceIndex(0)
+17>Emitted(46, 172) Source(65, 72) + SourceIndex(0)
+18>Emitted(46, 173) Source(65, 73) + SourceIndex(0)
+19>Emitted(46, 176) Source(65, 76) + SourceIndex(0)
+20>Emitted(46, 177) Source(65, 77) + SourceIndex(0)
+21>Emitted(46, 179) Source(65, 79) + SourceIndex(0)
+22>Emitted(46, 180) Source(65, 80) + SourceIndex(0)
+23>Emitted(46, 183) Source(65, 83) + SourceIndex(0)
+24>Emitted(46, 184) Source(65, 84) + SourceIndex(0)
+25>Emitted(46, 186) Source(65, 86) + SourceIndex(0)
+26>Emitted(46, 187) Source(65, 87) + SourceIndex(0)
+27>Emitted(46, 189) Source(65, 89) + SourceIndex(0)
+28>Emitted(46, 191) Source(65, 91) + SourceIndex(0)
+29>Emitted(46, 192) Source(65, 92) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1715,9 +1742,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot()
+6 >         [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot()
 7 >                        
 8 >                          numberA2 = -1
 9 >                                    
@@ -1746,8 +1773,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(49, 1) Source(68, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(68, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(68, 5) + SourceIndex(0)
-4 >Emitted(49, 6) Source(68, 6) + SourceIndex(0)
-5 >Emitted(49, 10) Source(68, 6) + SourceIndex(0)
+4 >Emitted(49, 6) Source(68, 10) + SourceIndex(0)
+5 >Emitted(49, 10) Source(68, 10) + SourceIndex(0)
 6 >Emitted(49, 25) Source(68, 74) + SourceIndex(0)
 7 >Emitted(49, 27) Source(68, 11) + SourceIndex(0)
 8 >Emitted(49, 37) Source(68, 24) + SourceIndex(0)
@@ -1848,9 +1875,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"]
+6 >         [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"]
 7 >                                        
 8 >                                          numberA2 = -1
 9 >                                                    
@@ -1879,8 +1906,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(52, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(52, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(52, 5) Source(71, 5) + SourceIndex(0)
-4 >Emitted(52, 6) Source(71, 6) + SourceIndex(0)
-5 >Emitted(52, 10) Source(71, 6) + SourceIndex(0)
+4 >Emitted(52, 6) Source(71, 10) + SourceIndex(0)
+5 >Emitted(52, 10) Source(71, 10) + SourceIndex(0)
 6 >Emitted(52, 41) Source(71, 90) + SourceIndex(0)
 7 >Emitted(52, 43) Source(71, 11) + SourceIndex(0)
 8 >Emitted(52, 53) Source(71, 24) + SourceIndex(0)
@@ -1950,110 +1977,113 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                       ^^
-9 >                                                                         ^^^^^^^^^^^^^^^^^^^^
-10>                                                                                             ^^
-11>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                            ^^
-13>                                                                                                                                              ^^^^^^^^^^^^
-14>                                                                                                                                                          ^^
-15>                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                            ^^
-17>                                                                                                                                                                                                              ^^^^^^^^^^^^
-18>                                                                                                                                                                                                                          ^^
-19>                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                ^^
-21>                                                                                                                                                                                                                                                                                  ^
-22>                                                                                                                                                                                                                                                                                   ^^^
-23>                                                                                                                                                                                                                                                                                      ^
-24>                                                                                                                                                                                                                                                                                       ^^
-25>                                                                                                                                                                                                                                                                                         ^
-26>                                                                                                                                                                                                                                                                                          ^^^
-27>                                                                                                                                                                                                                                                                                             ^
-28>                                                                                                                                                                                                                                                                                              ^^
-29>                                                                                                                                                                                                                                                                                                ^
-30>                                                                                                                                                                                                                                                                                                 ^^
-31>                                                                                                                                                                                                                                                                                                   ^^
-32>                                                                                                                                                                                                                                                                                                     ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^
+7 >                             ^^
+8 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                       ^^
+10>                                                                         ^^^^^^^^^^^^^^^^^^^^
+11>                                                                                             ^^
+12>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                            ^^
+14>                                                                                                                                              ^^^^^^^^^^^^
+15>                                                                                                                                                          ^^
+16>                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                            ^^
+18>                                                                                                                                                                                                              ^^^^^^^^^^^^
+19>                                                                                                                                                                                                                          ^^
+20>                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21>                                                                                                                                                                                                                                                                                ^^
+22>                                                                                                                                                                                                                                                                                  ^
+23>                                                                                                                                                                                                                                                                                   ^^^
+24>                                                                                                                                                                                                                                                                                      ^
+25>                                                                                                                                                                                                                                                                                       ^^
+26>                                                                                                                                                                                                                                                                                         ^
+27>                                                                                                                                                                                                                                                                                          ^^^
+28>                                                                                                                                                                                                                                                                                             ^
+29>                                                                                                                                                                                                                                                                                              ^^
+30>                                                                                                                                                                                                                                                                                                ^
+31>                                                                                                                                                                                                                                                                                                 ^^
+32>                                                                                                                                                                                                                                                                                                   ^^
+33>                                                                                                                                                                                                                                                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (let
   >        [
-5 >     nameMA = "noName"
-6 >                             
-7 >                               nameMA = "noName"
-8 >                                                                       ,
+5 >     
+6 >         nameMA = "noName"
+7 >                             
+8 >                               nameMA = "noName"
+9 >                                                                       ,
   >                                                                               
-9 >                                                                         [
+10>                                                                         [
   >                                                                                     primarySkillA = "primary",
   >                                                                                     secondarySkillA = "secondary"
   >                                                                                 ] = ["none", "none"]
-10>                                                                                             
-11>                                                                                               [
+11>                                                                                             
+12>                                                                                               [
   >                                                                                                           primarySkillA = "primary",
   >                                                                                                           secondarySkillA = "secondary"
   >                                                                                                       ] = ["none", "none"]
-12>                                                                                                                                            
-13>                                                                                                                                              primarySkillA = "primary"
-14>                                                                                                                                                          
-15>                                                                                                                                                            primarySkillA = "primary"
-16>                                                                                                                                                                                                            ,
+13>                                                                                                                                            
+14>                                                                                                                                              primarySkillA = "primary"
+15>                                                                                                                                                          
+16>                                                                                                                                                            primarySkillA = "primary"
+17>                                                                                                                                                                                                            ,
   >                                                                                                                                                                                                                        
-17>                                                                                                                                                                                                              secondarySkillA = "secondary"
-18>                                                                                                                                                                                                                          
-19>                                                                                                                                                                                                                            secondarySkillA = "secondary"
-20>                                                                                                                                                                                                                                                                                
+18>                                                                                                                                                                                                              secondarySkillA = "secondary"
+19>                                                                                                                                                                                                                          
+20>                                                                                                                                                                                                                            secondarySkillA = "secondary"
+21>                                                                                                                                                                                                                                                                                
   >                                                                                                                                                                                                                                                                                        ] = ["none", "none"]
   >                                                                                                                                                                                                                                                                                    ] = multiRobotA, 
-21>                                                                                                                                                                                                                                                                                  i
-22>                                                                                                                                                                                                                                                                                    = 
-23>                                                                                                                                                                                                                                                                                      0
-24>                                                                                                                                                                                                                                                                                       ; 
-25>                                                                                                                                                                                                                                                                                         i
-26>                                                                                                                                                                                                                                                                                           < 
-27>                                                                                                                                                                                                                                                                                             1
-28>                                                                                                                                                                                                                                                                                              ; 
-29>                                                                                                                                                                                                                                                                                                i
-30>                                                                                                                                                                                                                                                                                                 ++
-31>                                                                                                                                                                                                                                                                                                   ) 
-32>                                                                                                                                                                                                                                                                                                     {
+22>                                                                                                                                                                                                                                                                                  i
+23>                                                                                                                                                                                                                                                                                    = 
+24>                                                                                                                                                                                                                                                                                      0
+25>                                                                                                                                                                                                                                                                                       ; 
+26>                                                                                                                                                                                                                                                                                         i
+27>                                                                                                                                                                                                                                                                                           < 
+28>                                                                                                                                                                                                                                                                                             1
+29>                                                                                                                                                                                                                                                                                              ; 
+30>                                                                                                                                                                                                                                                                                                i
+31>                                                                                                                                                                                                                                                                                                 ++
+32>                                                                                                                                                                                                                                                                                                   ) 
+33>                                                                                                                                                                                                                                                                                                     {
 1->Emitted(55, 1) Source(74, 1) + SourceIndex(0)
 2 >Emitted(55, 4) Source(74, 4) + SourceIndex(0)
 3 >Emitted(55, 5) Source(74, 5) + SourceIndex(0)
 4 >Emitted(55, 6) Source(75, 6) + SourceIndex(0)
-5 >Emitted(55, 30) Source(75, 23) + SourceIndex(0)
-6 >Emitted(55, 32) Source(75, 6) + SourceIndex(0)
-7 >Emitted(55, 72) Source(75, 23) + SourceIndex(0)
-8 >Emitted(55, 74) Source(76, 9) + SourceIndex(0)
-9 >Emitted(55, 94) Source(79, 29) + SourceIndex(0)
-10>Emitted(55, 96) Source(76, 9) + SourceIndex(0)
-11>Emitted(55, 141) Source(79, 29) + SourceIndex(0)
-12>Emitted(55, 143) Source(77, 13) + SourceIndex(0)
-13>Emitted(55, 155) Source(77, 38) + SourceIndex(0)
-14>Emitted(55, 157) Source(77, 13) + SourceIndex(0)
-15>Emitted(55, 205) Source(77, 38) + SourceIndex(0)
-16>Emitted(55, 207) Source(78, 13) + SourceIndex(0)
-17>Emitted(55, 219) Source(78, 42) + SourceIndex(0)
-18>Emitted(55, 221) Source(78, 13) + SourceIndex(0)
-19>Emitted(55, 273) Source(78, 42) + SourceIndex(0)
-20>Emitted(55, 275) Source(80, 22) + SourceIndex(0)
-21>Emitted(55, 276) Source(80, 23) + SourceIndex(0)
-22>Emitted(55, 279) Source(80, 26) + SourceIndex(0)
-23>Emitted(55, 280) Source(80, 27) + SourceIndex(0)
-24>Emitted(55, 282) Source(80, 29) + SourceIndex(0)
-25>Emitted(55, 283) Source(80, 30) + SourceIndex(0)
-26>Emitted(55, 286) Source(80, 33) + SourceIndex(0)
-27>Emitted(55, 287) Source(80, 34) + SourceIndex(0)
-28>Emitted(55, 289) Source(80, 36) + SourceIndex(0)
-29>Emitted(55, 290) Source(80, 37) + SourceIndex(0)
-30>Emitted(55, 292) Source(80, 39) + SourceIndex(0)
-31>Emitted(55, 294) Source(80, 41) + SourceIndex(0)
-32>Emitted(55, 295) Source(80, 42) + SourceIndex(0)
+5 >Emitted(55, 10) Source(75, 6) + SourceIndex(0)
+6 >Emitted(55, 30) Source(75, 23) + SourceIndex(0)
+7 >Emitted(55, 32) Source(75, 6) + SourceIndex(0)
+8 >Emitted(55, 72) Source(75, 23) + SourceIndex(0)
+9 >Emitted(55, 74) Source(76, 9) + SourceIndex(0)
+10>Emitted(55, 94) Source(79, 29) + SourceIndex(0)
+11>Emitted(55, 96) Source(76, 9) + SourceIndex(0)
+12>Emitted(55, 141) Source(79, 29) + SourceIndex(0)
+13>Emitted(55, 143) Source(77, 13) + SourceIndex(0)
+14>Emitted(55, 155) Source(77, 38) + SourceIndex(0)
+15>Emitted(55, 157) Source(77, 13) + SourceIndex(0)
+16>Emitted(55, 205) Source(77, 38) + SourceIndex(0)
+17>Emitted(55, 207) Source(78, 13) + SourceIndex(0)
+18>Emitted(55, 219) Source(78, 42) + SourceIndex(0)
+19>Emitted(55, 221) Source(78, 13) + SourceIndex(0)
+20>Emitted(55, 273) Source(78, 42) + SourceIndex(0)
+21>Emitted(55, 275) Source(80, 22) + SourceIndex(0)
+22>Emitted(55, 276) Source(80, 23) + SourceIndex(0)
+23>Emitted(55, 279) Source(80, 26) + SourceIndex(0)
+24>Emitted(55, 280) Source(80, 27) + SourceIndex(0)
+25>Emitted(55, 282) Source(80, 29) + SourceIndex(0)
+26>Emitted(55, 283) Source(80, 30) + SourceIndex(0)
+27>Emitted(55, 286) Source(80, 33) + SourceIndex(0)
+28>Emitted(55, 287) Source(80, 34) + SourceIndex(0)
+29>Emitted(55, 289) Source(80, 36) + SourceIndex(0)
+30>Emitted(55, 290) Source(80, 37) + SourceIndex(0)
+31>Emitted(55, 292) Source(80, 39) + SourceIndex(0)
+32>Emitted(55, 294) Source(80, 41) + SourceIndex(0)
+33>Emitted(55, 295) Source(80, 42) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2132,9 +2162,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [nameMA = "noName",
+6 >         [nameMA = "noName",
   >             [
   >                 primarySkillA = "primary",
   >                 secondarySkillA = "secondary"
@@ -2182,8 +2212,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(58, 1) Source(83, 1) + SourceIndex(0)
 2 >Emitted(58, 4) Source(83, 4) + SourceIndex(0)
 3 >Emitted(58, 5) Source(83, 5) + SourceIndex(0)
-4 >Emitted(58, 6) Source(83, 6) + SourceIndex(0)
-5 >Emitted(58, 10) Source(83, 6) + SourceIndex(0)
+4 >Emitted(58, 6) Source(83, 10) + SourceIndex(0)
+5 >Emitted(58, 10) Source(83, 10) + SourceIndex(0)
 6 >Emitted(58, 31) Source(88, 21) + SourceIndex(0)
 7 >Emitted(58, 33) Source(83, 11) + SourceIndex(0)
 8 >Emitted(58, 45) Source(83, 28) + SourceIndex(0)
@@ -2292,9 +2322,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [nameMA = "noName",
+6 >         [nameMA = "noName",
   >             [
   >                 primarySkillA = "primary",
   >                 secondarySkillA = "secondary"
@@ -2342,8 +2372,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(61, 1) Source(91, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(91, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(91, 5) + SourceIndex(0)
-4 >Emitted(61, 6) Source(91, 6) + SourceIndex(0)
-5 >Emitted(61, 10) Source(91, 6) + SourceIndex(0)
+4 >Emitted(61, 6) Source(91, 10) + SourceIndex(0)
+5 >Emitted(61, 10) Source(91, 10) + SourceIndex(0)
 6 >Emitted(61, 51) Source(96, 41) + SourceIndex(0)
 7 >Emitted(61, 53) Source(91, 11) + SourceIndex(0)
 8 >Emitted(61, 65) Source(91, 28) + SourceIndex(0)
@@ -2417,70 +2447,73 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^
-6 >                        ^^
-7 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                              ^^
-9 >                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                            ^^
-11>                                                                                              ^
-12>                                                                                               ^^^
-13>                                                                                                  ^
-14>                                                                                                   ^^
-15>                                                                                                     ^
-16>                                                                                                      ^^^
-17>                                                                                                         ^
-18>                                                                                                          ^^
-19>                                                                                                            ^
-20>                                                                                                             ^^
-21>                                                                                                               ^^
-22>                                                                                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^
+7 >                        ^^
+8 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                              ^^
+10>                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                            ^^
+12>                                                                                              ^
+13>                                                                                               ^^^
+14>                                                                                                  ^
+15>                                                                                                   ^^
+16>                                                                                                     ^
+17>                                                                                                      ^^^
+18>                                                                                                         ^
+19>                                                                                                          ^^
+20>                                                                                                            ^
+21>                                                                                                             ^^
+22>                                                                                                               ^^
+23>                                                                                                                 ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let [
-5 >     numberA3 = -1
-6 >                        
-7 >                          numberA3 = -1
-8 >                                                              , 
-9 >                                                                ...robotAInfo
-10>                                                                                            ] = robotA, 
-11>                                                                                              i
-12>                                                                                                = 
-13>                                                                                                  0
-14>                                                                                                   ; 
-15>                                                                                                     i
-16>                                                                                                       < 
-17>                                                                                                         1
-18>                                                                                                          ; 
-19>                                                                                                            i
-20>                                                                                                             ++
-21>                                                                                                               ) 
-22>                                                                                                                 {
+5 >     
+6 >         numberA3 = -1
+7 >                        
+8 >                          numberA3 = -1
+9 >                                                              , 
+10>                                                                ...robotAInfo
+11>                                                                                            ] = robotA, 
+12>                                                                                              i
+13>                                                                                                = 
+14>                                                                                                  0
+15>                                                                                                   ; 
+16>                                                                                                     i
+17>                                                                                                       < 
+18>                                                                                                         1
+19>                                                                                                          ; 
+20>                                                                                                            i
+21>                                                                                                             ++
+22>                                                                                                               ) 
+23>                                                                                                                 {
 1->Emitted(64, 1) Source(100, 1) + SourceIndex(0)
 2 >Emitted(64, 4) Source(100, 4) + SourceIndex(0)
 3 >Emitted(64, 5) Source(100, 5) + SourceIndex(0)
 4 >Emitted(64, 6) Source(100, 11) + SourceIndex(0)
-5 >Emitted(64, 25) Source(100, 24) + SourceIndex(0)
-6 >Emitted(64, 27) Source(100, 11) + SourceIndex(0)
-7 >Emitted(64, 63) Source(100, 24) + SourceIndex(0)
-8 >Emitted(64, 65) Source(100, 26) + SourceIndex(0)
-9 >Emitted(64, 93) Source(100, 39) + SourceIndex(0)
-10>Emitted(64, 95) Source(100, 51) + SourceIndex(0)
-11>Emitted(64, 96) Source(100, 52) + SourceIndex(0)
-12>Emitted(64, 99) Source(100, 55) + SourceIndex(0)
-13>Emitted(64, 100) Source(100, 56) + SourceIndex(0)
-14>Emitted(64, 102) Source(100, 58) + SourceIndex(0)
-15>Emitted(64, 103) Source(100, 59) + SourceIndex(0)
-16>Emitted(64, 106) Source(100, 62) + SourceIndex(0)
-17>Emitted(64, 107) Source(100, 63) + SourceIndex(0)
-18>Emitted(64, 109) Source(100, 65) + SourceIndex(0)
-19>Emitted(64, 110) Source(100, 66) + SourceIndex(0)
-20>Emitted(64, 112) Source(100, 68) + SourceIndex(0)
-21>Emitted(64, 114) Source(100, 70) + SourceIndex(0)
-22>Emitted(64, 115) Source(100, 71) + SourceIndex(0)
+5 >Emitted(64, 10) Source(100, 11) + SourceIndex(0)
+6 >Emitted(64, 25) Source(100, 24) + SourceIndex(0)
+7 >Emitted(64, 27) Source(100, 11) + SourceIndex(0)
+8 >Emitted(64, 63) Source(100, 24) + SourceIndex(0)
+9 >Emitted(64, 65) Source(100, 26) + SourceIndex(0)
+10>Emitted(64, 93) Source(100, 39) + SourceIndex(0)
+11>Emitted(64, 95) Source(100, 51) + SourceIndex(0)
+12>Emitted(64, 96) Source(100, 52) + SourceIndex(0)
+13>Emitted(64, 99) Source(100, 55) + SourceIndex(0)
+14>Emitted(64, 100) Source(100, 56) + SourceIndex(0)
+15>Emitted(64, 102) Source(100, 58) + SourceIndex(0)
+16>Emitted(64, 103) Source(100, 59) + SourceIndex(0)
+17>Emitted(64, 106) Source(100, 62) + SourceIndex(0)
+18>Emitted(64, 107) Source(100, 63) + SourceIndex(0)
+19>Emitted(64, 109) Source(100, 65) + SourceIndex(0)
+20>Emitted(64, 110) Source(100, 66) + SourceIndex(0)
+21>Emitted(64, 112) Source(100, 68) + SourceIndex(0)
+22>Emitted(64, 114) Source(100, 70) + SourceIndex(0)
+23>Emitted(64, 115) Source(100, 71) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2549,9 +2582,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA3 = -1, ...robotAInfo] = getRobot()
+6 >         [numberA3 = -1, ...robotAInfo] = getRobot()
 7 >                         
 8 >                           numberA3 = -1
 9 >                                       
@@ -2574,8 +2607,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(67, 1) Source(103, 1) + SourceIndex(0)
 2 >Emitted(67, 4) Source(103, 4) + SourceIndex(0)
 3 >Emitted(67, 5) Source(103, 5) + SourceIndex(0)
-4 >Emitted(67, 6) Source(103, 6) + SourceIndex(0)
-5 >Emitted(67, 10) Source(103, 6) + SourceIndex(0)
+4 >Emitted(67, 6) Source(103, 10) + SourceIndex(0)
+5 >Emitted(67, 10) Source(103, 10) + SourceIndex(0)
 6 >Emitted(67, 26) Source(103, 53) + SourceIndex(0)
 7 >Emitted(67, 28) Source(103, 11) + SourceIndex(0)
 8 >Emitted(67, 40) Source(103, 24) + SourceIndex(0)
@@ -2664,9 +2697,9 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let [numberA3 = -1, ...robotAInfo] = [2, "trimmer", "trimming"]
+6 >         [numberA3 = -1, ...robotAInfo] = [2, "trimmer", "trimming"]
 7 >                                         
 8 >                                           numberA3 = -1
 9 >                                                       
@@ -2689,8 +2722,8 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.t
 1->Emitted(70, 1) Source(106, 1) + SourceIndex(0)
 2 >Emitted(70, 4) Source(106, 4) + SourceIndex(0)
 3 >Emitted(70, 5) Source(106, 5) + SourceIndex(0)
-4 >Emitted(70, 6) Source(106, 6) + SourceIndex(0)
-5 >Emitted(70, 10) Source(106, 6) + SourceIndex(0)
+4 >Emitted(70, 6) Source(106, 10) + SourceIndex(0)
+5 >Emitted(70, 10) Source(106, 10) + SourceIndex(0)
 6 >Emitted(70, 42) Source(106, 69) + SourceIndex(0)
 7 >Emitted(70, 44) Source(106, 11) + SourceIndex(0)
 8 >Emitted(70, 56) Source(106, 24) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js
index fb2fa4f81f8..7192ed98dbe 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js
@@ -129,67 +129,67 @@ var numberB, nameB;
 var numberA2, nameA2, skillA2, nameMA;
 var numberA3, robotAInfo, multiRobotAInfo;
 var i;
-for ((_a = robotA[1], nameA = _a === void 0 ? "name" : _a, robotA), i = 0; i < 1; i++) {
+for (_a = robotA[1], nameA = _a === void 0 ? "name" : _a, robotA, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_b = getRobot(), _c = _b[1], nameA = _c === void 0 ? "name" : _c, _b), i = 0; i < 1; i++) {
+for (_b = getRobot(), _c = _b[1], nameA = _c === void 0 ? "name" : _c, _b, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_d = [2, "trimmer", "trimming"], _e = _d[1], nameA = _e === void 0 ? "name" : _e, _d), i = 0; i < 1; i++) {
+for (_d = [2, "trimmer", "trimming"], _e = _d[1], nameA = _e === void 0 ? "name" : _e, _d, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_f = multiRobotA[1], _g = _f === void 0 ? ["none", "none"] : _f, _h = _g[0], primarySkillA = _h === void 0 ? "primary" : _h, _j = _g[1], secondarySkillA = _j === void 0 ? "secondary" : _j, multiRobotA), i = 0; i < 1; i++) {
+for (_f = multiRobotA[1], _g = _f === void 0 ? ["none", "none"] : _f, _h = _g[0], primarySkillA = _h === void 0 ? "primary" : _h, _j = _g[1], secondarySkillA = _j === void 0 ? "secondary" : _j, multiRobotA, i = 0; i < 1; i++) {
     console.log(primarySkillA);
 }
-for ((_k = getMultiRobot(), _l = _k[1], _m = _l === void 0 ? ["none", "none"] : _l, _o = _m[0], primarySkillA = _o === void 0 ? "primary" : _o, _p = _m[1], secondarySkillA = _p === void 0 ? "secondary" : _p, _k), i = 0; i < 1; i++) {
+for (_k = getMultiRobot(), _l = _k[1], _m = _l === void 0 ? ["none", "none"] : _l, _o = _m[0], primarySkillA = _o === void 0 ? "primary" : _o, _p = _m[1], secondarySkillA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
     console.log(primarySkillA);
 }
-for ((_q = ["trimmer", ["trimming", "edging"]], _r = _q[1], _s = _r === void 0 ? ["none", "none"] : _r, _t = _s[0], primarySkillA = _t === void 0 ? "primary" : _t, _u = _s[1], secondarySkillA = _u === void 0 ? "secondary" : _u, _q), i = 0; i < 1; i++) {
+for (_q = ["trimmer", ["trimming", "edging"]], _r = _q[1], _s = _r === void 0 ? ["none", "none"] : _r, _t = _s[0], primarySkillA = _t === void 0 ? "primary" : _t, _u = _s[1], secondarySkillA = _u === void 0 ? "secondary" : _u, _q, i = 0; i < 1; i++) {
     console.log(primarySkillA);
 }
-for ((_v = robotA[0], numberB = _v === void 0 ? -1 : _v, robotA), i = 0; i < 1; i++) {
+for (_v = robotA[0], numberB = _v === void 0 ? -1 : _v, robotA, i = 0; i < 1; i++) {
     console.log(numberB);
 }
-for ((_w = getRobot(), _x = _w[0], numberB = _x === void 0 ? -1 : _x, _w), i = 0; i < 1; i++) {
+for (_w = getRobot(), _x = _w[0], numberB = _x === void 0 ? -1 : _x, _w, i = 0; i < 1; i++) {
     console.log(numberB);
 }
-for ((_y = [2, "trimmer", "trimming"], _z = _y[0], numberB = _z === void 0 ? -1 : _z, _y), i = 0; i < 1; i++) {
+for (_y = [2, "trimmer", "trimming"], _z = _y[0], numberB = _z === void 0 ? -1 : _z, _y, i = 0; i < 1; i++) {
     console.log(numberB);
 }
-for ((_0 = multiRobotA[0], nameB = _0 === void 0 ? "name" : _0, multiRobotA), i = 0; i < 1; i++) {
+for (_0 = multiRobotA[0], nameB = _0 === void 0 ? "name" : _0, multiRobotA, i = 0; i < 1; i++) {
     console.log(nameB);
 }
-for ((_1 = getMultiRobot(), _2 = _1[0], nameB = _2 === void 0 ? "name" : _2, _1), i = 0; i < 1; i++) {
+for (_1 = getMultiRobot(), _2 = _1[0], nameB = _2 === void 0 ? "name" : _2, _1, i = 0; i < 1; i++) {
     console.log(nameB);
 }
-for ((_3 = ["trimmer", ["trimming", "edging"]], _4 = _3[0], nameB = _4 === void 0 ? "name" : _4, _3), i = 0; i < 1; i++) {
+for (_3 = ["trimmer", ["trimming", "edging"]], _4 = _3[0], nameB = _4 === void 0 ? "name" : _4, _3, i = 0; i < 1; i++) {
     console.log(nameB);
 }
-for ((_5 = robotA[0], numberA2 = _5 === void 0 ? -1 : _5, _6 = robotA[1], nameA2 = _6 === void 0 ? "name" : _6, _7 = robotA[2], skillA2 = _7 === void 0 ? "skill" : _7, robotA), i = 0; i < 1; i++) {
+for (_5 = robotA[0], numberA2 = _5 === void 0 ? -1 : _5, _6 = robotA[1], nameA2 = _6 === void 0 ? "name" : _6, _7 = robotA[2], skillA2 = _7 === void 0 ? "skill" : _7, robotA, i = 0; i < 1; i++) {
     console.log(nameA2);
 }
-for ((_8 = getRobot(), _9 = _8[0], numberA2 = _9 === void 0 ? -1 : _9, _10 = _8[1], nameA2 = _10 === void 0 ? "name" : _10, _11 = _8[2], skillA2 = _11 === void 0 ? "skill" : _11, _8), i = 0; i < 1; i++) {
+for (_8 = getRobot(), _9 = _8[0], numberA2 = _9 === void 0 ? -1 : _9, _10 = _8[1], nameA2 = _10 === void 0 ? "name" : _10, _11 = _8[2], skillA2 = _11 === void 0 ? "skill" : _11, _8, i = 0; i < 1; i++) {
     console.log(nameA2);
 }
-for ((_12 = [2, "trimmer", "trimming"], _13 = _12[0], numberA2 = _13 === void 0 ? -1 : _13, _14 = _12[1], nameA2 = _14 === void 0 ? "name" : _14, _15 = _12[2], skillA2 = _15 === void 0 ? "skill" : _15, _12), i = 0; i < 1; i++) {
+for (_12 = [2, "trimmer", "trimming"], _13 = _12[0], numberA2 = _13 === void 0 ? -1 : _13, _14 = _12[1], nameA2 = _14 === void 0 ? "name" : _14, _15 = _12[2], skillA2 = _15 === void 0 ? "skill" : _15, _12, i = 0; i < 1; i++) {
     console.log(nameA2);
 }
 for (var _16 = multiRobotA[0], nameMA_1 = _16 === void 0 ? "noName" : _16, _17 = multiRobotA[1], _18 = _17 === void 0 ? ["none", "none"] : _17, _19 = _18[0], primarySkillA_1 = _19 === void 0 ? "primary" : _19, _20 = _18[1], secondarySkillA_1 = _20 === void 0 ? "secondary" : _20, i_1 = 0; i_1 < 1; i_1++) {
     console.log(nameMA_1);
 }
-for ((_21 = getMultiRobot(), _22 = _21[0], nameMA = _22 === void 0 ? "noName" : _22, _23 = _21[1], _24 = _23 === void 0 ? ["none", "none"] : _23, _25 = _24[0], primarySkillA = _25 === void 0 ? "primary" : _25, _26 = _24[1], secondarySkillA = _26 === void 0 ? "secondary" : _26, _21), i = 0; i < 1; i++) {
+for (_21 = getMultiRobot(), _22 = _21[0], nameMA = _22 === void 0 ? "noName" : _22, _23 = _21[1], _24 = _23 === void 0 ? ["none", "none"] : _23, _25 = _24[0], primarySkillA = _25 === void 0 ? "primary" : _25, _26 = _24[1], secondarySkillA = _26 === void 0 ? "secondary" : _26, _21, i = 0; i < 1; i++) {
     console.log(nameMA);
 }
-for ((_27 = ["trimmer", ["trimming", "edging"]], _28 = _27[0], nameMA = _28 === void 0 ? "noName" : _28, _29 = _27[1], _30 = _29 === void 0 ? ["none", "none"] : _29, _31 = _30[0], primarySkillA = _31 === void 0 ? "primary" : _31, _32 = _30[1], secondarySkillA = _32 === void 0 ? "secondary" : _32, _27), i = 0; i < 1; i++) {
+for (_27 = ["trimmer", ["trimming", "edging"]], _28 = _27[0], nameMA = _28 === void 0 ? "noName" : _28, _29 = _27[1], _30 = _29 === void 0 ? ["none", "none"] : _29, _31 = _30[0], primarySkillA = _31 === void 0 ? "primary" : _31, _32 = _30[1], secondarySkillA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
     console.log(nameMA);
 }
-for ((_33 = robotA[0], numberA3 = _33 === void 0 ? -1 : _33, robotAInfo = robotA.slice(1), robotA), i = 0; i < 1; i++) {
+for (_33 = robotA[0], numberA3 = _33 === void 0 ? -1 : _33, robotAInfo = robotA.slice(1), robotA, i = 0; i < 1; i++) {
     console.log(numberA3);
 }
-for ((_34 = getRobot(), _35 = _34[0], numberA3 = _35 === void 0 ? -1 : _35, robotAInfo = _34.slice(1), _34), i = 0; i < 1; i++) {
+for (_34 = getRobot(), _35 = _34[0], numberA3 = _35 === void 0 ? -1 : _35, robotAInfo = _34.slice(1), _34, i = 0; i < 1; i++) {
     console.log(numberA3);
 }
-for ((_36 = [2, "trimmer", "trimming"], _37 = _36[0], numberA3 = _37 === void 0 ? -1 : _37, robotAInfo = _36.slice(1), _36), i = 0; i < 1; i++) {
+for (_36 = [2, "trimmer", "trimming"], _37 = _36[0], numberA3 = _37 === void 0 ? -1 : _37, robotAInfo = _36.slice(1), _36, i = 0; i < 1; i++) {
     console.log(numberA3);
 }
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37;
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js.map
index 6446d14319e..d3452bfd56e 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AACtG,IAAI,CAAS,CAAC;AAEd,GAAG,CAAC,CAAC,CAAG,cAAc,EAAd,mCAAc,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAA+B,EAA5B,UAAc,EAAd,mCAAc,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+BAA+C,EAA5C,UAAc,EAAd,mCAAc,KAA8B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAG,mBAGY,EAHZ,0CAGY,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EACT,WAAW,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAGkC,EAH/B,UAGY,EAHZ,0CAGY,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,KACM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,wCAGsD,EAHnD,UAGY,EAHZ,0CAGY,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,KAC0B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAC,CAAC,cAAY,EAAZ,iCAAY,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAA2B,EAA1B,UAAY,EAAZ,iCAAY,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+BAA2C,EAA1C,UAAY,EAAZ,iCAAY,KAA8B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,CAAC,mBAAc,EAAd,mCAAc,EAAI,WAAW,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAAkC,EAAjC,UAAc,EAAd,mCAAc,KAAmB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,wCAAsD,EAArD,UAAc,EAAd,mCAAc,KAAuC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAC,CAAC,cAAa,EAAb,kCAAa,EAAE,cAAe,EAAf,oCAAe,EAAE,cAAiB,EAAjB,sCAAiB,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAgE,EAA/D,UAAa,EAAb,kCAAa,EAAE,WAAe,EAAf,sCAAe,EAAE,WAAiB,EAAjB,wCAAiB,KAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,gCAAgF,EAA/E,YAAa,EAAb,oCAAa,EAAE,YAAe,EAAf,sCAAe,EAAE,YAAiB,EAAjB,wCAAiB,MAA8B,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CACC,wBAAiB,EAAjB,0CAAiB,EACd,oBAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,kDAAyB,EACzB,YAA6B,EAA7B,sDAA6B,EAEpB,GAAC,GAAG,CAAC,EAAE,GAAC,GAAG,CAAC,EAAE,GAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,qBAKc,EALb,YAAiB,EAAjB,wCAAiB,EACnB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,MAElB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,yCAKkC,EALjC,YAAiB,EAAjB,wCAAiB,EACnB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,MAEE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAC,CAAC,eAAa,EAAb,oCAAa,EAAE,4BAAa,EAAI,MAAM,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,gBAA2C,EAA1C,YAAa,EAAb,oCAAa,EAAE,yBAAa,MAAc,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,gCAAkE,EAAjE,YAAa,EAAb,oCAAa,EAAE,yBAAa,MAAqC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AACtG,IAAI,CAAS,CAAC;AAEd,GAAG,CAAC,CAAI,cAAc,EAAd,mCAAc,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAA+B,EAA5B,UAAc,EAAd,mCAAc,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,+BAA+C,EAA5C,UAAc,EAAd,mCAAc,MAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAI,mBAGY,EAHZ,0CAGY,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,EACT,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,oBAGkC,EAH/B,UAGY,EAHZ,0CAGY,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,MACQ,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,GAAG,CAAC,CAAC,wCAGsD,EAHnD,UAGY,EAHZ,0CAGY,EAFhB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B,MAC4B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,GAAG,CAAC,CAAE,cAAY,EAAZ,iCAAY,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,eAA2B,EAA1B,UAAY,EAAZ,iCAAY,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAC,+BAA2C,EAA1C,UAAY,EAAZ,iCAAY,MAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,GAAG,CAAC,CAAE,mBAAc,EAAd,mCAAc,EAAI,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,oBAAkC,EAAjC,UAAc,EAAd,mCAAc,MAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,wCAAsD,EAArD,UAAc,EAAd,mCAAc,MAAyC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAE,cAAa,EAAb,kCAAa,EAAE,cAAe,EAAf,oCAAe,EAAE,cAAiB,EAAjB,sCAAiB,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,eAAgE,EAA/D,UAAa,EAAb,kCAAa,EAAE,WAAe,EAAf,sCAAe,EAAE,WAAiB,EAAjB,wCAAiB,MAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,gCAAgF,EAA/E,YAAa,EAAb,oCAAa,EAAE,YAAe,EAAf,sCAAe,EAAE,YAAiB,EAAjB,wCAAiB,OAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CACC,IAAA,oBAAiB,EAAjB,0CAAiB,EACd,oBAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,kDAAyB,EACzB,YAA6B,EAA7B,sDAA6B,EAEpB,GAAC,GAAG,CAAC,EAAE,GAAC,GAAG,CAAC,EAAE,GAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,qBAKc,EALb,YAAiB,EAAjB,wCAAiB,EACnB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,OAEhB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,GAAG,CAAC,CAAC,yCAKkC,EALjC,YAAiB,EAAjB,wCAAiB,EACnB,YAGoB,EAHpB,6CAGoB,EAFhB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B,OAEI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,GAAG,CAAC,CAAE,eAAa,EAAb,oCAAa,EAAE,4BAAa,EAAI,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,gBAA2C,EAA1C,YAAa,EAAb,oCAAa,EAAE,yBAAa,OAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,gCAAkE,EAAjE,YAAa,EAAb,oCAAa,EAAE,yBAAa,OAAuC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.sourcemap.txt
index bab5f369194..aa1a4f7a016 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.sourcemap.txt
@@ -330,7 +330,7 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 2 >^^^^
 3 >    ^
 4 >     ^
-5 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >let 
@@ -341,81 +341,75 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 3 >Emitted(14, 6) Source(22, 14) + SourceIndex(0)
 4 >Emitted(14, 7) Source(22, 15) + SourceIndex(0)
 ---
->>>for ((_a = robotA[1], nameA = _a === void 0 ? "name" : _a, robotA), i = 0; i < 1; i++) {
+>>>for (_a = robotA[1], nameA = _a === void 0 ? "name" : _a, robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^
-7 >                    ^^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                         ^^
-10>                                                           ^^^^^^
-11>                                                                 ^
-12>                                                                  ^^
-13>                                                                    ^
-14>                                                                     ^^^
-15>                                                                        ^
-16>                                                                         ^^
-17>                                                                           ^
-18>                                                                            ^^^
-19>                                                                               ^
-20>                                                                                ^^
-21>                                                                                  ^
-22>                                                                                   ^^
-23>                                                                                     ^^
-24>                                                                                       ^
+5 >     ^^^^^^^^^^^^^^
+6 >                   ^^
+7 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                        ^^
+9 >                                                          ^^^^^^
+10>                                                                ^^
+11>                                                                  ^
+12>                                                                   ^^^
+13>                                                                      ^
+14>                                                                       ^^
+15>                                                                         ^
+16>                                                                          ^^^
+17>                                                                             ^
+18>                                                                              ^^
+19>                                                                                ^
+20>                                                                                 ^^
+21>                                                                                   ^^
+22>                                                                                     ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [, 
-6 >      nameA = "name"
-7 >                    
-8 >                      nameA = "name"
-9 >                                                         ] = 
-10>                                                           robotA
-11>                                                                 
-12>                                                                  , 
-13>                                                                    i
-14>                                                                      = 
-15>                                                                        0
-16>                                                                         ; 
-17>                                                                           i
-18>                                                                             < 
-19>                                                                               1
-20>                                                                                ; 
-21>                                                                                  i
-22>                                                                                   ++
-23>                                                                                     ) 
-24>                                                                                       {
+4 >    ([, 
+5 >     nameA = "name"
+6 >                   
+7 >                     nameA = "name"
+8 >                                                        ] = 
+9 >                                                          robotA
+10>                                                                , 
+11>                                                                  i
+12>                                                                    = 
+13>                                                                      0
+14>                                                                       ; 
+15>                                                                         i
+16>                                                                           < 
+17>                                                                             1
+18>                                                                              ; 
+19>                                                                                i
+20>                                                                                 ++
+21>                                                                                   ) 
+22>                                                                                     {
 1->Emitted(15, 1) Source(24, 1) + SourceIndex(0)
 2 >Emitted(15, 4) Source(24, 4) + SourceIndex(0)
 3 >Emitted(15, 5) Source(24, 5) + SourceIndex(0)
-4 >Emitted(15, 6) Source(24, 6) + SourceIndex(0)
-5 >Emitted(15, 7) Source(24, 9) + SourceIndex(0)
-6 >Emitted(15, 21) Source(24, 23) + SourceIndex(0)
-7 >Emitted(15, 23) Source(24, 9) + SourceIndex(0)
-8 >Emitted(15, 58) Source(24, 23) + SourceIndex(0)
-9 >Emitted(15, 60) Source(24, 27) + SourceIndex(0)
-10>Emitted(15, 66) Source(24, 33) + SourceIndex(0)
-11>Emitted(15, 67) Source(24, 33) + SourceIndex(0)
-12>Emitted(15, 69) Source(24, 35) + SourceIndex(0)
-13>Emitted(15, 70) Source(24, 36) + SourceIndex(0)
-14>Emitted(15, 73) Source(24, 39) + SourceIndex(0)
-15>Emitted(15, 74) Source(24, 40) + SourceIndex(0)
-16>Emitted(15, 76) Source(24, 42) + SourceIndex(0)
-17>Emitted(15, 77) Source(24, 43) + SourceIndex(0)
-18>Emitted(15, 80) Source(24, 46) + SourceIndex(0)
-19>Emitted(15, 81) Source(24, 47) + SourceIndex(0)
-20>Emitted(15, 83) Source(24, 49) + SourceIndex(0)
-21>Emitted(15, 84) Source(24, 50) + SourceIndex(0)
-22>Emitted(15, 86) Source(24, 52) + SourceIndex(0)
-23>Emitted(15, 88) Source(24, 54) + SourceIndex(0)
-24>Emitted(15, 89) Source(24, 55) + SourceIndex(0)
+4 >Emitted(15, 6) Source(24, 9) + SourceIndex(0)
+5 >Emitted(15, 20) Source(24, 23) + SourceIndex(0)
+6 >Emitted(15, 22) Source(24, 9) + SourceIndex(0)
+7 >Emitted(15, 57) Source(24, 23) + SourceIndex(0)
+8 >Emitted(15, 59) Source(24, 27) + SourceIndex(0)
+9 >Emitted(15, 65) Source(24, 33) + SourceIndex(0)
+10>Emitted(15, 67) Source(24, 35) + SourceIndex(0)
+11>Emitted(15, 68) Source(24, 36) + SourceIndex(0)
+12>Emitted(15, 71) Source(24, 39) + SourceIndex(0)
+13>Emitted(15, 72) Source(24, 40) + SourceIndex(0)
+14>Emitted(15, 74) Source(24, 42) + SourceIndex(0)
+15>Emitted(15, 75) Source(24, 43) + SourceIndex(0)
+16>Emitted(15, 78) Source(24, 46) + SourceIndex(0)
+17>Emitted(15, 79) Source(24, 47) + SourceIndex(0)
+18>Emitted(15, 81) Source(24, 49) + SourceIndex(0)
+19>Emitted(15, 82) Source(24, 50) + SourceIndex(0)
+20>Emitted(15, 84) Source(24, 52) + SourceIndex(0)
+21>Emitted(15, 86) Source(24, 54) + SourceIndex(0)
+22>Emitted(15, 87) Source(24, 55) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -447,87 +441,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(17, 1) Source(26, 1) + SourceIndex(0)
 2 >Emitted(17, 2) Source(26, 2) + SourceIndex(0)
 ---
->>>for ((_b = getRobot(), _c = _b[1], nameA = _c === void 0 ? "name" : _c, _b), i = 0; i < 1; i++) {
+>>>for (_b = getRobot(), _c = _b[1], nameA = _c === void 0 ? "name" : _c, _b, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^
-9 >                                 ^^
-10>                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                      ^^^^^
-12>                                                                           ^^
-13>                                                                             ^
-14>                                                                              ^^^
-15>                                                                                 ^
-16>                                                                                  ^^
-17>                                                                                    ^
-18>                                                                                     ^^^
-19>                                                                                        ^
-20>                                                                                         ^^
-21>                                                                                           ^
-22>                                                                                            ^^
-23>                                                                                              ^^
-24>                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^
+8 >                                ^^
+9 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                     ^^^^^^
+11>                                                                           ^
+12>                                                                            ^^^
+13>                                                                               ^
+14>                                                                                ^^
+15>                                                                                  ^
+16>                                                                                   ^^^
+17>                                                                                      ^
+18>                                                                                       ^^
+19>                                                                                         ^
+20>                                                                                          ^^
+21>                                                                                            ^^
+22>                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, nameA = "name"] = getRobot()
-7 >                     
-8 >                       nameA = "name"
-9 >                                 
-10>                                   nameA = "name"
-11>                                                                      ] = getRobot()
-12>                                                                           , 
-13>                                                                             i
-14>                                                                               = 
-15>                                                                                 0
-16>                                                                                  ; 
-17>                                                                                    i
-18>                                                                                      < 
-19>                                                                                        1
-20>                                                                                         ; 
-21>                                                                                           i
-22>                                                                                            ++
-23>                                                                                              ) 
-24>                                                                                                {
+5 >     [, nameA = "name"] = getRobot()
+6 >                    
+7 >                      nameA = "name"
+8 >                                
+9 >                                  nameA = "name"
+10>                                                                     ] = getRobot(), 
+11>                                                                           i
+12>                                                                             = 
+13>                                                                               0
+14>                                                                                ; 
+15>                                                                                  i
+16>                                                                                    < 
+17>                                                                                      1
+18>                                                                                       ; 
+19>                                                                                         i
+20>                                                                                          ++
+21>                                                                                            ) 
+22>                                                                                              {
 1->Emitted(18, 1) Source(27, 1) + SourceIndex(0)
 2 >Emitted(18, 4) Source(27, 4) + SourceIndex(0)
 3 >Emitted(18, 5) Source(27, 5) + SourceIndex(0)
 4 >Emitted(18, 6) Source(27, 6) + SourceIndex(0)
-5 >Emitted(18, 7) Source(27, 6) + SourceIndex(0)
-6 >Emitted(18, 22) Source(27, 37) + SourceIndex(0)
-7 >Emitted(18, 24) Source(27, 9) + SourceIndex(0)
-8 >Emitted(18, 34) Source(27, 23) + SourceIndex(0)
-9 >Emitted(18, 36) Source(27, 9) + SourceIndex(0)
-10>Emitted(18, 71) Source(27, 23) + SourceIndex(0)
-11>Emitted(18, 76) Source(27, 37) + SourceIndex(0)
-12>Emitted(18, 78) Source(27, 39) + SourceIndex(0)
-13>Emitted(18, 79) Source(27, 40) + SourceIndex(0)
-14>Emitted(18, 82) Source(27, 43) + SourceIndex(0)
-15>Emitted(18, 83) Source(27, 44) + SourceIndex(0)
-16>Emitted(18, 85) Source(27, 46) + SourceIndex(0)
-17>Emitted(18, 86) Source(27, 47) + SourceIndex(0)
-18>Emitted(18, 89) Source(27, 50) + SourceIndex(0)
-19>Emitted(18, 90) Source(27, 51) + SourceIndex(0)
-20>Emitted(18, 92) Source(27, 53) + SourceIndex(0)
-21>Emitted(18, 93) Source(27, 54) + SourceIndex(0)
-22>Emitted(18, 95) Source(27, 56) + SourceIndex(0)
-23>Emitted(18, 97) Source(27, 58) + SourceIndex(0)
-24>Emitted(18, 98) Source(27, 59) + SourceIndex(0)
+5 >Emitted(18, 21) Source(27, 37) + SourceIndex(0)
+6 >Emitted(18, 23) Source(27, 9) + SourceIndex(0)
+7 >Emitted(18, 33) Source(27, 23) + SourceIndex(0)
+8 >Emitted(18, 35) Source(27, 9) + SourceIndex(0)
+9 >Emitted(18, 70) Source(27, 23) + SourceIndex(0)
+10>Emitted(18, 76) Source(27, 39) + SourceIndex(0)
+11>Emitted(18, 77) Source(27, 40) + SourceIndex(0)
+12>Emitted(18, 80) Source(27, 43) + SourceIndex(0)
+13>Emitted(18, 81) Source(27, 44) + SourceIndex(0)
+14>Emitted(18, 83) Source(27, 46) + SourceIndex(0)
+15>Emitted(18, 84) Source(27, 47) + SourceIndex(0)
+16>Emitted(18, 87) Source(27, 50) + SourceIndex(0)
+17>Emitted(18, 88) Source(27, 51) + SourceIndex(0)
+18>Emitted(18, 90) Source(27, 53) + SourceIndex(0)
+19>Emitted(18, 91) Source(27, 54) + SourceIndex(0)
+20>Emitted(18, 93) Source(27, 56) + SourceIndex(0)
+21>Emitted(18, 95) Source(27, 58) + SourceIndex(0)
+22>Emitted(18, 96) Source(27, 59) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -559,87 +547,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(20, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(20, 2) Source(29, 2) + SourceIndex(0)
 ---
->>>for ((_d = [2, "trimmer", "trimming"], _e = _d[1], nameA = _e === void 0 ? "name" : _e, _d), i = 0; i < 1; i++) {
+>>>for (_d = [2, "trimmer", "trimming"], _e = _d[1], nameA = _e === void 0 ? "name" : _e, _d, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                     ^^
-8 >                                       ^^^^^^^^^^
-9 >                                                 ^^
-10>                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                      ^^^^^
-12>                                                                                           ^^
-13>                                                                                             ^
-14>                                                                                              ^^^
-15>                                                                                                 ^
-16>                                                                                                  ^^
-17>                                                                                                    ^
-18>                                                                                                     ^^^
-19>                                                                                                        ^
-20>                                                                                                         ^^
-21>                                                                                                           ^
-22>                                                                                                            ^^
-23>                                                                                                              ^^
-24>                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^
+8 >                                                ^^
+9 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                     ^^^^^^
+11>                                                                                           ^
+12>                                                                                            ^^^
+13>                                                                                               ^
+14>                                                                                                ^^
+15>                                                                                                  ^
+16>                                                                                                   ^^^
+17>                                                                                                      ^
+18>                                                                                                       ^^
+19>                                                                                                         ^
+20>                                                                                                          ^^
+21>                                                                                                            ^^
+22>                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, nameA = "name"] = [2, "trimmer", "trimming"]
-7 >                                     
-8 >                                       nameA = "name"
-9 >                                                 
-10>                                                   nameA = "name"
-11>                                                                                      ] = [2, "trimmer", "trimming"]
-12>                                                                                           , 
-13>                                                                                             i
-14>                                                                                               = 
-15>                                                                                                 0
-16>                                                                                                  ; 
-17>                                                                                                    i
-18>                                                                                                      < 
-19>                                                                                                        1
-20>                                                                                                         ; 
-21>                                                                                                           i
-22>                                                                                                            ++
-23>                                                                                                              ) 
-24>                                                                                                                {
+5 >     [, nameA = "name"] = [2, "trimmer", "trimming"]
+6 >                                    
+7 >                                      nameA = "name"
+8 >                                                
+9 >                                                  nameA = "name"
+10>                                                                                     ] = [2, "trimmer", "trimming"], 
+11>                                                                                           i
+12>                                                                                             = 
+13>                                                                                               0
+14>                                                                                                ; 
+15>                                                                                                  i
+16>                                                                                                    < 
+17>                                                                                                      1
+18>                                                                                                       ; 
+19>                                                                                                         i
+20>                                                                                                          ++
+21>                                                                                                            ) 
+22>                                                                                                              {
 1->Emitted(21, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(30, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(30, 5) + SourceIndex(0)
 4 >Emitted(21, 6) Source(30, 6) + SourceIndex(0)
-5 >Emitted(21, 7) Source(30, 6) + SourceIndex(0)
-6 >Emitted(21, 38) Source(30, 53) + SourceIndex(0)
-7 >Emitted(21, 40) Source(30, 9) + SourceIndex(0)
-8 >Emitted(21, 50) Source(30, 23) + SourceIndex(0)
-9 >Emitted(21, 52) Source(30, 9) + SourceIndex(0)
-10>Emitted(21, 87) Source(30, 23) + SourceIndex(0)
-11>Emitted(21, 92) Source(30, 53) + SourceIndex(0)
-12>Emitted(21, 94) Source(30, 55) + SourceIndex(0)
-13>Emitted(21, 95) Source(30, 56) + SourceIndex(0)
-14>Emitted(21, 98) Source(30, 59) + SourceIndex(0)
-15>Emitted(21, 99) Source(30, 60) + SourceIndex(0)
-16>Emitted(21, 101) Source(30, 62) + SourceIndex(0)
-17>Emitted(21, 102) Source(30, 63) + SourceIndex(0)
-18>Emitted(21, 105) Source(30, 66) + SourceIndex(0)
-19>Emitted(21, 106) Source(30, 67) + SourceIndex(0)
-20>Emitted(21, 108) Source(30, 69) + SourceIndex(0)
-21>Emitted(21, 109) Source(30, 70) + SourceIndex(0)
-22>Emitted(21, 111) Source(30, 72) + SourceIndex(0)
-23>Emitted(21, 113) Source(30, 74) + SourceIndex(0)
-24>Emitted(21, 114) Source(30, 75) + SourceIndex(0)
+5 >Emitted(21, 37) Source(30, 53) + SourceIndex(0)
+6 >Emitted(21, 39) Source(30, 9) + SourceIndex(0)
+7 >Emitted(21, 49) Source(30, 23) + SourceIndex(0)
+8 >Emitted(21, 51) Source(30, 9) + SourceIndex(0)
+9 >Emitted(21, 86) Source(30, 23) + SourceIndex(0)
+10>Emitted(21, 92) Source(30, 55) + SourceIndex(0)
+11>Emitted(21, 93) Source(30, 56) + SourceIndex(0)
+12>Emitted(21, 96) Source(30, 59) + SourceIndex(0)
+13>Emitted(21, 97) Source(30, 60) + SourceIndex(0)
+14>Emitted(21, 99) Source(30, 62) + SourceIndex(0)
+15>Emitted(21, 100) Source(30, 63) + SourceIndex(0)
+16>Emitted(21, 103) Source(30, 66) + SourceIndex(0)
+17>Emitted(21, 104) Source(30, 67) + SourceIndex(0)
+18>Emitted(21, 106) Source(30, 69) + SourceIndex(0)
+19>Emitted(21, 107) Source(30, 70) + SourceIndex(0)
+20>Emitted(21, 109) Source(30, 72) + SourceIndex(0)
+21>Emitted(21, 111) Source(30, 74) + SourceIndex(0)
+22>Emitted(21, 112) Source(30, 75) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -671,119 +653,113 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(23, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(23, 2) Source(32, 2) + SourceIndex(0)
 ---
->>>for ((_f = multiRobotA[1], _g = _f === void 0 ? ["none", "none"] : _f, _h = _g[0], primarySkillA = _h === void 0 ? "primary" : _h, _j = _g[1], secondarySkillA = _j === void 0 ? "secondary" : _j, multiRobotA), i = 0; i < 1; i++) {
+>>>for (_f = multiRobotA[1], _g = _f === void 0 ? ["none", "none"] : _f, _h = _g[0], primarySkillA = _h === void 0 ? "primary" : _h, _j = _g[1], secondarySkillA = _j === void 0 ? "secondary" : _j, multiRobotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^
-7 >                         ^^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                     ^^
-10>                                                                       ^^^^^^^^^^
-11>                                                                                 ^^
-12>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                 ^^
-14>                                                                                                                                   ^^^^^^^^^^
-15>                                                                                                                                             ^^
-16>                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                 ^^
-18>                                                                                                                                                                                                   ^^^^^^^^^^^
-19>                                                                                                                                                                                                              ^
-20>                                                                                                                                                                                                               ^^
-21>                                                                                                                                                                                                                 ^
-22>                                                                                                                                                                                                                  ^^^
-23>                                                                                                                                                                                                                     ^
-24>                                                                                                                                                                                                                      ^^
-25>                                                                                                                                                                                                                        ^
-26>                                                                                                                                                                                                                         ^^^
-27>                                                                                                                                                                                                                            ^
-28>                                                                                                                                                                                                                             ^^
-29>                                                                                                                                                                                                                               ^
-30>                                                                                                                                                                                                                                ^^
-31>                                                                                                                                                                                                                                  ^^
-32>                                                                                                                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^^^
+6 >                        ^^
+7 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                    ^^
+9 >                                                                      ^^^^^^^^^^
+10>                                                                                ^^
+11>                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                ^^
+13>                                                                                                                                  ^^^^^^^^^^
+14>                                                                                                                                            ^^
+15>                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                ^^
+17>                                                                                                                                                                                                  ^^^^^^^^^^^
+18>                                                                                                                                                                                                             ^^
+19>                                                                                                                                                                                                               ^
+20>                                                                                                                                                                                                                ^^^
+21>                                                                                                                                                                                                                   ^
+22>                                                                                                                                                                                                                    ^^
+23>                                                                                                                                                                                                                      ^
+24>                                                                                                                                                                                                                       ^^^
+25>                                                                                                                                                                                                                          ^
+26>                                                                                                                                                                                                                           ^^
+27>                                                                                                                                                                                                                             ^
+28>                                                                                                                                                                                                                              ^^
+29>                                                                                                                                                                                                                                ^^
+30>                                                                                                                                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     [, 
-6 >      [
-  >          primarySkillA = "primary",
-  >          secondarySkillA = "secondary"
-  >      ] = ["none", "none"]
-7 >                         
-8 >                           [
-  >                               primarySkillA = "primary",
-  >                               secondarySkillA = "secondary"
-  >                           ] = ["none", "none"]
-9 >                                                                     
-10>                                                                       primarySkillA = "primary"
-11>                                                                                 
-12>                                                                                   primarySkillA = "primary"
-13>                                                                                                                                 ,
-  >                                                                                                                                     
-14>                                                                                                                                   secondarySkillA = "secondary"
-15>                                                                                                                                             
-16>                                                                                                                                               secondarySkillA = "secondary"
-17>                                                                                                                                                                                                 
-  >                                                                                                                                                                                                 ] = ["none", "none"]] = 
-18>                                                                                                                                                                                                   multiRobotA
-19>                                                                                                                                                                                                              
-20>                                                                                                                                                                                                               , 
-21>                                                                                                                                                                                                                 i
-22>                                                                                                                                                                                                                   = 
-23>                                                                                                                                                                                                                     0
-24>                                                                                                                                                                                                                      ; 
-25>                                                                                                                                                                                                                        i
-26>                                                                                                                                                                                                                          < 
-27>                                                                                                                                                                                                                            1
-28>                                                                                                                                                                                                                             ; 
-29>                                                                                                                                                                                                                               i
-30>                                                                                                                                                                                                                                ++
-31>                                                                                                                                                                                                                                  ) 
-32>                                                                                                                                                                                                                                    {
+4 >    ([, 
+5 >     [
+  >         primarySkillA = "primary",
+  >         secondarySkillA = "secondary"
+  >     ] = ["none", "none"]
+6 >                        
+7 >                          [
+  >                              primarySkillA = "primary",
+  >                              secondarySkillA = "secondary"
+  >                          ] = ["none", "none"]
+8 >                                                                    
+9 >                                                                      primarySkillA = "primary"
+10>                                                                                
+11>                                                                                  primarySkillA = "primary"
+12>                                                                                                                                ,
+  >                                                                                                                                    
+13>                                                                                                                                  secondarySkillA = "secondary"
+14>                                                                                                                                            
+15>                                                                                                                                              secondarySkillA = "secondary"
+16>                                                                                                                                                                                                
+  >                                                                                                                                                                                                ] = ["none", "none"]] = 
+17>                                                                                                                                                                                                  multiRobotA
+18>                                                                                                                                                                                                             , 
+19>                                                                                                                                                                                                               i
+20>                                                                                                                                                                                                                 = 
+21>                                                                                                                                                                                                                   0
+22>                                                                                                                                                                                                                    ; 
+23>                                                                                                                                                                                                                      i
+24>                                                                                                                                                                                                                        < 
+25>                                                                                                                                                                                                                          1
+26>                                                                                                                                                                                                                           ; 
+27>                                                                                                                                                                                                                             i
+28>                                                                                                                                                                                                                              ++
+29>                                                                                                                                                                                                                                ) 
+30>                                                                                                                                                                                                                                  {
 1->Emitted(24, 1) Source(33, 1) + SourceIndex(0)
 2 >Emitted(24, 4) Source(33, 4) + SourceIndex(0)
 3 >Emitted(24, 5) Source(33, 5) + SourceIndex(0)
-4 >Emitted(24, 6) Source(33, 6) + SourceIndex(0)
-5 >Emitted(24, 7) Source(33, 9) + SourceIndex(0)
-6 >Emitted(24, 26) Source(36, 21) + SourceIndex(0)
-7 >Emitted(24, 28) Source(33, 9) + SourceIndex(0)
-8 >Emitted(24, 70) Source(36, 21) + SourceIndex(0)
-9 >Emitted(24, 72) Source(34, 5) + SourceIndex(0)
-10>Emitted(24, 82) Source(34, 30) + SourceIndex(0)
-11>Emitted(24, 84) Source(34, 5) + SourceIndex(0)
-12>Emitted(24, 130) Source(34, 30) + SourceIndex(0)
-13>Emitted(24, 132) Source(35, 5) + SourceIndex(0)
-14>Emitted(24, 142) Source(35, 34) + SourceIndex(0)
-15>Emitted(24, 144) Source(35, 5) + SourceIndex(0)
-16>Emitted(24, 194) Source(35, 34) + SourceIndex(0)
-17>Emitted(24, 196) Source(36, 25) + SourceIndex(0)
-18>Emitted(24, 207) Source(36, 36) + SourceIndex(0)
-19>Emitted(24, 208) Source(36, 36) + SourceIndex(0)
-20>Emitted(24, 210) Source(36, 38) + SourceIndex(0)
-21>Emitted(24, 211) Source(36, 39) + SourceIndex(0)
-22>Emitted(24, 214) Source(36, 42) + SourceIndex(0)
-23>Emitted(24, 215) Source(36, 43) + SourceIndex(0)
-24>Emitted(24, 217) Source(36, 45) + SourceIndex(0)
-25>Emitted(24, 218) Source(36, 46) + SourceIndex(0)
-26>Emitted(24, 221) Source(36, 49) + SourceIndex(0)
-27>Emitted(24, 222) Source(36, 50) + SourceIndex(0)
-28>Emitted(24, 224) Source(36, 52) + SourceIndex(0)
-29>Emitted(24, 225) Source(36, 53) + SourceIndex(0)
-30>Emitted(24, 227) Source(36, 55) + SourceIndex(0)
-31>Emitted(24, 229) Source(36, 57) + SourceIndex(0)
-32>Emitted(24, 230) Source(36, 58) + SourceIndex(0)
+4 >Emitted(24, 6) Source(33, 9) + SourceIndex(0)
+5 >Emitted(24, 25) Source(36, 21) + SourceIndex(0)
+6 >Emitted(24, 27) Source(33, 9) + SourceIndex(0)
+7 >Emitted(24, 69) Source(36, 21) + SourceIndex(0)
+8 >Emitted(24, 71) Source(34, 5) + SourceIndex(0)
+9 >Emitted(24, 81) Source(34, 30) + SourceIndex(0)
+10>Emitted(24, 83) Source(34, 5) + SourceIndex(0)
+11>Emitted(24, 129) Source(34, 30) + SourceIndex(0)
+12>Emitted(24, 131) Source(35, 5) + SourceIndex(0)
+13>Emitted(24, 141) Source(35, 34) + SourceIndex(0)
+14>Emitted(24, 143) Source(35, 5) + SourceIndex(0)
+15>Emitted(24, 193) Source(35, 34) + SourceIndex(0)
+16>Emitted(24, 195) Source(36, 25) + SourceIndex(0)
+17>Emitted(24, 206) Source(36, 36) + SourceIndex(0)
+18>Emitted(24, 208) Source(36, 38) + SourceIndex(0)
+19>Emitted(24, 209) Source(36, 39) + SourceIndex(0)
+20>Emitted(24, 212) Source(36, 42) + SourceIndex(0)
+21>Emitted(24, 213) Source(36, 43) + SourceIndex(0)
+22>Emitted(24, 215) Source(36, 45) + SourceIndex(0)
+23>Emitted(24, 216) Source(36, 46) + SourceIndex(0)
+24>Emitted(24, 219) Source(36, 49) + SourceIndex(0)
+25>Emitted(24, 220) Source(36, 50) + SourceIndex(0)
+26>Emitted(24, 222) Source(36, 52) + SourceIndex(0)
+27>Emitted(24, 223) Source(36, 53) + SourceIndex(0)
+28>Emitted(24, 225) Source(36, 55) + SourceIndex(0)
+29>Emitted(24, 227) Source(36, 57) + SourceIndex(0)
+30>Emitted(24, 228) Source(36, 58) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -815,122 +791,116 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(26, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(26, 2) Source(38, 2) + SourceIndex(0)
 ---
->>>for ((_k = getMultiRobot(), _l = _k[1], _m = _l === void 0 ? ["none", "none"] : _l, _o = _m[0], primarySkillA = _o === void 0 ? "primary" : _o, _p = _m[1], secondarySkillA = _p === void 0 ? "secondary" : _p, _k), i = 0; i < 1; i++) {
+>>>for (_k = getMultiRobot(), _l = _k[1], _m = _l === void 0 ? ["none", "none"] : _l, _o = _m[0], primarySkillA = _o === void 0 ? "primary" : _o, _p = _m[1], secondarySkillA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^
-9 >                                      ^^
-10>                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                  ^^
-12>                                                                                    ^^^^^^^^^^
-13>                                                                                              ^^
-14>                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                              ^^
-16>                                                                                                                                                ^^^^^^^^^^
-17>                                                                                                                                                          ^^
-18>                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                              ^^^^^
-20>                                                                                                                                                                                                                   ^^
-21>                                                                                                                                                                                                                     ^
-22>                                                                                                                                                                                                                      ^^^
-23>                                                                                                                                                                                                                         ^
-24>                                                                                                                                                                                                                          ^^
-25>                                                                                                                                                                                                                            ^
-26>                                                                                                                                                                                                                             ^^^
-27>                                                                                                                                                                                                                                ^
-28>                                                                                                                                                                                                                                 ^^
-29>                                                                                                                                                                                                                                   ^
-30>                                                                                                                                                                                                                                    ^^
-31>                                                                                                                                                                                                                                      ^^
-32>                                                                                                                                                                                                                                        ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^
+8 >                                     ^^
+9 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                 ^^
+11>                                                                                   ^^^^^^^^^^
+12>                                                                                             ^^
+13>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                             ^^
+15>                                                                                                                                               ^^^^^^^^^^
+16>                                                                                                                                                         ^^
+17>                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                             ^^^^^^
+19>                                                                                                                                                                                                                   ^
+20>                                                                                                                                                                                                                    ^^^
+21>                                                                                                                                                                                                                       ^
+22>                                                                                                                                                                                                                        ^^
+23>                                                                                                                                                                                                                          ^
+24>                                                                                                                                                                                                                           ^^^
+25>                                                                                                                                                                                                                              ^
+26>                                                                                                                                                                                                                               ^^
+27>                                                                                                                                                                                                                                 ^
+28>                                                                                                                                                                                                                                  ^^
+29>                                                                                                                                                                                                                                    ^^
+30>                                                                                                                                                                                                                                      ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, [
-  >          primarySkillA = "primary",
-  >          secondarySkillA = "secondary"
-  >      ] = ["none", "none"]] = getMultiRobot()
-7 >                          
-8 >                            [
-  >                                primarySkillA = "primary",
-  >                                secondarySkillA = "secondary"
-  >                            ] = ["none", "none"]
-9 >                                      
-10>                                        [
-  >                                            primarySkillA = "primary",
-  >                                            secondarySkillA = "secondary"
-  >                                        ] = ["none", "none"]
-11>                                                                                  
-12>                                                                                    primarySkillA = "primary"
-13>                                                                                              
-14>                                                                                                primarySkillA = "primary"
-15>                                                                                                                                              ,
-  >                                                                                                                                                  
-16>                                                                                                                                                secondarySkillA = "secondary"
-17>                                                                                                                                                          
-18>                                                                                                                                                            secondarySkillA = "secondary"
-19>                                                                                                                                                                                                              
-  >                                                                                                                                                                                                              ] = ["none", "none"]] = getMultiRobot()
-20>                                                                                                                                                                                                                   , 
-21>                                                                                                                                                                                                                     i
-22>                                                                                                                                                                                                                       = 
-23>                                                                                                                                                                                                                         0
-24>                                                                                                                                                                                                                          ; 
-25>                                                                                                                                                                                                                            i
-26>                                                                                                                                                                                                                              < 
-27>                                                                                                                                                                                                                                1
-28>                                                                                                                                                                                                                                 ; 
-29>                                                                                                                                                                                                                                   i
-30>                                                                                                                                                                                                                                    ++
-31>                                                                                                                                                                                                                                      ) 
-32>                                                                                                                                                                                                                                        {
+5 >     [, [
+  >         primarySkillA = "primary",
+  >         secondarySkillA = "secondary"
+  >     ] = ["none", "none"]] = getMultiRobot()
+6 >                         
+7 >                           [
+  >                               primarySkillA = "primary",
+  >                               secondarySkillA = "secondary"
+  >                           ] = ["none", "none"]
+8 >                                     
+9 >                                       [
+  >                                           primarySkillA = "primary",
+  >                                           secondarySkillA = "secondary"
+  >                                       ] = ["none", "none"]
+10>                                                                                 
+11>                                                                                   primarySkillA = "primary"
+12>                                                                                             
+13>                                                                                               primarySkillA = "primary"
+14>                                                                                                                                             ,
+  >                                                                                                                                                 
+15>                                                                                                                                               secondarySkillA = "secondary"
+16>                                                                                                                                                         
+17>                                                                                                                                                           secondarySkillA = "secondary"
+18>                                                                                                                                                                                                             
+  >                                                                                                                                                                                                             ] = ["none", "none"]] = getMultiRobot(), 
+19>                                                                                                                                                                                                                   i
+20>                                                                                                                                                                                                                     = 
+21>                                                                                                                                                                                                                       0
+22>                                                                                                                                                                                                                        ; 
+23>                                                                                                                                                                                                                          i
+24>                                                                                                                                                                                                                            < 
+25>                                                                                                                                                                                                                              1
+26>                                                                                                                                                                                                                               ; 
+27>                                                                                                                                                                                                                                 i
+28>                                                                                                                                                                                                                                  ++
+29>                                                                                                                                                                                                                                    ) 
+30>                                                                                                                                                                                                                                      {
 1->Emitted(27, 1) Source(39, 1) + SourceIndex(0)
 2 >Emitted(27, 4) Source(39, 4) + SourceIndex(0)
 3 >Emitted(27, 5) Source(39, 5) + SourceIndex(0)
 4 >Emitted(27, 6) Source(39, 6) + SourceIndex(0)
-5 >Emitted(27, 7) Source(39, 6) + SourceIndex(0)
-6 >Emitted(27, 27) Source(42, 40) + SourceIndex(0)
-7 >Emitted(27, 29) Source(39, 9) + SourceIndex(0)
-8 >Emitted(27, 39) Source(42, 21) + SourceIndex(0)
-9 >Emitted(27, 41) Source(39, 9) + SourceIndex(0)
-10>Emitted(27, 83) Source(42, 21) + SourceIndex(0)
-11>Emitted(27, 85) Source(40, 5) + SourceIndex(0)
-12>Emitted(27, 95) Source(40, 30) + SourceIndex(0)
-13>Emitted(27, 97) Source(40, 5) + SourceIndex(0)
-14>Emitted(27, 143) Source(40, 30) + SourceIndex(0)
-15>Emitted(27, 145) Source(41, 5) + SourceIndex(0)
-16>Emitted(27, 155) Source(41, 34) + SourceIndex(0)
-17>Emitted(27, 157) Source(41, 5) + SourceIndex(0)
-18>Emitted(27, 207) Source(41, 34) + SourceIndex(0)
-19>Emitted(27, 212) Source(42, 40) + SourceIndex(0)
-20>Emitted(27, 214) Source(42, 42) + SourceIndex(0)
-21>Emitted(27, 215) Source(42, 43) + SourceIndex(0)
-22>Emitted(27, 218) Source(42, 46) + SourceIndex(0)
-23>Emitted(27, 219) Source(42, 47) + SourceIndex(0)
-24>Emitted(27, 221) Source(42, 49) + SourceIndex(0)
-25>Emitted(27, 222) Source(42, 50) + SourceIndex(0)
-26>Emitted(27, 225) Source(42, 53) + SourceIndex(0)
-27>Emitted(27, 226) Source(42, 54) + SourceIndex(0)
-28>Emitted(27, 228) Source(42, 56) + SourceIndex(0)
-29>Emitted(27, 229) Source(42, 57) + SourceIndex(0)
-30>Emitted(27, 231) Source(42, 59) + SourceIndex(0)
-31>Emitted(27, 233) Source(42, 61) + SourceIndex(0)
-32>Emitted(27, 234) Source(42, 62) + SourceIndex(0)
+5 >Emitted(27, 26) Source(42, 40) + SourceIndex(0)
+6 >Emitted(27, 28) Source(39, 9) + SourceIndex(0)
+7 >Emitted(27, 38) Source(42, 21) + SourceIndex(0)
+8 >Emitted(27, 40) Source(39, 9) + SourceIndex(0)
+9 >Emitted(27, 82) Source(42, 21) + SourceIndex(0)
+10>Emitted(27, 84) Source(40, 5) + SourceIndex(0)
+11>Emitted(27, 94) Source(40, 30) + SourceIndex(0)
+12>Emitted(27, 96) Source(40, 5) + SourceIndex(0)
+13>Emitted(27, 142) Source(40, 30) + SourceIndex(0)
+14>Emitted(27, 144) Source(41, 5) + SourceIndex(0)
+15>Emitted(27, 154) Source(41, 34) + SourceIndex(0)
+16>Emitted(27, 156) Source(41, 5) + SourceIndex(0)
+17>Emitted(27, 206) Source(41, 34) + SourceIndex(0)
+18>Emitted(27, 212) Source(42, 42) + SourceIndex(0)
+19>Emitted(27, 213) Source(42, 43) + SourceIndex(0)
+20>Emitted(27, 216) Source(42, 46) + SourceIndex(0)
+21>Emitted(27, 217) Source(42, 47) + SourceIndex(0)
+22>Emitted(27, 219) Source(42, 49) + SourceIndex(0)
+23>Emitted(27, 220) Source(42, 50) + SourceIndex(0)
+24>Emitted(27, 223) Source(42, 53) + SourceIndex(0)
+25>Emitted(27, 224) Source(42, 54) + SourceIndex(0)
+26>Emitted(27, 226) Source(42, 56) + SourceIndex(0)
+27>Emitted(27, 227) Source(42, 57) + SourceIndex(0)
+28>Emitted(27, 229) Source(42, 59) + SourceIndex(0)
+29>Emitted(27, 231) Source(42, 61) + SourceIndex(0)
+30>Emitted(27, 232) Source(42, 62) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -962,122 +932,116 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(29, 1) Source(44, 1) + SourceIndex(0)
 2 >Emitted(29, 2) Source(44, 2) + SourceIndex(0)
 ---
->>>for ((_q = ["trimmer", ["trimming", "edging"]], _r = _q[1], _s = _r === void 0 ? ["none", "none"] : _r, _t = _s[0], primarySkillA = _t === void 0 ? "primary" : _t, _u = _s[1], secondarySkillA = _u === void 0 ? "secondary" : _u, _q), i = 0; i < 1; i++) {
+>>>for (_q = ["trimmer", ["trimming", "edging"]], _r = _q[1], _s = _r === void 0 ? ["none", "none"] : _r, _t = _s[0], primarySkillA = _t === void 0 ? "primary" : _t, _u = _s[1], secondarySkillA = _u === void 0 ? "secondary" : _u, _q, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                              ^^
-8 >                                                ^^^^^^^^^^
-9 >                                                          ^^
-10>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                      ^^
-12>                                                                                                        ^^^^^^^^^^
-13>                                                                                                                  ^^
-14>                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                  ^^
-16>                                                                                                                                                                    ^^^^^^^^^^
-17>                                                                                                                                                                              ^^
-18>                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                  ^^^^^
-20>                                                                                                                                                                                                                                       ^^
-21>                                                                                                                                                                                                                                         ^
-22>                                                                                                                                                                                                                                          ^^^
-23>                                                                                                                                                                                                                                             ^
-24>                                                                                                                                                                                                                                              ^^
-25>                                                                                                                                                                                                                                                ^
-26>                                                                                                                                                                                                                                                 ^^^
-27>                                                                                                                                                                                                                                                    ^
-28>                                                                                                                                                                                                                                                     ^^
-29>                                                                                                                                                                                                                                                       ^
-30>                                                                                                                                                                                                                                                        ^^
-31>                                                                                                                                                                                                                                                          ^^
-32>                                                                                                                                                                                                                                                            ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^
+8 >                                                         ^^
+9 >                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                     ^^
+11>                                                                                                       ^^^^^^^^^^
+12>                                                                                                                 ^^
+13>                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                 ^^
+15>                                                                                                                                                                   ^^^^^^^^^^
+16>                                                                                                                                                                             ^^
+17>                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                 ^^^^^^
+19>                                                                                                                                                                                                                                       ^
+20>                                                                                                                                                                                                                                        ^^^
+21>                                                                                                                                                                                                                                           ^
+22>                                                                                                                                                                                                                                            ^^
+23>                                                                                                                                                                                                                                              ^
+24>                                                                                                                                                                                                                                               ^^^
+25>                                                                                                                                                                                                                                                  ^
+26>                                                                                                                                                                                                                                                   ^^
+27>                                                                                                                                                                                                                                                     ^
+28>                                                                                                                                                                                                                                                      ^^
+29>                                                                                                                                                                                                                                                        ^^
+30>                                                                                                                                                                                                                                                          ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [, [
-  >          primarySkillA = "primary",
-  >          secondarySkillA = "secondary"
-  >      ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]]
-7 >                                              
-8 >                                                [
-  >                                                    primarySkillA = "primary",
-  >                                                    secondarySkillA = "secondary"
-  >                                                ] = ["none", "none"]
-9 >                                                          
-10>                                                            [
-  >                                                                primarySkillA = "primary",
-  >                                                                secondarySkillA = "secondary"
-  >                                                            ] = ["none", "none"]
-11>                                                                                                      
-12>                                                                                                        primarySkillA = "primary"
-13>                                                                                                                  
-14>                                                                                                                    primarySkillA = "primary"
-15>                                                                                                                                                                  ,
-  >                                                                                                                                                                      
-16>                                                                                                                                                                    secondarySkillA = "secondary"
-17>                                                                                                                                                                              
-18>                                                                                                                                                                                secondarySkillA = "secondary"
-19>                                                                                                                                                                                                                                  
-  >                                                                                                                                                                                                                                  ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]]
-20>                                                                                                                                                                                                                                       , 
-21>                                                                                                                                                                                                                                         i
-22>                                                                                                                                                                                                                                           = 
-23>                                                                                                                                                                                                                                             0
-24>                                                                                                                                                                                                                                              ; 
-25>                                                                                                                                                                                                                                                i
-26>                                                                                                                                                                                                                                                  < 
-27>                                                                                                                                                                                                                                                    1
-28>                                                                                                                                                                                                                                                     ; 
-29>                                                                                                                                                                                                                                                       i
-30>                                                                                                                                                                                                                                                        ++
-31>                                                                                                                                                                                                                                                          ) 
-32>                                                                                                                                                                                                                                                            {
+5 >     [, [
+  >         primarySkillA = "primary",
+  >         secondarySkillA = "secondary"
+  >     ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]]
+6 >                                             
+7 >                                               [
+  >                                                   primarySkillA = "primary",
+  >                                                   secondarySkillA = "secondary"
+  >                                               ] = ["none", "none"]
+8 >                                                         
+9 >                                                           [
+  >                                                               primarySkillA = "primary",
+  >                                                               secondarySkillA = "secondary"
+  >                                                           ] = ["none", "none"]
+10>                                                                                                     
+11>                                                                                                       primarySkillA = "primary"
+12>                                                                                                                 
+13>                                                                                                                   primarySkillA = "primary"
+14>                                                                                                                                                                 ,
+  >                                                                                                                                                                     
+15>                                                                                                                                                                   secondarySkillA = "secondary"
+16>                                                                                                                                                                             
+17>                                                                                                                                                                               secondarySkillA = "secondary"
+18>                                                                                                                                                                                                                                 
+  >                                                                                                                                                                                                                                 ] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], 
+19>                                                                                                                                                                                                                                       i
+20>                                                                                                                                                                                                                                         = 
+21>                                                                                                                                                                                                                                           0
+22>                                                                                                                                                                                                                                            ; 
+23>                                                                                                                                                                                                                                              i
+24>                                                                                                                                                                                                                                                < 
+25>                                                                                                                                                                                                                                                  1
+26>                                                                                                                                                                                                                                                   ; 
+27>                                                                                                                                                                                                                                                     i
+28>                                                                                                                                                                                                                                                      ++
+29>                                                                                                                                                                                                                                                        ) 
+30>                                                                                                                                                                                                                                                          {
 1->Emitted(30, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(30, 4) Source(45, 4) + SourceIndex(0)
 3 >Emitted(30, 5) Source(45, 5) + SourceIndex(0)
 4 >Emitted(30, 6) Source(45, 6) + SourceIndex(0)
-5 >Emitted(30, 7) Source(45, 6) + SourceIndex(0)
-6 >Emitted(30, 47) Source(48, 60) + SourceIndex(0)
-7 >Emitted(30, 49) Source(45, 9) + SourceIndex(0)
-8 >Emitted(30, 59) Source(48, 21) + SourceIndex(0)
-9 >Emitted(30, 61) Source(45, 9) + SourceIndex(0)
-10>Emitted(30, 103) Source(48, 21) + SourceIndex(0)
-11>Emitted(30, 105) Source(46, 5) + SourceIndex(0)
-12>Emitted(30, 115) Source(46, 30) + SourceIndex(0)
-13>Emitted(30, 117) Source(46, 5) + SourceIndex(0)
-14>Emitted(30, 163) Source(46, 30) + SourceIndex(0)
-15>Emitted(30, 165) Source(47, 5) + SourceIndex(0)
-16>Emitted(30, 175) Source(47, 34) + SourceIndex(0)
-17>Emitted(30, 177) Source(47, 5) + SourceIndex(0)
-18>Emitted(30, 227) Source(47, 34) + SourceIndex(0)
-19>Emitted(30, 232) Source(48, 60) + SourceIndex(0)
-20>Emitted(30, 234) Source(48, 62) + SourceIndex(0)
-21>Emitted(30, 235) Source(48, 63) + SourceIndex(0)
-22>Emitted(30, 238) Source(48, 66) + SourceIndex(0)
-23>Emitted(30, 239) Source(48, 67) + SourceIndex(0)
-24>Emitted(30, 241) Source(48, 69) + SourceIndex(0)
-25>Emitted(30, 242) Source(48, 70) + SourceIndex(0)
-26>Emitted(30, 245) Source(48, 73) + SourceIndex(0)
-27>Emitted(30, 246) Source(48, 74) + SourceIndex(0)
-28>Emitted(30, 248) Source(48, 76) + SourceIndex(0)
-29>Emitted(30, 249) Source(48, 77) + SourceIndex(0)
-30>Emitted(30, 251) Source(48, 79) + SourceIndex(0)
-31>Emitted(30, 253) Source(48, 81) + SourceIndex(0)
-32>Emitted(30, 254) Source(48, 82) + SourceIndex(0)
+5 >Emitted(30, 46) Source(48, 60) + SourceIndex(0)
+6 >Emitted(30, 48) Source(45, 9) + SourceIndex(0)
+7 >Emitted(30, 58) Source(48, 21) + SourceIndex(0)
+8 >Emitted(30, 60) Source(45, 9) + SourceIndex(0)
+9 >Emitted(30, 102) Source(48, 21) + SourceIndex(0)
+10>Emitted(30, 104) Source(46, 5) + SourceIndex(0)
+11>Emitted(30, 114) Source(46, 30) + SourceIndex(0)
+12>Emitted(30, 116) Source(46, 5) + SourceIndex(0)
+13>Emitted(30, 162) Source(46, 30) + SourceIndex(0)
+14>Emitted(30, 164) Source(47, 5) + SourceIndex(0)
+15>Emitted(30, 174) Source(47, 34) + SourceIndex(0)
+16>Emitted(30, 176) Source(47, 5) + SourceIndex(0)
+17>Emitted(30, 226) Source(47, 34) + SourceIndex(0)
+18>Emitted(30, 232) Source(48, 62) + SourceIndex(0)
+19>Emitted(30, 233) Source(48, 63) + SourceIndex(0)
+20>Emitted(30, 236) Source(48, 66) + SourceIndex(0)
+21>Emitted(30, 237) Source(48, 67) + SourceIndex(0)
+22>Emitted(30, 239) Source(48, 69) + SourceIndex(0)
+23>Emitted(30, 240) Source(48, 70) + SourceIndex(0)
+24>Emitted(30, 243) Source(48, 73) + SourceIndex(0)
+25>Emitted(30, 244) Source(48, 74) + SourceIndex(0)
+26>Emitted(30, 246) Source(48, 76) + SourceIndex(0)
+27>Emitted(30, 247) Source(48, 77) + SourceIndex(0)
+28>Emitted(30, 249) Source(48, 79) + SourceIndex(0)
+29>Emitted(30, 251) Source(48, 81) + SourceIndex(0)
+30>Emitted(30, 252) Source(48, 82) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -1109,88 +1073,82 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(32, 1) Source(50, 1) + SourceIndex(0)
 2 >Emitted(32, 2) Source(50, 2) + SourceIndex(0)
 ---
->>>for ((_v = robotA[0], numberB = _v === void 0 ? -1 : _v, robotA), i = 0; i < 1; i++) {
+>>>for (_v = robotA[0], numberB = _v === void 0 ? -1 : _v, robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^
-7 >                    ^^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                       ^^
-10>                                                         ^^^^^^
-11>                                                               ^
-12>                                                                ^^
-13>                                                                  ^
-14>                                                                   ^^^
-15>                                                                      ^
-16>                                                                       ^^
-17>                                                                         ^
-18>                                                                          ^^^
-19>                                                                             ^
-20>                                                                              ^^
-21>                                                                                ^
-22>                                                                                 ^^
-23>                                                                                   ^^
-24>                                                                                     ^
+5 >     ^^^^^^^^^^^^^^
+6 >                   ^^
+7 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                      ^^
+9 >                                                        ^^^^^^
+10>                                                              ^^
+11>                                                                ^
+12>                                                                 ^^^
+13>                                                                    ^
+14>                                                                     ^^
+15>                                                                       ^
+16>                                                                        ^^^
+17>                                                                           ^
+18>                                                                            ^^
+19>                                                                              ^
+20>                                                                               ^^
+21>                                                                                 ^^
+22>                                                                                   ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      numberB = -1
-7 >                    
-8 >                      numberB = -1
-9 >                                                       ] = 
-10>                                                         robotA
-11>                                                               
-12>                                                                , 
-13>                                                                  i
-14>                                                                    = 
-15>                                                                      0
-16>                                                                       ; 
-17>                                                                         i
-18>                                                                           < 
-19>                                                                             1
-20>                                                                              ; 
-21>                                                                                i
-22>                                                                                 ++
-23>                                                                                   ) 
-24>                                                                                     {
+4 >    ([
+5 >     numberB = -1
+6 >                   
+7 >                     numberB = -1
+8 >                                                      ] = 
+9 >                                                        robotA
+10>                                                              , 
+11>                                                                i
+12>                                                                  = 
+13>                                                                    0
+14>                                                                     ; 
+15>                                                                       i
+16>                                                                         < 
+17>                                                                           1
+18>                                                                            ; 
+19>                                                                              i
+20>                                                                               ++
+21>                                                                                 ) 
+22>                                                                                   {
 1->Emitted(33, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(52, 5) + SourceIndex(0)
-4 >Emitted(33, 6) Source(52, 6) + SourceIndex(0)
-5 >Emitted(33, 7) Source(52, 7) + SourceIndex(0)
-6 >Emitted(33, 21) Source(52, 19) + SourceIndex(0)
-7 >Emitted(33, 23) Source(52, 7) + SourceIndex(0)
-8 >Emitted(33, 56) Source(52, 19) + SourceIndex(0)
-9 >Emitted(33, 58) Source(52, 23) + SourceIndex(0)
-10>Emitted(33, 64) Source(52, 29) + SourceIndex(0)
-11>Emitted(33, 65) Source(52, 29) + SourceIndex(0)
-12>Emitted(33, 67) Source(52, 31) + SourceIndex(0)
-13>Emitted(33, 68) Source(52, 32) + SourceIndex(0)
-14>Emitted(33, 71) Source(52, 35) + SourceIndex(0)
-15>Emitted(33, 72) Source(52, 36) + SourceIndex(0)
-16>Emitted(33, 74) Source(52, 38) + SourceIndex(0)
-17>Emitted(33, 75) Source(52, 39) + SourceIndex(0)
-18>Emitted(33, 78) Source(52, 42) + SourceIndex(0)
-19>Emitted(33, 79) Source(52, 43) + SourceIndex(0)
-20>Emitted(33, 81) Source(52, 45) + SourceIndex(0)
-21>Emitted(33, 82) Source(52, 46) + SourceIndex(0)
-22>Emitted(33, 84) Source(52, 48) + SourceIndex(0)
-23>Emitted(33, 86) Source(52, 50) + SourceIndex(0)
-24>Emitted(33, 87) Source(52, 51) + SourceIndex(0)
+4 >Emitted(33, 6) Source(52, 7) + SourceIndex(0)
+5 >Emitted(33, 20) Source(52, 19) + SourceIndex(0)
+6 >Emitted(33, 22) Source(52, 7) + SourceIndex(0)
+7 >Emitted(33, 55) Source(52, 19) + SourceIndex(0)
+8 >Emitted(33, 57) Source(52, 23) + SourceIndex(0)
+9 >Emitted(33, 63) Source(52, 29) + SourceIndex(0)
+10>Emitted(33, 65) Source(52, 31) + SourceIndex(0)
+11>Emitted(33, 66) Source(52, 32) + SourceIndex(0)
+12>Emitted(33, 69) Source(52, 35) + SourceIndex(0)
+13>Emitted(33, 70) Source(52, 36) + SourceIndex(0)
+14>Emitted(33, 72) Source(52, 38) + SourceIndex(0)
+15>Emitted(33, 73) Source(52, 39) + SourceIndex(0)
+16>Emitted(33, 76) Source(52, 42) + SourceIndex(0)
+17>Emitted(33, 77) Source(52, 43) + SourceIndex(0)
+18>Emitted(33, 79) Source(52, 45) + SourceIndex(0)
+19>Emitted(33, 80) Source(52, 46) + SourceIndex(0)
+20>Emitted(33, 82) Source(52, 48) + SourceIndex(0)
+21>Emitted(33, 84) Source(52, 50) + SourceIndex(0)
+22>Emitted(33, 85) Source(52, 51) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1222,87 +1180,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(35, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(35, 2) Source(54, 2) + SourceIndex(0)
 ---
->>>for ((_w = getRobot(), _x = _w[0], numberB = _x === void 0 ? -1 : _x, _w), i = 0; i < 1; i++) {
+>>>for (_w = getRobot(), _x = _w[0], numberB = _x === void 0 ? -1 : _x, _w, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^
-9 >                                 ^^
-10>                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                    ^^^^^
-12>                                                                         ^^
-13>                                                                           ^
-14>                                                                            ^^^
-15>                                                                               ^
-16>                                                                                ^^
-17>                                                                                  ^
-18>                                                                                   ^^^
-19>                                                                                      ^
-20>                                                                                       ^^
-21>                                                                                         ^
-22>                                                                                          ^^
-23>                                                                                            ^^
-24>                                                                                              ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^
+8 >                                ^^
+9 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                   ^^^^^^
+11>                                                                         ^
+12>                                                                          ^^^
+13>                                                                             ^
+14>                                                                              ^^
+15>                                                                                ^
+16>                                                                                 ^^^
+17>                                                                                    ^
+18>                                                                                     ^^
+19>                                                                                       ^
+20>                                                                                        ^^
+21>                                                                                          ^^
+22>                                                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberB = -1] = getRobot()
-7 >                     
-8 >                       numberB = -1
-9 >                                 
-10>                                   numberB = -1
-11>                                                                    ] = getRobot()
-12>                                                                         , 
-13>                                                                           i
-14>                                                                             = 
-15>                                                                               0
-16>                                                                                ; 
-17>                                                                                  i
-18>                                                                                    < 
-19>                                                                                      1
-20>                                                                                       ; 
-21>                                                                                         i
-22>                                                                                          ++
-23>                                                                                            ) 
-24>                                                                                              {
+5 >     [numberB = -1] = getRobot()
+6 >                    
+7 >                      numberB = -1
+8 >                                
+9 >                                  numberB = -1
+10>                                                                   ] = getRobot(), 
+11>                                                                         i
+12>                                                                           = 
+13>                                                                             0
+14>                                                                              ; 
+15>                                                                                i
+16>                                                                                  < 
+17>                                                                                    1
+18>                                                                                     ; 
+19>                                                                                       i
+20>                                                                                        ++
+21>                                                                                          ) 
+22>                                                                                            {
 1->Emitted(36, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(36, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(36, 5) Source(55, 5) + SourceIndex(0)
 4 >Emitted(36, 6) Source(55, 6) + SourceIndex(0)
-5 >Emitted(36, 7) Source(55, 6) + SourceIndex(0)
-6 >Emitted(36, 22) Source(55, 33) + SourceIndex(0)
-7 >Emitted(36, 24) Source(55, 7) + SourceIndex(0)
-8 >Emitted(36, 34) Source(55, 19) + SourceIndex(0)
-9 >Emitted(36, 36) Source(55, 7) + SourceIndex(0)
-10>Emitted(36, 69) Source(55, 19) + SourceIndex(0)
-11>Emitted(36, 74) Source(55, 33) + SourceIndex(0)
-12>Emitted(36, 76) Source(55, 35) + SourceIndex(0)
-13>Emitted(36, 77) Source(55, 36) + SourceIndex(0)
-14>Emitted(36, 80) Source(55, 39) + SourceIndex(0)
-15>Emitted(36, 81) Source(55, 40) + SourceIndex(0)
-16>Emitted(36, 83) Source(55, 42) + SourceIndex(0)
-17>Emitted(36, 84) Source(55, 43) + SourceIndex(0)
-18>Emitted(36, 87) Source(55, 46) + SourceIndex(0)
-19>Emitted(36, 88) Source(55, 47) + SourceIndex(0)
-20>Emitted(36, 90) Source(55, 49) + SourceIndex(0)
-21>Emitted(36, 91) Source(55, 50) + SourceIndex(0)
-22>Emitted(36, 93) Source(55, 52) + SourceIndex(0)
-23>Emitted(36, 95) Source(55, 54) + SourceIndex(0)
-24>Emitted(36, 96) Source(55, 55) + SourceIndex(0)
+5 >Emitted(36, 21) Source(55, 33) + SourceIndex(0)
+6 >Emitted(36, 23) Source(55, 7) + SourceIndex(0)
+7 >Emitted(36, 33) Source(55, 19) + SourceIndex(0)
+8 >Emitted(36, 35) Source(55, 7) + SourceIndex(0)
+9 >Emitted(36, 68) Source(55, 19) + SourceIndex(0)
+10>Emitted(36, 74) Source(55, 35) + SourceIndex(0)
+11>Emitted(36, 75) Source(55, 36) + SourceIndex(0)
+12>Emitted(36, 78) Source(55, 39) + SourceIndex(0)
+13>Emitted(36, 79) Source(55, 40) + SourceIndex(0)
+14>Emitted(36, 81) Source(55, 42) + SourceIndex(0)
+15>Emitted(36, 82) Source(55, 43) + SourceIndex(0)
+16>Emitted(36, 85) Source(55, 46) + SourceIndex(0)
+17>Emitted(36, 86) Source(55, 47) + SourceIndex(0)
+18>Emitted(36, 88) Source(55, 49) + SourceIndex(0)
+19>Emitted(36, 89) Source(55, 50) + SourceIndex(0)
+20>Emitted(36, 91) Source(55, 52) + SourceIndex(0)
+21>Emitted(36, 93) Source(55, 54) + SourceIndex(0)
+22>Emitted(36, 94) Source(55, 55) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1334,87 +1286,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(38, 1) Source(57, 1) + SourceIndex(0)
 2 >Emitted(38, 2) Source(57, 2) + SourceIndex(0)
 ---
->>>for ((_y = [2, "trimmer", "trimming"], _z = _y[0], numberB = _z === void 0 ? -1 : _z, _y), i = 0; i < 1; i++) {
+>>>for (_y = [2, "trimmer", "trimming"], _z = _y[0], numberB = _z === void 0 ? -1 : _z, _y, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                     ^^
-8 >                                       ^^^^^^^^^^
-9 >                                                 ^^
-10>                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                    ^^^^^
-12>                                                                                         ^^
-13>                                                                                           ^
-14>                                                                                            ^^^
-15>                                                                                               ^
-16>                                                                                                ^^
-17>                                                                                                  ^
-18>                                                                                                   ^^^
-19>                                                                                                      ^
-20>                                                                                                       ^^
-21>                                                                                                         ^
-22>                                                                                                          ^^
-23>                                                                                                            ^^
-24>                                                                                                              ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^
+8 >                                                ^^
+9 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                   ^^^^^^
+11>                                                                                         ^
+12>                                                                                          ^^^
+13>                                                                                             ^
+14>                                                                                              ^^
+15>                                                                                                ^
+16>                                                                                                 ^^^
+17>                                                                                                    ^
+18>                                                                                                     ^^
+19>                                                                                                       ^
+20>                                                                                                        ^^
+21>                                                                                                          ^^
+22>                                                                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberB = -1] = [2, "trimmer", "trimming"]
-7 >                                     
-8 >                                       numberB = -1
-9 >                                                 
-10>                                                   numberB = -1
-11>                                                                                    ] = [2, "trimmer", "trimming"]
-12>                                                                                         , 
-13>                                                                                           i
-14>                                                                                             = 
-15>                                                                                               0
-16>                                                                                                ; 
-17>                                                                                                  i
-18>                                                                                                    < 
-19>                                                                                                      1
-20>                                                                                                       ; 
-21>                                                                                                         i
-22>                                                                                                          ++
-23>                                                                                                            ) 
-24>                                                                                                              {
+5 >     [numberB = -1] = [2, "trimmer", "trimming"]
+6 >                                    
+7 >                                      numberB = -1
+8 >                                                
+9 >                                                  numberB = -1
+10>                                                                                   ] = [2, "trimmer", "trimming"], 
+11>                                                                                         i
+12>                                                                                           = 
+13>                                                                                             0
+14>                                                                                              ; 
+15>                                                                                                i
+16>                                                                                                  < 
+17>                                                                                                    1
+18>                                                                                                     ; 
+19>                                                                                                       i
+20>                                                                                                        ++
+21>                                                                                                          ) 
+22>                                                                                                            {
 1->Emitted(39, 1) Source(58, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(58, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(58, 5) + SourceIndex(0)
 4 >Emitted(39, 6) Source(58, 6) + SourceIndex(0)
-5 >Emitted(39, 7) Source(58, 6) + SourceIndex(0)
-6 >Emitted(39, 38) Source(58, 49) + SourceIndex(0)
-7 >Emitted(39, 40) Source(58, 7) + SourceIndex(0)
-8 >Emitted(39, 50) Source(58, 19) + SourceIndex(0)
-9 >Emitted(39, 52) Source(58, 7) + SourceIndex(0)
-10>Emitted(39, 85) Source(58, 19) + SourceIndex(0)
-11>Emitted(39, 90) Source(58, 49) + SourceIndex(0)
-12>Emitted(39, 92) Source(58, 51) + SourceIndex(0)
-13>Emitted(39, 93) Source(58, 52) + SourceIndex(0)
-14>Emitted(39, 96) Source(58, 55) + SourceIndex(0)
-15>Emitted(39, 97) Source(58, 56) + SourceIndex(0)
-16>Emitted(39, 99) Source(58, 58) + SourceIndex(0)
-17>Emitted(39, 100) Source(58, 59) + SourceIndex(0)
-18>Emitted(39, 103) Source(58, 62) + SourceIndex(0)
-19>Emitted(39, 104) Source(58, 63) + SourceIndex(0)
-20>Emitted(39, 106) Source(58, 65) + SourceIndex(0)
-21>Emitted(39, 107) Source(58, 66) + SourceIndex(0)
-22>Emitted(39, 109) Source(58, 68) + SourceIndex(0)
-23>Emitted(39, 111) Source(58, 70) + SourceIndex(0)
-24>Emitted(39, 112) Source(58, 71) + SourceIndex(0)
+5 >Emitted(39, 37) Source(58, 49) + SourceIndex(0)
+6 >Emitted(39, 39) Source(58, 7) + SourceIndex(0)
+7 >Emitted(39, 49) Source(58, 19) + SourceIndex(0)
+8 >Emitted(39, 51) Source(58, 7) + SourceIndex(0)
+9 >Emitted(39, 84) Source(58, 19) + SourceIndex(0)
+10>Emitted(39, 90) Source(58, 51) + SourceIndex(0)
+11>Emitted(39, 91) Source(58, 52) + SourceIndex(0)
+12>Emitted(39, 94) Source(58, 55) + SourceIndex(0)
+13>Emitted(39, 95) Source(58, 56) + SourceIndex(0)
+14>Emitted(39, 97) Source(58, 58) + SourceIndex(0)
+15>Emitted(39, 98) Source(58, 59) + SourceIndex(0)
+16>Emitted(39, 101) Source(58, 62) + SourceIndex(0)
+17>Emitted(39, 102) Source(58, 63) + SourceIndex(0)
+18>Emitted(39, 104) Source(58, 65) + SourceIndex(0)
+19>Emitted(39, 105) Source(58, 66) + SourceIndex(0)
+20>Emitted(39, 107) Source(58, 68) + SourceIndex(0)
+21>Emitted(39, 109) Source(58, 70) + SourceIndex(0)
+22>Emitted(39, 110) Source(58, 71) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1446,87 +1392,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(41, 1) Source(60, 1) + SourceIndex(0)
 2 >Emitted(41, 2) Source(60, 2) + SourceIndex(0)
 ---
->>>for ((_0 = multiRobotA[0], nameB = _0 === void 0 ? "name" : _0, multiRobotA), i = 0; i < 1; i++) {
+>>>for (_0 = multiRobotA[0], nameB = _0 === void 0 ? "name" : _0, multiRobotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^
-7 >                         ^^
-8 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                              ^^
-10>                                                                ^^^^^^^^^^^
-11>                                                                           ^
-12>                                                                            ^^
-13>                                                                              ^
-14>                                                                               ^^^
-15>                                                                                  ^
-16>                                                                                   ^^
-17>                                                                                     ^
-18>                                                                                      ^^^
-19>                                                                                         ^
-20>                                                                                          ^^
-21>                                                                                            ^
-22>                                                                                             ^^
-23>                                                                                               ^^
-24>                                                                                                 ^
+5 >     ^^^^^^^^^^^^^^^^^^^
+6 >                        ^^
+7 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                             ^^
+9 >                                                               ^^^^^^^^^^^
+10>                                                                          ^^
+11>                                                                            ^
+12>                                                                             ^^^
+13>                                                                                ^
+14>                                                                                 ^^
+15>                                                                                   ^
+16>                                                                                    ^^^
+17>                                                                                       ^
+18>                                                                                        ^^
+19>                                                                                          ^
+20>                                                                                           ^^
+21>                                                                                             ^^
+22>                                                                                               ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      nameB = "name"
-7 >                         
-8 >                           nameB = "name"
-9 >                                                              ] = 
-10>                                                                multiRobotA
-11>                                                                           
-12>                                                                            , 
-13>                                                                              i
-14>                                                                                = 
-15>                                                                                  0
-16>                                                                                   ; 
-17>                                                                                     i
-18>                                                                                       < 
-19>                                                                                         1
-20>                                                                                          ; 
-21>                                                                                            i
-22>                                                                                             ++
-23>                                                                                               ) 
-24>                                                                                                 {
+4 >    ([
+5 >     nameB = "name"
+6 >                        
+7 >                          nameB = "name"
+8 >                                                             ] = 
+9 >                                                               multiRobotA
+10>                                                                          , 
+11>                                                                            i
+12>                                                                              = 
+13>                                                                                0
+14>                                                                                 ; 
+15>                                                                                   i
+16>                                                                                     < 
+17>                                                                                       1
+18>                                                                                        ; 
+19>                                                                                          i
+20>                                                                                           ++
+21>                                                                                             ) 
+22>                                                                                               {
 1->Emitted(42, 1) Source(61, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(61, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(61, 5) + SourceIndex(0)
-4 >Emitted(42, 6) Source(61, 6) + SourceIndex(0)
-5 >Emitted(42, 7) Source(61, 7) + SourceIndex(0)
-6 >Emitted(42, 26) Source(61, 21) + SourceIndex(0)
-7 >Emitted(42, 28) Source(61, 7) + SourceIndex(0)
-8 >Emitted(42, 63) Source(61, 21) + SourceIndex(0)
-9 >Emitted(42, 65) Source(61, 25) + SourceIndex(0)
-10>Emitted(42, 76) Source(61, 36) + SourceIndex(0)
-11>Emitted(42, 77) Source(61, 36) + SourceIndex(0)
-12>Emitted(42, 79) Source(61, 38) + SourceIndex(0)
-13>Emitted(42, 80) Source(61, 39) + SourceIndex(0)
-14>Emitted(42, 83) Source(61, 42) + SourceIndex(0)
-15>Emitted(42, 84) Source(61, 43) + SourceIndex(0)
-16>Emitted(42, 86) Source(61, 45) + SourceIndex(0)
-17>Emitted(42, 87) Source(61, 46) + SourceIndex(0)
-18>Emitted(42, 90) Source(61, 49) + SourceIndex(0)
-19>Emitted(42, 91) Source(61, 50) + SourceIndex(0)
-20>Emitted(42, 93) Source(61, 52) + SourceIndex(0)
-21>Emitted(42, 94) Source(61, 53) + SourceIndex(0)
-22>Emitted(42, 96) Source(61, 55) + SourceIndex(0)
-23>Emitted(42, 98) Source(61, 57) + SourceIndex(0)
-24>Emitted(42, 99) Source(61, 58) + SourceIndex(0)
+4 >Emitted(42, 6) Source(61, 7) + SourceIndex(0)
+5 >Emitted(42, 25) Source(61, 21) + SourceIndex(0)
+6 >Emitted(42, 27) Source(61, 7) + SourceIndex(0)
+7 >Emitted(42, 62) Source(61, 21) + SourceIndex(0)
+8 >Emitted(42, 64) Source(61, 25) + SourceIndex(0)
+9 >Emitted(42, 75) Source(61, 36) + SourceIndex(0)
+10>Emitted(42, 77) Source(61, 38) + SourceIndex(0)
+11>Emitted(42, 78) Source(61, 39) + SourceIndex(0)
+12>Emitted(42, 81) Source(61, 42) + SourceIndex(0)
+13>Emitted(42, 82) Source(61, 43) + SourceIndex(0)
+14>Emitted(42, 84) Source(61, 45) + SourceIndex(0)
+15>Emitted(42, 85) Source(61, 46) + SourceIndex(0)
+16>Emitted(42, 88) Source(61, 49) + SourceIndex(0)
+17>Emitted(42, 89) Source(61, 50) + SourceIndex(0)
+18>Emitted(42, 91) Source(61, 52) + SourceIndex(0)
+19>Emitted(42, 92) Source(61, 53) + SourceIndex(0)
+20>Emitted(42, 94) Source(61, 55) + SourceIndex(0)
+21>Emitted(42, 96) Source(61, 57) + SourceIndex(0)
+22>Emitted(42, 97) Source(61, 58) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1558,87 +1498,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(44, 1) Source(63, 1) + SourceIndex(0)
 2 >Emitted(44, 2) Source(63, 2) + SourceIndex(0)
 ---
->>>for ((_1 = getMultiRobot(), _2 = _1[0], nameB = _2 === void 0 ? "name" : _2, _1), i = 0; i < 1; i++) {
+>>>for (_1 = getMultiRobot(), _2 = _1[0], nameB = _2 === void 0 ? "name" : _2, _1, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^
-9 >                                      ^^
-10>                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                           ^^^^^
-12>                                                                                ^^
-13>                                                                                  ^
-14>                                                                                   ^^^
-15>                                                                                      ^
-16>                                                                                       ^^
-17>                                                                                         ^
-18>                                                                                          ^^^
-19>                                                                                             ^
-20>                                                                                              ^^
-21>                                                                                                ^
-22>                                                                                                 ^^
-23>                                                                                                   ^^
-24>                                                                                                     ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^
+8 >                                     ^^
+9 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                          ^^^^^^
+11>                                                                                ^
+12>                                                                                 ^^^
+13>                                                                                    ^
+14>                                                                                     ^^
+15>                                                                                       ^
+16>                                                                                        ^^^
+17>                                                                                           ^
+18>                                                                                            ^^
+19>                                                                                              ^
+20>                                                                                               ^^
+21>                                                                                                 ^^
+22>                                                                                                   ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameB = "name"] = getMultiRobot()
-7 >                          
-8 >                            nameB = "name"
-9 >                                      
-10>                                        nameB = "name"
-11>                                                                           ] = getMultiRobot()
-12>                                                                                , 
-13>                                                                                  i
-14>                                                                                    = 
-15>                                                                                      0
-16>                                                                                       ; 
-17>                                                                                         i
-18>                                                                                           < 
-19>                                                                                             1
-20>                                                                                              ; 
-21>                                                                                                i
-22>                                                                                                 ++
-23>                                                                                                   ) 
-24>                                                                                                     {
+5 >     [nameB = "name"] = getMultiRobot()
+6 >                         
+7 >                           nameB = "name"
+8 >                                     
+9 >                                       nameB = "name"
+10>                                                                          ] = getMultiRobot(), 
+11>                                                                                i
+12>                                                                                  = 
+13>                                                                                    0
+14>                                                                                     ; 
+15>                                                                                       i
+16>                                                                                         < 
+17>                                                                                           1
+18>                                                                                            ; 
+19>                                                                                              i
+20>                                                                                               ++
+21>                                                                                                 ) 
+22>                                                                                                   {
 1->Emitted(45, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(64, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(64, 5) + SourceIndex(0)
 4 >Emitted(45, 6) Source(64, 6) + SourceIndex(0)
-5 >Emitted(45, 7) Source(64, 6) + SourceIndex(0)
-6 >Emitted(45, 27) Source(64, 40) + SourceIndex(0)
-7 >Emitted(45, 29) Source(64, 7) + SourceIndex(0)
-8 >Emitted(45, 39) Source(64, 21) + SourceIndex(0)
-9 >Emitted(45, 41) Source(64, 7) + SourceIndex(0)
-10>Emitted(45, 76) Source(64, 21) + SourceIndex(0)
-11>Emitted(45, 81) Source(64, 40) + SourceIndex(0)
-12>Emitted(45, 83) Source(64, 42) + SourceIndex(0)
-13>Emitted(45, 84) Source(64, 43) + SourceIndex(0)
-14>Emitted(45, 87) Source(64, 46) + SourceIndex(0)
-15>Emitted(45, 88) Source(64, 47) + SourceIndex(0)
-16>Emitted(45, 90) Source(64, 49) + SourceIndex(0)
-17>Emitted(45, 91) Source(64, 50) + SourceIndex(0)
-18>Emitted(45, 94) Source(64, 53) + SourceIndex(0)
-19>Emitted(45, 95) Source(64, 54) + SourceIndex(0)
-20>Emitted(45, 97) Source(64, 56) + SourceIndex(0)
-21>Emitted(45, 98) Source(64, 57) + SourceIndex(0)
-22>Emitted(45, 100) Source(64, 59) + SourceIndex(0)
-23>Emitted(45, 102) Source(64, 61) + SourceIndex(0)
-24>Emitted(45, 103) Source(64, 62) + SourceIndex(0)
+5 >Emitted(45, 26) Source(64, 40) + SourceIndex(0)
+6 >Emitted(45, 28) Source(64, 7) + SourceIndex(0)
+7 >Emitted(45, 38) Source(64, 21) + SourceIndex(0)
+8 >Emitted(45, 40) Source(64, 7) + SourceIndex(0)
+9 >Emitted(45, 75) Source(64, 21) + SourceIndex(0)
+10>Emitted(45, 81) Source(64, 42) + SourceIndex(0)
+11>Emitted(45, 82) Source(64, 43) + SourceIndex(0)
+12>Emitted(45, 85) Source(64, 46) + SourceIndex(0)
+13>Emitted(45, 86) Source(64, 47) + SourceIndex(0)
+14>Emitted(45, 88) Source(64, 49) + SourceIndex(0)
+15>Emitted(45, 89) Source(64, 50) + SourceIndex(0)
+16>Emitted(45, 92) Source(64, 53) + SourceIndex(0)
+17>Emitted(45, 93) Source(64, 54) + SourceIndex(0)
+18>Emitted(45, 95) Source(64, 56) + SourceIndex(0)
+19>Emitted(45, 96) Source(64, 57) + SourceIndex(0)
+20>Emitted(45, 98) Source(64, 59) + SourceIndex(0)
+21>Emitted(45, 100) Source(64, 61) + SourceIndex(0)
+22>Emitted(45, 101) Source(64, 62) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1670,87 +1604,81 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(47, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(47, 2) Source(66, 2) + SourceIndex(0)
 ---
->>>for ((_3 = ["trimmer", ["trimming", "edging"]], _4 = _3[0], nameB = _4 === void 0 ? "name" : _4, _3), i = 0; i < 1; i++) {
+>>>for (_3 = ["trimmer", ["trimming", "edging"]], _4 = _3[0], nameB = _4 === void 0 ? "name" : _4, _3, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                              ^^
-8 >                                                ^^^^^^^^^^
-9 >                                                          ^^
-10>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                               ^^^^^
-12>                                                                                                    ^^
-13>                                                                                                      ^
-14>                                                                                                       ^^^
-15>                                                                                                          ^
-16>                                                                                                           ^^
-17>                                                                                                             ^
-18>                                                                                                              ^^^
-19>                                                                                                                 ^
-20>                                                                                                                  ^^
-21>                                                                                                                    ^
-22>                                                                                                                     ^^
-23>                                                                                                                       ^^
-24>                                                                                                                         ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^
+8 >                                                         ^^
+9 >                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                              ^^^^^^
+11>                                                                                                    ^
+12>                                                                                                     ^^^
+13>                                                                                                        ^
+14>                                                                                                         ^^
+15>                                                                                                           ^
+16>                                                                                                            ^^^
+17>                                                                                                               ^
+18>                                                                                                                ^^
+19>                                                                                                                  ^
+20>                                                                                                                   ^^
+21>                                                                                                                     ^^
+22>                                                                                                                       ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameB = "name"] = ["trimmer", ["trimming", "edging"]]
-7 >                                              
-8 >                                                nameB = "name"
-9 >                                                          
-10>                                                            nameB = "name"
-11>                                                                                               ] = ["trimmer", ["trimming", "edging"]]
-12>                                                                                                    , 
-13>                                                                                                      i
-14>                                                                                                        = 
-15>                                                                                                          0
-16>                                                                                                           ; 
-17>                                                                                                             i
-18>                                                                                                               < 
-19>                                                                                                                 1
-20>                                                                                                                  ; 
-21>                                                                                                                    i
-22>                                                                                                                     ++
-23>                                                                                                                       ) 
-24>                                                                                                                         {
+5 >     [nameB = "name"] = ["trimmer", ["trimming", "edging"]]
+6 >                                             
+7 >                                               nameB = "name"
+8 >                                                         
+9 >                                                           nameB = "name"
+10>                                                                                              ] = ["trimmer", ["trimming", "edging"]], 
+11>                                                                                                    i
+12>                                                                                                      = 
+13>                                                                                                        0
+14>                                                                                                         ; 
+15>                                                                                                           i
+16>                                                                                                             < 
+17>                                                                                                               1
+18>                                                                                                                ; 
+19>                                                                                                                  i
+20>                                                                                                                   ++
+21>                                                                                                                     ) 
+22>                                                                                                                       {
 1->Emitted(48, 1) Source(67, 1) + SourceIndex(0)
 2 >Emitted(48, 4) Source(67, 4) + SourceIndex(0)
 3 >Emitted(48, 5) Source(67, 5) + SourceIndex(0)
 4 >Emitted(48, 6) Source(67, 6) + SourceIndex(0)
-5 >Emitted(48, 7) Source(67, 6) + SourceIndex(0)
-6 >Emitted(48, 47) Source(67, 60) + SourceIndex(0)
-7 >Emitted(48, 49) Source(67, 7) + SourceIndex(0)
-8 >Emitted(48, 59) Source(67, 21) + SourceIndex(0)
-9 >Emitted(48, 61) Source(67, 7) + SourceIndex(0)
-10>Emitted(48, 96) Source(67, 21) + SourceIndex(0)
-11>Emitted(48, 101) Source(67, 60) + SourceIndex(0)
-12>Emitted(48, 103) Source(67, 62) + SourceIndex(0)
-13>Emitted(48, 104) Source(67, 63) + SourceIndex(0)
-14>Emitted(48, 107) Source(67, 66) + SourceIndex(0)
-15>Emitted(48, 108) Source(67, 67) + SourceIndex(0)
-16>Emitted(48, 110) Source(67, 69) + SourceIndex(0)
-17>Emitted(48, 111) Source(67, 70) + SourceIndex(0)
-18>Emitted(48, 114) Source(67, 73) + SourceIndex(0)
-19>Emitted(48, 115) Source(67, 74) + SourceIndex(0)
-20>Emitted(48, 117) Source(67, 76) + SourceIndex(0)
-21>Emitted(48, 118) Source(67, 77) + SourceIndex(0)
-22>Emitted(48, 120) Source(67, 79) + SourceIndex(0)
-23>Emitted(48, 122) Source(67, 81) + SourceIndex(0)
-24>Emitted(48, 123) Source(67, 82) + SourceIndex(0)
+5 >Emitted(48, 46) Source(67, 60) + SourceIndex(0)
+6 >Emitted(48, 48) Source(67, 7) + SourceIndex(0)
+7 >Emitted(48, 58) Source(67, 21) + SourceIndex(0)
+8 >Emitted(48, 60) Source(67, 7) + SourceIndex(0)
+9 >Emitted(48, 95) Source(67, 21) + SourceIndex(0)
+10>Emitted(48, 101) Source(67, 62) + SourceIndex(0)
+11>Emitted(48, 102) Source(67, 63) + SourceIndex(0)
+12>Emitted(48, 105) Source(67, 66) + SourceIndex(0)
+13>Emitted(48, 106) Source(67, 67) + SourceIndex(0)
+14>Emitted(48, 108) Source(67, 69) + SourceIndex(0)
+15>Emitted(48, 109) Source(67, 70) + SourceIndex(0)
+16>Emitted(48, 112) Source(67, 73) + SourceIndex(0)
+17>Emitted(48, 113) Source(67, 74) + SourceIndex(0)
+18>Emitted(48, 115) Source(67, 76) + SourceIndex(0)
+19>Emitted(48, 116) Source(67, 77) + SourceIndex(0)
+20>Emitted(48, 118) Source(67, 79) + SourceIndex(0)
+21>Emitted(48, 120) Source(67, 81) + SourceIndex(0)
+22>Emitted(48, 121) Source(67, 82) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1782,112 +1710,106 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(50, 1) Source(69, 1) + SourceIndex(0)
 2 >Emitted(50, 2) Source(69, 2) + SourceIndex(0)
 ---
->>>for ((_5 = robotA[0], numberA2 = _5 === void 0 ? -1 : _5, _6 = robotA[1], nameA2 = _6 === void 0 ? "name" : _6, _7 = robotA[2], skillA2 = _7 === void 0 ? "skill" : _7, robotA), i = 0; i < 1; i++) {
+>>>for (_5 = robotA[0], numberA2 = _5 === void 0 ? -1 : _5, _6 = robotA[1], nameA2 = _6 === void 0 ? "name" : _6, _7 = robotA[2], skillA2 = _7 === void 0 ? "skill" : _7, robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^
-7 >                    ^^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                        ^^
-10>                                                          ^^^^^^^^^^^^^^
-11>                                                                        ^^
-12>                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                              ^^
-14>                                                                                                                ^^^^^^^^^^^^^^
-15>                                                                                                                              ^^
-16>                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                      ^^
-18>                                                                                                                                                                        ^^^^^^
-19>                                                                                                                                                                              ^
-20>                                                                                                                                                                               ^^
-21>                                                                                                                                                                                 ^
-22>                                                                                                                                                                                  ^^^
-23>                                                                                                                                                                                     ^
-24>                                                                                                                                                                                      ^^
-25>                                                                                                                                                                                        ^
-26>                                                                                                                                                                                         ^^^
-27>                                                                                                                                                                                            ^
-28>                                                                                                                                                                                             ^^
-29>                                                                                                                                                                                               ^
-30>                                                                                                                                                                                                ^^
-31>                                                                                                                                                                                                  ^^
-32>                                                                                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^
+6 >                   ^^
+7 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                       ^^
+9 >                                                         ^^^^^^^^^^^^^^
+10>                                                                       ^^
+11>                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                             ^^
+13>                                                                                                               ^^^^^^^^^^^^^^
+14>                                                                                                                             ^^
+15>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                     ^^
+17>                                                                                                                                                                       ^^^^^^
+18>                                                                                                                                                                             ^^
+19>                                                                                                                                                                               ^
+20>                                                                                                                                                                                ^^^
+21>                                                                                                                                                                                   ^
+22>                                                                                                                                                                                    ^^
+23>                                                                                                                                                                                      ^
+24>                                                                                                                                                                                       ^^^
+25>                                                                                                                                                                                          ^
+26>                                                                                                                                                                                           ^^
+27>                                                                                                                                                                                             ^
+28>                                                                                                                                                                                              ^^
+29>                                                                                                                                                                                                ^^
+30>                                                                                                                                                                                                  ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      numberA2 = -1
-7 >                    
-8 >                      numberA2 = -1
-9 >                                                        , 
-10>                                                          nameA2 = "name"
-11>                                                                        
-12>                                                                          nameA2 = "name"
-13>                                                                                                              , 
-14>                                                                                                                skillA2 = "skill"
-15>                                                                                                                              
-16>                                                                                                                                skillA2 = "skill"
-17>                                                                                                                                                                      ] = 
-18>                                                                                                                                                                        robotA
-19>                                                                                                                                                                              
-20>                                                                                                                                                                               , 
-21>                                                                                                                                                                                 i
-22>                                                                                                                                                                                   = 
-23>                                                                                                                                                                                     0
-24>                                                                                                                                                                                      ; 
-25>                                                                                                                                                                                        i
-26>                                                                                                                                                                                          < 
-27>                                                                                                                                                                                            1
-28>                                                                                                                                                                                             ; 
-29>                                                                                                                                                                                               i
-30>                                                                                                                                                                                                ++
-31>                                                                                                                                                                                                  ) 
-32>                                                                                                                                                                                                    {
+4 >    ([
+5 >     numberA2 = -1
+6 >                   
+7 >                     numberA2 = -1
+8 >                                                       , 
+9 >                                                         nameA2 = "name"
+10>                                                                       
+11>                                                                         nameA2 = "name"
+12>                                                                                                             , 
+13>                                                                                                               skillA2 = "skill"
+14>                                                                                                                             
+15>                                                                                                                               skillA2 = "skill"
+16>                                                                                                                                                                     ] = 
+17>                                                                                                                                                                       robotA
+18>                                                                                                                                                                             , 
+19>                                                                                                                                                                               i
+20>                                                                                                                                                                                 = 
+21>                                                                                                                                                                                   0
+22>                                                                                                                                                                                    ; 
+23>                                                                                                                                                                                      i
+24>                                                                                                                                                                                        < 
+25>                                                                                                                                                                                          1
+26>                                                                                                                                                                                           ; 
+27>                                                                                                                                                                                             i
+28>                                                                                                                                                                                              ++
+29>                                                                                                                                                                                                ) 
+30>                                                                                                                                                                                                  {
 1->Emitted(51, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(51, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(51, 5) Source(71, 5) + SourceIndex(0)
-4 >Emitted(51, 6) Source(71, 6) + SourceIndex(0)
-5 >Emitted(51, 7) Source(71, 7) + SourceIndex(0)
-6 >Emitted(51, 21) Source(71, 20) + SourceIndex(0)
-7 >Emitted(51, 23) Source(71, 7) + SourceIndex(0)
-8 >Emitted(51, 57) Source(71, 20) + SourceIndex(0)
-9 >Emitted(51, 59) Source(71, 22) + SourceIndex(0)
-10>Emitted(51, 73) Source(71, 37) + SourceIndex(0)
-11>Emitted(51, 75) Source(71, 22) + SourceIndex(0)
-12>Emitted(51, 111) Source(71, 37) + SourceIndex(0)
-13>Emitted(51, 113) Source(71, 39) + SourceIndex(0)
-14>Emitted(51, 127) Source(71, 56) + SourceIndex(0)
-15>Emitted(51, 129) Source(71, 39) + SourceIndex(0)
-16>Emitted(51, 167) Source(71, 56) + SourceIndex(0)
-17>Emitted(51, 169) Source(71, 60) + SourceIndex(0)
-18>Emitted(51, 175) Source(71, 66) + SourceIndex(0)
-19>Emitted(51, 176) Source(71, 66) + SourceIndex(0)
-20>Emitted(51, 178) Source(71, 68) + SourceIndex(0)
-21>Emitted(51, 179) Source(71, 69) + SourceIndex(0)
-22>Emitted(51, 182) Source(71, 72) + SourceIndex(0)
-23>Emitted(51, 183) Source(71, 73) + SourceIndex(0)
-24>Emitted(51, 185) Source(71, 75) + SourceIndex(0)
-25>Emitted(51, 186) Source(71, 76) + SourceIndex(0)
-26>Emitted(51, 189) Source(71, 79) + SourceIndex(0)
-27>Emitted(51, 190) Source(71, 80) + SourceIndex(0)
-28>Emitted(51, 192) Source(71, 82) + SourceIndex(0)
-29>Emitted(51, 193) Source(71, 83) + SourceIndex(0)
-30>Emitted(51, 195) Source(71, 85) + SourceIndex(0)
-31>Emitted(51, 197) Source(71, 87) + SourceIndex(0)
-32>Emitted(51, 198) Source(71, 88) + SourceIndex(0)
+4 >Emitted(51, 6) Source(71, 7) + SourceIndex(0)
+5 >Emitted(51, 20) Source(71, 20) + SourceIndex(0)
+6 >Emitted(51, 22) Source(71, 7) + SourceIndex(0)
+7 >Emitted(51, 56) Source(71, 20) + SourceIndex(0)
+8 >Emitted(51, 58) Source(71, 22) + SourceIndex(0)
+9 >Emitted(51, 72) Source(71, 37) + SourceIndex(0)
+10>Emitted(51, 74) Source(71, 22) + SourceIndex(0)
+11>Emitted(51, 110) Source(71, 37) + SourceIndex(0)
+12>Emitted(51, 112) Source(71, 39) + SourceIndex(0)
+13>Emitted(51, 126) Source(71, 56) + SourceIndex(0)
+14>Emitted(51, 128) Source(71, 39) + SourceIndex(0)
+15>Emitted(51, 166) Source(71, 56) + SourceIndex(0)
+16>Emitted(51, 168) Source(71, 60) + SourceIndex(0)
+17>Emitted(51, 174) Source(71, 66) + SourceIndex(0)
+18>Emitted(51, 176) Source(71, 68) + SourceIndex(0)
+19>Emitted(51, 177) Source(71, 69) + SourceIndex(0)
+20>Emitted(51, 180) Source(71, 72) + SourceIndex(0)
+21>Emitted(51, 181) Source(71, 73) + SourceIndex(0)
+22>Emitted(51, 183) Source(71, 75) + SourceIndex(0)
+23>Emitted(51, 184) Source(71, 76) + SourceIndex(0)
+24>Emitted(51, 187) Source(71, 79) + SourceIndex(0)
+25>Emitted(51, 188) Source(71, 80) + SourceIndex(0)
+26>Emitted(51, 190) Source(71, 82) + SourceIndex(0)
+27>Emitted(51, 191) Source(71, 83) + SourceIndex(0)
+28>Emitted(51, 193) Source(71, 85) + SourceIndex(0)
+29>Emitted(51, 195) Source(71, 87) + SourceIndex(0)
+30>Emitted(51, 196) Source(71, 88) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1919,111 +1841,105 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(53, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(53, 2) Source(73, 2) + SourceIndex(0)
 ---
->>>for ((_8 = getRobot(), _9 = _8[0], numberA2 = _9 === void 0 ? -1 : _9, _10 = _8[1], nameA2 = _10 === void 0 ? "name" : _10, _11 = _8[2], skillA2 = _11 === void 0 ? "skill" : _11, _8), i = 0; i < 1; i++) {
+>>>for (_8 = getRobot(), _9 = _8[0], numberA2 = _9 === void 0 ? -1 : _9, _10 = _8[1], nameA2 = _10 === void 0 ? "name" : _10, _11 = _8[2], skillA2 = _11 === void 0 ? "skill" : _11, _8, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^
-9 >                                 ^^
-10>                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                     ^^
-12>                                                                       ^^^^^^^^^^^
-13>                                                                                  ^^
-14>                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                          ^^
-16>                                                                                                                            ^^^^^^^^^^^
-17>                                                                                                                                       ^^
-18>                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                 ^^^^^
-20>                                                                                                                                                                                      ^^
-21>                                                                                                                                                                                        ^
-22>                                                                                                                                                                                         ^^^
-23>                                                                                                                                                                                            ^
-24>                                                                                                                                                                                             ^^
-25>                                                                                                                                                                                               ^
-26>                                                                                                                                                                                                ^^^
-27>                                                                                                                                                                                                   ^
-28>                                                                                                                                                                                                    ^^
-29>                                                                                                                                                                                                      ^
-30>                                                                                                                                                                                                       ^^
-31>                                                                                                                                                                                                         ^^
-32>                                                                                                                                                                                                           ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^
+8 >                                ^^
+9 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                    ^^
+11>                                                                      ^^^^^^^^^^^
+12>                                                                                 ^^
+13>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                         ^^
+15>                                                                                                                           ^^^^^^^^^^^
+16>                                                                                                                                      ^^
+17>                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                ^^^^^^
+19>                                                                                                                                                                                      ^
+20>                                                                                                                                                                                       ^^^
+21>                                                                                                                                                                                          ^
+22>                                                                                                                                                                                           ^^
+23>                                                                                                                                                                                             ^
+24>                                                                                                                                                                                              ^^^
+25>                                                                                                                                                                                                 ^
+26>                                                                                                                                                                                                  ^^
+27>                                                                                                                                                                                                    ^
+28>                                                                                                                                                                                                     ^^
+29>                                                                                                                                                                                                       ^^
+30>                                                                                                                                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot()
-7 >                     
-8 >                       numberA2 = -1
-9 >                                 
-10>                                   numberA2 = -1
-11>                                                                     , 
-12>                                                                       nameA2 = "name"
-13>                                                                                  
-14>                                                                                    nameA2 = "name"
-15>                                                                                                                          , 
-16>                                                                                                                            skillA2 = "skill"
-17>                                                                                                                                       
-18>                                                                                                                                         skillA2 = "skill"
-19>                                                                                                                                                                                 ] = getRobot()
-20>                                                                                                                                                                                      , 
-21>                                                                                                                                                                                        i
-22>                                                                                                                                                                                          = 
-23>                                                                                                                                                                                            0
-24>                                                                                                                                                                                             ; 
-25>                                                                                                                                                                                               i
-26>                                                                                                                                                                                                 < 
-27>                                                                                                                                                                                                   1
-28>                                                                                                                                                                                                    ; 
-29>                                                                                                                                                                                                      i
-30>                                                                                                                                                                                                       ++
-31>                                                                                                                                                                                                         ) 
-32>                                                                                                                                                                                                           {
+5 >     [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot()
+6 >                    
+7 >                      numberA2 = -1
+8 >                                
+9 >                                  numberA2 = -1
+10>                                                                    , 
+11>                                                                      nameA2 = "name"
+12>                                                                                 
+13>                                                                                   nameA2 = "name"
+14>                                                                                                                         , 
+15>                                                                                                                           skillA2 = "skill"
+16>                                                                                                                                      
+17>                                                                                                                                        skillA2 = "skill"
+18>                                                                                                                                                                                ] = getRobot(), 
+19>                                                                                                                                                                                      i
+20>                                                                                                                                                                                        = 
+21>                                                                                                                                                                                          0
+22>                                                                                                                                                                                           ; 
+23>                                                                                                                                                                                             i
+24>                                                                                                                                                                                               < 
+25>                                                                                                                                                                                                 1
+26>                                                                                                                                                                                                  ; 
+27>                                                                                                                                                                                                    i
+28>                                                                                                                                                                                                     ++
+29>                                                                                                                                                                                                       ) 
+30>                                                                                                                                                                                                         {
 1->Emitted(54, 1) Source(74, 1) + SourceIndex(0)
 2 >Emitted(54, 4) Source(74, 4) + SourceIndex(0)
 3 >Emitted(54, 5) Source(74, 5) + SourceIndex(0)
 4 >Emitted(54, 6) Source(74, 6) + SourceIndex(0)
-5 >Emitted(54, 7) Source(74, 6) + SourceIndex(0)
-6 >Emitted(54, 22) Source(74, 70) + SourceIndex(0)
-7 >Emitted(54, 24) Source(74, 7) + SourceIndex(0)
-8 >Emitted(54, 34) Source(74, 20) + SourceIndex(0)
-9 >Emitted(54, 36) Source(74, 7) + SourceIndex(0)
-10>Emitted(54, 70) Source(74, 20) + SourceIndex(0)
-11>Emitted(54, 72) Source(74, 22) + SourceIndex(0)
-12>Emitted(54, 83) Source(74, 37) + SourceIndex(0)
-13>Emitted(54, 85) Source(74, 22) + SourceIndex(0)
-14>Emitted(54, 123) Source(74, 37) + SourceIndex(0)
-15>Emitted(54, 125) Source(74, 39) + SourceIndex(0)
-16>Emitted(54, 136) Source(74, 56) + SourceIndex(0)
-17>Emitted(54, 138) Source(74, 39) + SourceIndex(0)
-18>Emitted(54, 178) Source(74, 56) + SourceIndex(0)
-19>Emitted(54, 183) Source(74, 70) + SourceIndex(0)
-20>Emitted(54, 185) Source(74, 72) + SourceIndex(0)
-21>Emitted(54, 186) Source(74, 73) + SourceIndex(0)
-22>Emitted(54, 189) Source(74, 76) + SourceIndex(0)
-23>Emitted(54, 190) Source(74, 77) + SourceIndex(0)
-24>Emitted(54, 192) Source(74, 79) + SourceIndex(0)
-25>Emitted(54, 193) Source(74, 80) + SourceIndex(0)
-26>Emitted(54, 196) Source(74, 83) + SourceIndex(0)
-27>Emitted(54, 197) Source(74, 84) + SourceIndex(0)
-28>Emitted(54, 199) Source(74, 86) + SourceIndex(0)
-29>Emitted(54, 200) Source(74, 87) + SourceIndex(0)
-30>Emitted(54, 202) Source(74, 89) + SourceIndex(0)
-31>Emitted(54, 204) Source(74, 91) + SourceIndex(0)
-32>Emitted(54, 205) Source(74, 92) + SourceIndex(0)
+5 >Emitted(54, 21) Source(74, 70) + SourceIndex(0)
+6 >Emitted(54, 23) Source(74, 7) + SourceIndex(0)
+7 >Emitted(54, 33) Source(74, 20) + SourceIndex(0)
+8 >Emitted(54, 35) Source(74, 7) + SourceIndex(0)
+9 >Emitted(54, 69) Source(74, 20) + SourceIndex(0)
+10>Emitted(54, 71) Source(74, 22) + SourceIndex(0)
+11>Emitted(54, 82) Source(74, 37) + SourceIndex(0)
+12>Emitted(54, 84) Source(74, 22) + SourceIndex(0)
+13>Emitted(54, 122) Source(74, 37) + SourceIndex(0)
+14>Emitted(54, 124) Source(74, 39) + SourceIndex(0)
+15>Emitted(54, 135) Source(74, 56) + SourceIndex(0)
+16>Emitted(54, 137) Source(74, 39) + SourceIndex(0)
+17>Emitted(54, 177) Source(74, 56) + SourceIndex(0)
+18>Emitted(54, 183) Source(74, 72) + SourceIndex(0)
+19>Emitted(54, 184) Source(74, 73) + SourceIndex(0)
+20>Emitted(54, 187) Source(74, 76) + SourceIndex(0)
+21>Emitted(54, 188) Source(74, 77) + SourceIndex(0)
+22>Emitted(54, 190) Source(74, 79) + SourceIndex(0)
+23>Emitted(54, 191) Source(74, 80) + SourceIndex(0)
+24>Emitted(54, 194) Source(74, 83) + SourceIndex(0)
+25>Emitted(54, 195) Source(74, 84) + SourceIndex(0)
+26>Emitted(54, 197) Source(74, 86) + SourceIndex(0)
+27>Emitted(54, 198) Source(74, 87) + SourceIndex(0)
+28>Emitted(54, 200) Source(74, 89) + SourceIndex(0)
+29>Emitted(54, 202) Source(74, 91) + SourceIndex(0)
+30>Emitted(54, 203) Source(74, 92) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -2055,111 +1971,105 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(56, 1) Source(76, 1) + SourceIndex(0)
 2 >Emitted(56, 2) Source(76, 2) + SourceIndex(0)
 ---
->>>for ((_12 = [2, "trimmer", "trimming"], _13 = _12[0], numberA2 = _13 === void 0 ? -1 : _13, _14 = _12[1], nameA2 = _14 === void 0 ? "name" : _14, _15 = _12[2], skillA2 = _15 === void 0 ? "skill" : _15, _12), i = 0; i < 1; i++) {
+>>>for (_12 = [2, "trimmer", "trimming"], _13 = _12[0], numberA2 = _13 === void 0 ? -1 : _13, _14 = _12[1], nameA2 = _14 === void 0 ? "name" : _14, _15 = _12[2], skillA2 = _15 === void 0 ? "skill" : _15, _12, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                      ^^
-8 >                                        ^^^^^^^^^^^^
-9 >                                                    ^^
-10>                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                          ^^
-12>                                                                                            ^^^^^^^^^^^^
-13>                                                                                                        ^^
-14>                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                ^^
-16>                                                                                                                                                  ^^^^^^^^^^^^
-17>                                                                                                                                                              ^^
-18>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                        ^^^^^^
-20>                                                                                                                                                                                                              ^^
-21>                                                                                                                                                                                                                ^
-22>                                                                                                                                                                                                                 ^^^
-23>                                                                                                                                                                                                                    ^
-24>                                                                                                                                                                                                                     ^^
-25>                                                                                                                                                                                                                       ^
-26>                                                                                                                                                                                                                        ^^^
-27>                                                                                                                                                                                                                           ^
-28>                                                                                                                                                                                                                            ^^
-29>                                                                                                                                                                                                                              ^
-30>                                                                                                                                                                                                                               ^^
-31>                                                                                                                                                                                                                                 ^^
-32>                                                                                                                                                                                                                                   ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                     ^^
+7 >                                       ^^^^^^^^^^^^
+8 >                                                   ^^
+9 >                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                         ^^
+11>                                                                                           ^^^^^^^^^^^^
+12>                                                                                                       ^^
+13>                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                               ^^
+15>                                                                                                                                                 ^^^^^^^^^^^^
+16>                                                                                                                                                             ^^
+17>                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                       ^^^^^^^
+19>                                                                                                                                                                                                              ^
+20>                                                                                                                                                                                                               ^^^
+21>                                                                                                                                                                                                                  ^
+22>                                                                                                                                                                                                                   ^^
+23>                                                                                                                                                                                                                     ^
+24>                                                                                                                                                                                                                      ^^^
+25>                                                                                                                                                                                                                         ^
+26>                                                                                                                                                                                                                          ^^
+27>                                                                                                                                                                                                                            ^
+28>                                                                                                                                                                                                                             ^^
+29>                                                                                                                                                                                                                               ^^
+30>                                                                                                                                                                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"]
-7 >                                      
-8 >                                        numberA2 = -1
-9 >                                                    
-10>                                                      numberA2 = -1
-11>                                                                                          , 
-12>                                                                                            nameA2 = "name"
-13>                                                                                                        
-14>                                                                                                          nameA2 = "name"
-15>                                                                                                                                                , 
-16>                                                                                                                                                  skillA2 = "skill"
-17>                                                                                                                                                              
-18>                                                                                                                                                                skillA2 = "skill"
-19>                                                                                                                                                                                                        ] = [2, "trimmer", "trimming"]
-20>                                                                                                                                                                                                              , 
-21>                                                                                                                                                                                                                i
-22>                                                                                                                                                                                                                  = 
-23>                                                                                                                                                                                                                    0
-24>                                                                                                                                                                                                                     ; 
-25>                                                                                                                                                                                                                       i
-26>                                                                                                                                                                                                                         < 
-27>                                                                                                                                                                                                                           1
-28>                                                                                                                                                                                                                            ; 
-29>                                                                                                                                                                                                                              i
-30>                                                                                                                                                                                                                               ++
-31>                                                                                                                                                                                                                                 ) 
-32>                                                                                                                                                                                                                                   {
+5 >     [numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"]
+6 >                                     
+7 >                                       numberA2 = -1
+8 >                                                   
+9 >                                                     numberA2 = -1
+10>                                                                                         , 
+11>                                                                                           nameA2 = "name"
+12>                                                                                                       
+13>                                                                                                         nameA2 = "name"
+14>                                                                                                                                               , 
+15>                                                                                                                                                 skillA2 = "skill"
+16>                                                                                                                                                             
+17>                                                                                                                                                               skillA2 = "skill"
+18>                                                                                                                                                                                                       ] = [2, "trimmer", "trimming"], 
+19>                                                                                                                                                                                                              i
+20>                                                                                                                                                                                                                = 
+21>                                                                                                                                                                                                                  0
+22>                                                                                                                                                                                                                   ; 
+23>                                                                                                                                                                                                                     i
+24>                                                                                                                                                                                                                       < 
+25>                                                                                                                                                                                                                         1
+26>                                                                                                                                                                                                                          ; 
+27>                                                                                                                                                                                                                            i
+28>                                                                                                                                                                                                                             ++
+29>                                                                                                                                                                                                                               ) 
+30>                                                                                                                                                                                                                                 {
 1->Emitted(57, 1) Source(77, 1) + SourceIndex(0)
 2 >Emitted(57, 4) Source(77, 4) + SourceIndex(0)
 3 >Emitted(57, 5) Source(77, 5) + SourceIndex(0)
 4 >Emitted(57, 6) Source(77, 6) + SourceIndex(0)
-5 >Emitted(57, 7) Source(77, 6) + SourceIndex(0)
-6 >Emitted(57, 39) Source(77, 86) + SourceIndex(0)
-7 >Emitted(57, 41) Source(77, 7) + SourceIndex(0)
-8 >Emitted(57, 53) Source(77, 20) + SourceIndex(0)
-9 >Emitted(57, 55) Source(77, 7) + SourceIndex(0)
-10>Emitted(57, 91) Source(77, 20) + SourceIndex(0)
-11>Emitted(57, 93) Source(77, 22) + SourceIndex(0)
-12>Emitted(57, 105) Source(77, 37) + SourceIndex(0)
-13>Emitted(57, 107) Source(77, 22) + SourceIndex(0)
-14>Emitted(57, 145) Source(77, 37) + SourceIndex(0)
-15>Emitted(57, 147) Source(77, 39) + SourceIndex(0)
-16>Emitted(57, 159) Source(77, 56) + SourceIndex(0)
-17>Emitted(57, 161) Source(77, 39) + SourceIndex(0)
-18>Emitted(57, 201) Source(77, 56) + SourceIndex(0)
-19>Emitted(57, 207) Source(77, 86) + SourceIndex(0)
-20>Emitted(57, 209) Source(77, 88) + SourceIndex(0)
-21>Emitted(57, 210) Source(77, 89) + SourceIndex(0)
-22>Emitted(57, 213) Source(77, 92) + SourceIndex(0)
-23>Emitted(57, 214) Source(77, 93) + SourceIndex(0)
-24>Emitted(57, 216) Source(77, 95) + SourceIndex(0)
-25>Emitted(57, 217) Source(77, 96) + SourceIndex(0)
-26>Emitted(57, 220) Source(77, 99) + SourceIndex(0)
-27>Emitted(57, 221) Source(77, 100) + SourceIndex(0)
-28>Emitted(57, 223) Source(77, 102) + SourceIndex(0)
-29>Emitted(57, 224) Source(77, 103) + SourceIndex(0)
-30>Emitted(57, 226) Source(77, 105) + SourceIndex(0)
-31>Emitted(57, 228) Source(77, 107) + SourceIndex(0)
-32>Emitted(57, 229) Source(77, 108) + SourceIndex(0)
+5 >Emitted(57, 38) Source(77, 86) + SourceIndex(0)
+6 >Emitted(57, 40) Source(77, 7) + SourceIndex(0)
+7 >Emitted(57, 52) Source(77, 20) + SourceIndex(0)
+8 >Emitted(57, 54) Source(77, 7) + SourceIndex(0)
+9 >Emitted(57, 90) Source(77, 20) + SourceIndex(0)
+10>Emitted(57, 92) Source(77, 22) + SourceIndex(0)
+11>Emitted(57, 104) Source(77, 37) + SourceIndex(0)
+12>Emitted(57, 106) Source(77, 22) + SourceIndex(0)
+13>Emitted(57, 144) Source(77, 37) + SourceIndex(0)
+14>Emitted(57, 146) Source(77, 39) + SourceIndex(0)
+15>Emitted(57, 158) Source(77, 56) + SourceIndex(0)
+16>Emitted(57, 160) Source(77, 39) + SourceIndex(0)
+17>Emitted(57, 200) Source(77, 56) + SourceIndex(0)
+18>Emitted(57, 207) Source(77, 88) + SourceIndex(0)
+19>Emitted(57, 208) Source(77, 89) + SourceIndex(0)
+20>Emitted(57, 211) Source(77, 92) + SourceIndex(0)
+21>Emitted(57, 212) Source(77, 93) + SourceIndex(0)
+22>Emitted(57, 214) Source(77, 95) + SourceIndex(0)
+23>Emitted(57, 215) Source(77, 96) + SourceIndex(0)
+24>Emitted(57, 218) Source(77, 99) + SourceIndex(0)
+25>Emitted(57, 219) Source(77, 100) + SourceIndex(0)
+26>Emitted(57, 221) Source(77, 102) + SourceIndex(0)
+27>Emitted(57, 222) Source(77, 103) + SourceIndex(0)
+28>Emitted(57, 224) Source(77, 105) + SourceIndex(0)
+29>Emitted(57, 226) Source(77, 107) + SourceIndex(0)
+30>Emitted(57, 227) Source(77, 108) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -2203,110 +2113,113 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                         ^^
-9 >                                                                           ^^^^^^^^^^^^^^^^^^^^
-10>                                                                                               ^^
-11>                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                              ^^
-13>                                                                                                                                                ^^^^^^^^^^^^
-14>                                                                                                                                                            ^^
-15>                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                ^^
-17>                                                                                                                                                                                                                  ^^^^^^^^^^^^
-18>                                                                                                                                                                                                                              ^^
-19>                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                      ^^
-21>                                                                                                                                                                                                                                                                                        ^^^
-22>                                                                                                                                                                                                                                                                                           ^^^
-23>                                                                                                                                                                                                                                                                                              ^
-24>                                                                                                                                                                                                                                                                                               ^^
-25>                                                                                                                                                                                                                                                                                                 ^^^
-26>                                                                                                                                                                                                                                                                                                    ^^^
-27>                                                                                                                                                                                                                                                                                                       ^
-28>                                                                                                                                                                                                                                                                                                        ^^
-29>                                                                                                                                                                                                                                                                                                          ^^^
-30>                                                                                                                                                                                                                                                                                                             ^^
-31>                                                                                                                                                                                                                                                                                                               ^^
-32>                                                                                                                                                                                                                                                                                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^
+7 >                             ^^
+8 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                         ^^
+10>                                                                           ^^^^^^^^^^^^^^^^^^^^
+11>                                                                                               ^^
+12>                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                              ^^
+14>                                                                                                                                                ^^^^^^^^^^^^
+15>                                                                                                                                                            ^^
+16>                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                                ^^
+18>                                                                                                                                                                                                                  ^^^^^^^^^^^^
+19>                                                                                                                                                                                                                              ^^
+20>                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21>                                                                                                                                                                                                                                                                                      ^^
+22>                                                                                                                                                                                                                                                                                        ^^^
+23>                                                                                                                                                                                                                                                                                           ^^^
+24>                                                                                                                                                                                                                                                                                              ^
+25>                                                                                                                                                                                                                                                                                               ^^
+26>                                                                                                                                                                                                                                                                                                 ^^^
+27>                                                                                                                                                                                                                                                                                                    ^^^
+28>                                                                                                                                                                                                                                                                                                       ^
+29>                                                                                                                                                                                                                                                                                                        ^^
+30>                                                                                                                                                                                                                                                                                                          ^^^
+31>                                                                                                                                                                                                                                                                                                             ^^
+32>                                                                                                                                                                                                                                                                                                               ^^
+33>                                                                                                                                                                                                                                                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (let
   >        [
-5 >     nameMA = "noName"
-6 >                             
-7 >                               nameMA = "noName"
-8 >                                                                         ,
+5 >     
+6 >         nameMA = "noName"
+7 >                             
+8 >                               nameMA = "noName"
+9 >                                                                         ,
   >                                                                                 
-9 >                                                                           [
+10>                                                                           [
   >                                                                                       primarySkillA = "primary",
   >                                                                                       secondarySkillA = "secondary"
   >                                                                                   ] = ["none", "none"]
-10>                                                                                               
-11>                                                                                                 [
+11>                                                                                               
+12>                                                                                                 [
   >                                                                                                             primarySkillA = "primary",
   >                                                                                                             secondarySkillA = "secondary"
   >                                                                                                         ] = ["none", "none"]
-12>                                                                                                                                              
-13>                                                                                                                                                primarySkillA = "primary"
-14>                                                                                                                                                            
-15>                                                                                                                                                              primarySkillA = "primary"
-16>                                                                                                                                                                                                                ,
+13>                                                                                                                                              
+14>                                                                                                                                                primarySkillA = "primary"
+15>                                                                                                                                                            
+16>                                                                                                                                                              primarySkillA = "primary"
+17>                                                                                                                                                                                                                ,
   >                                                                                                                                                                                                                            
-17>                                                                                                                                                                                                                  secondarySkillA = "secondary"
-18>                                                                                                                                                                                                                              
-19>                                                                                                                                                                                                                                secondarySkillA = "secondary"
-20>                                                                                                                                                                                                                                                                                      
+18>                                                                                                                                                                                                                  secondarySkillA = "secondary"
+19>                                                                                                                                                                                                                              
+20>                                                                                                                                                                                                                                secondarySkillA = "secondary"
+21>                                                                                                                                                                                                                                                                                      
   >                                                                                                                                                                                                                                                                                              ] = ["none", "none"]
   >                                                                                                                                                                                                                                                                                          ] = multiRobotA, 
-21>                                                                                                                                                                                                                                                                                        i
-22>                                                                                                                                                                                                                                                                                            = 
-23>                                                                                                                                                                                                                                                                                              0
-24>                                                                                                                                                                                                                                                                                               ; 
-25>                                                                                                                                                                                                                                                                                                 i
-26>                                                                                                                                                                                                                                                                                                     < 
-27>                                                                                                                                                                                                                                                                                                       1
-28>                                                                                                                                                                                                                                                                                                        ; 
-29>                                                                                                                                                                                                                                                                                                          i
-30>                                                                                                                                                                                                                                                                                                             ++
-31>                                                                                                                                                                                                                                                                                                               ) 
-32>                                                                                                                                                                                                                                                                                                                 {
+22>                                                                                                                                                                                                                                                                                        i
+23>                                                                                                                                                                                                                                                                                            = 
+24>                                                                                                                                                                                                                                                                                              0
+25>                                                                                                                                                                                                                                                                                               ; 
+26>                                                                                                                                                                                                                                                                                                 i
+27>                                                                                                                                                                                                                                                                                                     < 
+28>                                                                                                                                                                                                                                                                                                       1
+29>                                                                                                                                                                                                                                                                                                        ; 
+30>                                                                                                                                                                                                                                                                                                          i
+31>                                                                                                                                                                                                                                                                                                             ++
+32>                                                                                                                                                                                                                                                                                                               ) 
+33>                                                                                                                                                                                                                                                                                                                 {
 1->Emitted(60, 1) Source(80, 1) + SourceIndex(0)
 2 >Emitted(60, 4) Source(80, 4) + SourceIndex(0)
 3 >Emitted(60, 5) Source(80, 5) + SourceIndex(0)
 4 >Emitted(60, 6) Source(81, 6) + SourceIndex(0)
-5 >Emitted(60, 30) Source(81, 23) + SourceIndex(0)
-6 >Emitted(60, 32) Source(81, 6) + SourceIndex(0)
-7 >Emitted(60, 74) Source(81, 23) + SourceIndex(0)
-8 >Emitted(60, 76) Source(82, 9) + SourceIndex(0)
-9 >Emitted(60, 96) Source(85, 29) + SourceIndex(0)
-10>Emitted(60, 98) Source(82, 9) + SourceIndex(0)
-11>Emitted(60, 143) Source(85, 29) + SourceIndex(0)
-12>Emitted(60, 145) Source(83, 13) + SourceIndex(0)
-13>Emitted(60, 157) Source(83, 38) + SourceIndex(0)
-14>Emitted(60, 159) Source(83, 13) + SourceIndex(0)
-15>Emitted(60, 209) Source(83, 38) + SourceIndex(0)
-16>Emitted(60, 211) Source(84, 13) + SourceIndex(0)
-17>Emitted(60, 223) Source(84, 42) + SourceIndex(0)
-18>Emitted(60, 225) Source(84, 13) + SourceIndex(0)
-19>Emitted(60, 279) Source(84, 42) + SourceIndex(0)
-20>Emitted(60, 281) Source(86, 22) + SourceIndex(0)
-21>Emitted(60, 284) Source(86, 23) + SourceIndex(0)
-22>Emitted(60, 287) Source(86, 26) + SourceIndex(0)
-23>Emitted(60, 288) Source(86, 27) + SourceIndex(0)
-24>Emitted(60, 290) Source(86, 29) + SourceIndex(0)
-25>Emitted(60, 293) Source(86, 30) + SourceIndex(0)
-26>Emitted(60, 296) Source(86, 33) + SourceIndex(0)
-27>Emitted(60, 297) Source(86, 34) + SourceIndex(0)
-28>Emitted(60, 299) Source(86, 36) + SourceIndex(0)
-29>Emitted(60, 302) Source(86, 37) + SourceIndex(0)
-30>Emitted(60, 304) Source(86, 39) + SourceIndex(0)
-31>Emitted(60, 306) Source(86, 41) + SourceIndex(0)
-32>Emitted(60, 307) Source(86, 42) + SourceIndex(0)
+5 >Emitted(60, 10) Source(81, 6) + SourceIndex(0)
+6 >Emitted(60, 30) Source(81, 23) + SourceIndex(0)
+7 >Emitted(60, 32) Source(81, 6) + SourceIndex(0)
+8 >Emitted(60, 74) Source(81, 23) + SourceIndex(0)
+9 >Emitted(60, 76) Source(82, 9) + SourceIndex(0)
+10>Emitted(60, 96) Source(85, 29) + SourceIndex(0)
+11>Emitted(60, 98) Source(82, 9) + SourceIndex(0)
+12>Emitted(60, 143) Source(85, 29) + SourceIndex(0)
+13>Emitted(60, 145) Source(83, 13) + SourceIndex(0)
+14>Emitted(60, 157) Source(83, 38) + SourceIndex(0)
+15>Emitted(60, 159) Source(83, 13) + SourceIndex(0)
+16>Emitted(60, 209) Source(83, 38) + SourceIndex(0)
+17>Emitted(60, 211) Source(84, 13) + SourceIndex(0)
+18>Emitted(60, 223) Source(84, 42) + SourceIndex(0)
+19>Emitted(60, 225) Source(84, 13) + SourceIndex(0)
+20>Emitted(60, 279) Source(84, 42) + SourceIndex(0)
+21>Emitted(60, 281) Source(86, 22) + SourceIndex(0)
+22>Emitted(60, 284) Source(86, 23) + SourceIndex(0)
+23>Emitted(60, 287) Source(86, 26) + SourceIndex(0)
+24>Emitted(60, 288) Source(86, 27) + SourceIndex(0)
+25>Emitted(60, 290) Source(86, 29) + SourceIndex(0)
+26>Emitted(60, 293) Source(86, 30) + SourceIndex(0)
+27>Emitted(60, 296) Source(86, 33) + SourceIndex(0)
+28>Emitted(60, 297) Source(86, 34) + SourceIndex(0)
+29>Emitted(60, 299) Source(86, 36) + SourceIndex(0)
+30>Emitted(60, 302) Source(86, 37) + SourceIndex(0)
+31>Emitted(60, 304) Source(86, 39) + SourceIndex(0)
+32>Emitted(60, 306) Source(86, 41) + SourceIndex(0)
+33>Emitted(60, 307) Source(86, 42) + SourceIndex(0)
 ---
 >>>    console.log(nameMA_1);
 1 >^^^^
@@ -2338,138 +2251,132 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(62, 1) Source(88, 1) + SourceIndex(0)
 2 >Emitted(62, 2) Source(88, 2) + SourceIndex(0)
 ---
->>>for ((_21 = getMultiRobot(), _22 = _21[0], nameMA = _22 === void 0 ? "noName" : _22, _23 = _21[1], _24 = _23 === void 0 ? ["none", "none"] : _23, _25 = _24[0], primarySkillA = _25 === void 0 ? "primary" : _25, _26 = _24[1], secondarySkillA = _26 === void 0 ? "secondary" : _26, _21), i = 0; i < 1; i++) {
+>>>for (_21 = getMultiRobot(), _22 = _21[0], nameMA = _22 === void 0 ? "noName" : _22, _23 = _21[1], _24 = _23 === void 0 ? ["none", "none"] : _23, _25 = _24[0], primarySkillA = _25 === void 0 ? "primary" : _25, _26 = _24[1], secondarySkillA = _26 === void 0 ? "secondary" : _26, _21, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^
-7 >                           ^^
-8 >                             ^^^^^^^^^^^^
-9 >                                         ^^
-10>                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                   ^^
-12>                                                                                     ^^^^^^^^^^^^
-13>                                                                                                 ^^
-14>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                ^^
-16>                                                                                                                                                  ^^^^^^^^^^^^
-17>                                                                                                                                                              ^^
-18>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                ^^
-20>                                                                                                                                                                                                                  ^^^^^^^^^^^^
-21>                                                                                                                                                                                                                              ^^
-22>                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                    ^^^^^^
-24>                                                                                                                                                                                                                                                                                          ^^
-25>                                                                                                                                                                                                                                                                                            ^
-26>                                                                                                                                                                                                                                                                                             ^^^
-27>                                                                                                                                                                                                                                                                                                ^
-28>                                                                                                                                                                                                                                                                                                 ^^
-29>                                                                                                                                                                                                                                                                                                   ^
-30>                                                                                                                                                                                                                                                                                                    ^^^
-31>                                                                                                                                                                                                                                                                                                       ^
-32>                                                                                                                                                                                                                                                                                                        ^^
-33>                                                                                                                                                                                                                                                                                                          ^
-34>                                                                                                                                                                                                                                                                                                           ^^
-35>                                                                                                                                                                                                                                                                                                             ^^
-36>                                                                                                                                                                                                                                                                                                               ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^
+8 >                                        ^^
+9 >                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                  ^^
+11>                                                                                    ^^^^^^^^^^^^
+12>                                                                                                ^^
+13>                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                               ^^
+15>                                                                                                                                                 ^^^^^^^^^^^^
+16>                                                                                                                                                             ^^
+17>                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                               ^^
+19>                                                                                                                                                                                                                 ^^^^^^^^^^^^
+20>                                                                                                                                                                                                                             ^^
+21>                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                   ^^^^^^^
+23>                                                                                                                                                                                                                                                                                          ^
+24>                                                                                                                                                                                                                                                                                           ^^^
+25>                                                                                                                                                                                                                                                                                              ^
+26>                                                                                                                                                                                                                                                                                               ^^
+27>                                                                                                                                                                                                                                                                                                 ^
+28>                                                                                                                                                                                                                                                                                                  ^^^
+29>                                                                                                                                                                                                                                                                                                     ^
+30>                                                                                                                                                                                                                                                                                                      ^^
+31>                                                                                                                                                                                                                                                                                                        ^
+32>                                                                                                                                                                                                                                                                                                         ^^
+33>                                                                                                                                                                                                                                                                                                           ^^
+34>                                                                                                                                                                                                                                                                                                             ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameMA = "noName",
-  >          [
-  >              primarySkillA = "primary",
-  >              secondarySkillA = "secondary"
-  >          ] = ["none", "none"]
-  >      ] = getMultiRobot()
-7 >                           
-8 >                             nameMA = "noName"
-9 >                                         
-10>                                           nameMA = "noName"
-11>                                                                                   ,
-  >                                                                                       
-12>                                                                                     [
-  >                                                                                             primarySkillA = "primary",
-  >                                                                                             secondarySkillA = "secondary"
-  >                                                                                         ] = ["none", "none"]
-13>                                                                                                 
-14>                                                                                                   [
-  >                                                                                                           primarySkillA = "primary",
-  >                                                                                                           secondarySkillA = "secondary"
-  >                                                                                                       ] = ["none", "none"]
-15>                                                                                                                                                
-16>                                                                                                                                                  primarySkillA = "primary"
-17>                                                                                                                                                              
-18>                                                                                                                                                                primarySkillA = "primary"
-19>                                                                                                                                                                                                                ,
-  >                                                                                                                                                                                                                        
-20>                                                                                                                                                                                                                  secondarySkillA = "secondary"
-21>                                                                                                                                                                                                                              
-22>                                                                                                                                                                                                                                secondarySkillA = "secondary"
-23>                                                                                                                                                                                                                                                                                    
-  >                                                                                                                                                                                                                                                                                        ] = ["none", "none"]
-  >                                                                                                                                                                                                                                                                                    ] = getMultiRobot()
-24>                                                                                                                                                                                                                                                                                          , 
-25>                                                                                                                                                                                                                                                                                            i
-26>                                                                                                                                                                                                                                                                                              = 
-27>                                                                                                                                                                                                                                                                                                0
-28>                                                                                                                                                                                                                                                                                                 ; 
-29>                                                                                                                                                                                                                                                                                                   i
-30>                                                                                                                                                                                                                                                                                                     < 
-31>                                                                                                                                                                                                                                                                                                       1
-32>                                                                                                                                                                                                                                                                                                        ; 
-33>                                                                                                                                                                                                                                                                                                          i
-34>                                                                                                                                                                                                                                                                                                           ++
-35>                                                                                                                                                                                                                                                                                                             ) 
-36>                                                                                                                                                                                                                                                                                                               {
+5 >     [nameMA = "noName",
+  >         [
+  >             primarySkillA = "primary",
+  >             secondarySkillA = "secondary"
+  >         ] = ["none", "none"]
+  >     ] = getMultiRobot()
+6 >                          
+7 >                            nameMA = "noName"
+8 >                                        
+9 >                                          nameMA = "noName"
+10>                                                                                  ,
+  >                                                                                      
+11>                                                                                    [
+  >                                                                                            primarySkillA = "primary",
+  >                                                                                            secondarySkillA = "secondary"
+  >                                                                                        ] = ["none", "none"]
+12>                                                                                                
+13>                                                                                                  [
+  >                                                                                                          primarySkillA = "primary",
+  >                                                                                                          secondarySkillA = "secondary"
+  >                                                                                                      ] = ["none", "none"]
+14>                                                                                                                                               
+15>                                                                                                                                                 primarySkillA = "primary"
+16>                                                                                                                                                             
+17>                                                                                                                                                               primarySkillA = "primary"
+18>                                                                                                                                                                                                               ,
+  >                                                                                                                                                                                                                       
+19>                                                                                                                                                                                                                 secondarySkillA = "secondary"
+20>                                                                                                                                                                                                                             
+21>                                                                                                                                                                                                                               secondarySkillA = "secondary"
+22>                                                                                                                                                                                                                                                                                   
+  >                                                                                                                                                                                                                                                                                       ] = ["none", "none"]
+  >                                                                                                                                                                                                                                                                                   ] = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                          i
+24>                                                                                                                                                                                                                                                                                            = 
+25>                                                                                                                                                                                                                                                                                              0
+26>                                                                                                                                                                                                                                                                                               ; 
+27>                                                                                                                                                                                                                                                                                                 i
+28>                                                                                                                                                                                                                                                                                                   < 
+29>                                                                                                                                                                                                                                                                                                     1
+30>                                                                                                                                                                                                                                                                                                      ; 
+31>                                                                                                                                                                                                                                                                                                        i
+32>                                                                                                                                                                                                                                                                                                         ++
+33>                                                                                                                                                                                                                                                                                                           ) 
+34>                                                                                                                                                                                                                                                                                                             {
 1->Emitted(63, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(63, 4) Source(89, 4) + SourceIndex(0)
 3 >Emitted(63, 5) Source(89, 5) + SourceIndex(0)
 4 >Emitted(63, 6) Source(89, 6) + SourceIndex(0)
-5 >Emitted(63, 7) Source(89, 6) + SourceIndex(0)
-6 >Emitted(63, 28) Source(94, 20) + SourceIndex(0)
-7 >Emitted(63, 30) Source(89, 7) + SourceIndex(0)
-8 >Emitted(63, 42) Source(89, 24) + SourceIndex(0)
-9 >Emitted(63, 44) Source(89, 7) + SourceIndex(0)
-10>Emitted(63, 84) Source(89, 24) + SourceIndex(0)
-11>Emitted(63, 86) Source(90, 5) + SourceIndex(0)
-12>Emitted(63, 98) Source(93, 25) + SourceIndex(0)
-13>Emitted(63, 100) Source(90, 5) + SourceIndex(0)
-14>Emitted(63, 145) Source(93, 25) + SourceIndex(0)
-15>Emitted(63, 147) Source(91, 9) + SourceIndex(0)
-16>Emitted(63, 159) Source(91, 34) + SourceIndex(0)
-17>Emitted(63, 161) Source(91, 9) + SourceIndex(0)
-18>Emitted(63, 209) Source(91, 34) + SourceIndex(0)
-19>Emitted(63, 211) Source(92, 9) + SourceIndex(0)
-20>Emitted(63, 223) Source(92, 38) + SourceIndex(0)
-21>Emitted(63, 225) Source(92, 9) + SourceIndex(0)
-22>Emitted(63, 277) Source(92, 38) + SourceIndex(0)
-23>Emitted(63, 283) Source(94, 20) + SourceIndex(0)
-24>Emitted(63, 285) Source(94, 22) + SourceIndex(0)
-25>Emitted(63, 286) Source(94, 23) + SourceIndex(0)
-26>Emitted(63, 289) Source(94, 26) + SourceIndex(0)
-27>Emitted(63, 290) Source(94, 27) + SourceIndex(0)
-28>Emitted(63, 292) Source(94, 29) + SourceIndex(0)
-29>Emitted(63, 293) Source(94, 30) + SourceIndex(0)
-30>Emitted(63, 296) Source(94, 33) + SourceIndex(0)
-31>Emitted(63, 297) Source(94, 34) + SourceIndex(0)
-32>Emitted(63, 299) Source(94, 36) + SourceIndex(0)
-33>Emitted(63, 300) Source(94, 37) + SourceIndex(0)
-34>Emitted(63, 302) Source(94, 39) + SourceIndex(0)
-35>Emitted(63, 304) Source(94, 41) + SourceIndex(0)
-36>Emitted(63, 305) Source(94, 42) + SourceIndex(0)
+5 >Emitted(63, 27) Source(94, 20) + SourceIndex(0)
+6 >Emitted(63, 29) Source(89, 7) + SourceIndex(0)
+7 >Emitted(63, 41) Source(89, 24) + SourceIndex(0)
+8 >Emitted(63, 43) Source(89, 7) + SourceIndex(0)
+9 >Emitted(63, 83) Source(89, 24) + SourceIndex(0)
+10>Emitted(63, 85) Source(90, 5) + SourceIndex(0)
+11>Emitted(63, 97) Source(93, 25) + SourceIndex(0)
+12>Emitted(63, 99) Source(90, 5) + SourceIndex(0)
+13>Emitted(63, 144) Source(93, 25) + SourceIndex(0)
+14>Emitted(63, 146) Source(91, 9) + SourceIndex(0)
+15>Emitted(63, 158) Source(91, 34) + SourceIndex(0)
+16>Emitted(63, 160) Source(91, 9) + SourceIndex(0)
+17>Emitted(63, 208) Source(91, 34) + SourceIndex(0)
+18>Emitted(63, 210) Source(92, 9) + SourceIndex(0)
+19>Emitted(63, 222) Source(92, 38) + SourceIndex(0)
+20>Emitted(63, 224) Source(92, 9) + SourceIndex(0)
+21>Emitted(63, 276) Source(92, 38) + SourceIndex(0)
+22>Emitted(63, 283) Source(94, 22) + SourceIndex(0)
+23>Emitted(63, 284) Source(94, 23) + SourceIndex(0)
+24>Emitted(63, 287) Source(94, 26) + SourceIndex(0)
+25>Emitted(63, 288) Source(94, 27) + SourceIndex(0)
+26>Emitted(63, 290) Source(94, 29) + SourceIndex(0)
+27>Emitted(63, 291) Source(94, 30) + SourceIndex(0)
+28>Emitted(63, 294) Source(94, 33) + SourceIndex(0)
+29>Emitted(63, 295) Source(94, 34) + SourceIndex(0)
+30>Emitted(63, 297) Source(94, 36) + SourceIndex(0)
+31>Emitted(63, 298) Source(94, 37) + SourceIndex(0)
+32>Emitted(63, 300) Source(94, 39) + SourceIndex(0)
+33>Emitted(63, 302) Source(94, 41) + SourceIndex(0)
+34>Emitted(63, 303) Source(94, 42) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2501,138 +2408,132 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(65, 1) Source(96, 1) + SourceIndex(0)
 2 >Emitted(65, 2) Source(96, 2) + SourceIndex(0)
 ---
->>>for ((_27 = ["trimmer", ["trimming", "edging"]], _28 = _27[0], nameMA = _28 === void 0 ? "noName" : _28, _29 = _27[1], _30 = _29 === void 0 ? ["none", "none"] : _29, _31 = _30[0], primarySkillA = _31 === void 0 ? "primary" : _31, _32 = _30[1], secondarySkillA = _32 === void 0 ? "secondary" : _32, _27), i = 0; i < 1; i++) {
+>>>for (_27 = ["trimmer", ["trimming", "edging"]], _28 = _27[0], nameMA = _28 === void 0 ? "noName" : _28, _29 = _27[1], _30 = _29 === void 0 ? ["none", "none"] : _29, _31 = _30[0], primarySkillA = _31 === void 0 ? "primary" : _31, _32 = _30[1], secondarySkillA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                               ^^
-8 >                                                 ^^^^^^^^^^^^
-9 >                                                             ^^
-10>                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                       ^^
-12>                                                                                                         ^^^^^^^^^^^^
-13>                                                                                                                     ^^
-14>                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                    ^^
-16>                                                                                                                                                                      ^^^^^^^^^^^^
-17>                                                                                                                                                                                  ^^
-18>                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                    ^^
-20>                                                                                                                                                                                                                                      ^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                  ^^
-22>                                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                        ^^^^^^
-24>                                                                                                                                                                                                                                                                                                              ^^
-25>                                                                                                                                                                                                                                                                                                                ^
-26>                                                                                                                                                                                                                                                                                                                 ^^^
-27>                                                                                                                                                                                                                                                                                                                    ^
-28>                                                                                                                                                                                                                                                                                                                     ^^
-29>                                                                                                                                                                                                                                                                                                                       ^
-30>                                                                                                                                                                                                                                                                                                                        ^^^
-31>                                                                                                                                                                                                                                                                                                                           ^
-32>                                                                                                                                                                                                                                                                                                                            ^^
-33>                                                                                                                                                                                                                                                                                                                              ^
-34>                                                                                                                                                                                                                                                                                                                               ^^
-35>                                                                                                                                                                                                                                                                                                                                 ^^
-36>                                                                                                                                                                                                                                                                                                                                   ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                              ^^
+7 >                                                ^^^^^^^^^^^^
+8 >                                                            ^^
+9 >                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                      ^^
+11>                                                                                                        ^^^^^^^^^^^^
+12>                                                                                                                    ^^
+13>                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                   ^^
+15>                                                                                                                                                                     ^^^^^^^^^^^^
+16>                                                                                                                                                                                 ^^
+17>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                   ^^
+19>                                                                                                                                                                                                                                     ^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                 ^^
+21>                                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                       ^^^^^^^
+23>                                                                                                                                                                                                                                                                                                              ^
+24>                                                                                                                                                                                                                                                                                                               ^^^
+25>                                                                                                                                                                                                                                                                                                                  ^
+26>                                                                                                                                                                                                                                                                                                                   ^^
+27>                                                                                                                                                                                                                                                                                                                     ^
+28>                                                                                                                                                                                                                                                                                                                      ^^^
+29>                                                                                                                                                                                                                                                                                                                         ^
+30>                                                                                                                                                                                                                                                                                                                          ^^
+31>                                                                                                                                                                                                                                                                                                                            ^
+32>                                                                                                                                                                                                                                                                                                                             ^^
+33>                                                                                                                                                                                                                                                                                                                               ^^
+34>                                                                                                                                                                                                                                                                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [nameMA = "noName",
-  >          [
-  >              primarySkillA = "primary",
-  >              secondarySkillA = "secondary"
-  >          ] = ["none", "none"]
-  >      ] = ["trimmer", ["trimming", "edging"]]
-7 >                                               
-8 >                                                 nameMA = "noName"
-9 >                                                             
-10>                                                               nameMA = "noName"
-11>                                                                                                       ,
-  >                                                                                                           
-12>                                                                                                         [
-  >                                                                                                                 primarySkillA = "primary",
-  >                                                                                                                 secondarySkillA = "secondary"
-  >                                                                                                             ] = ["none", "none"]
-13>                                                                                                                     
-14>                                                                                                                       [
-  >                                                                                                                               primarySkillA = "primary",
-  >                                                                                                                               secondarySkillA = "secondary"
-  >                                                                                                                           ] = ["none", "none"]
-15>                                                                                                                                                                    
-16>                                                                                                                                                                      primarySkillA = "primary"
-17>                                                                                                                                                                                  
-18>                                                                                                                                                                                    primarySkillA = "primary"
-19>                                                                                                                                                                                                                                    ,
-  >                                                                                                                                                                                                                                            
-20>                                                                                                                                                                                                                                      secondarySkillA = "secondary"
-21>                                                                                                                                                                                                                                                  
-22>                                                                                                                                                                                                                                                    secondarySkillA = "secondary"
-23>                                                                                                                                                                                                                                                                                                        
-  >                                                                                                                                                                                                                                                                                                            ] = ["none", "none"]
-  >                                                                                                                                                                                                                                                                                                        ] = ["trimmer", ["trimming", "edging"]]
-24>                                                                                                                                                                                                                                                                                                              , 
-25>                                                                                                                                                                                                                                                                                                                i
-26>                                                                                                                                                                                                                                                                                                                  = 
-27>                                                                                                                                                                                                                                                                                                                    0
-28>                                                                                                                                                                                                                                                                                                                     ; 
-29>                                                                                                                                                                                                                                                                                                                       i
-30>                                                                                                                                                                                                                                                                                                                         < 
-31>                                                                                                                                                                                                                                                                                                                           1
-32>                                                                                                                                                                                                                                                                                                                            ; 
-33>                                                                                                                                                                                                                                                                                                                              i
-34>                                                                                                                                                                                                                                                                                                                               ++
-35>                                                                                                                                                                                                                                                                                                                                 ) 
-36>                                                                                                                                                                                                                                                                                                                                   {
+5 >     [nameMA = "noName",
+  >         [
+  >             primarySkillA = "primary",
+  >             secondarySkillA = "secondary"
+  >         ] = ["none", "none"]
+  >     ] = ["trimmer", ["trimming", "edging"]]
+6 >                                              
+7 >                                                nameMA = "noName"
+8 >                                                            
+9 >                                                              nameMA = "noName"
+10>                                                                                                      ,
+  >                                                                                                          
+11>                                                                                                        [
+  >                                                                                                                primarySkillA = "primary",
+  >                                                                                                                secondarySkillA = "secondary"
+  >                                                                                                            ] = ["none", "none"]
+12>                                                                                                                    
+13>                                                                                                                      [
+  >                                                                                                                              primarySkillA = "primary",
+  >                                                                                                                              secondarySkillA = "secondary"
+  >                                                                                                                          ] = ["none", "none"]
+14>                                                                                                                                                                   
+15>                                                                                                                                                                     primarySkillA = "primary"
+16>                                                                                                                                                                                 
+17>                                                                                                                                                                                   primarySkillA = "primary"
+18>                                                                                                                                                                                                                                   ,
+  >                                                                                                                                                                                                                                           
+19>                                                                                                                                                                                                                                     secondarySkillA = "secondary"
+20>                                                                                                                                                                                                                                                 
+21>                                                                                                                                                                                                                                                   secondarySkillA = "secondary"
+22>                                                                                                                                                                                                                                                                                                       
+  >                                                                                                                                                                                                                                                                                                           ] = ["none", "none"]
+  >                                                                                                                                                                                                                                                                                                       ] = ["trimmer", ["trimming", "edging"]], 
+23>                                                                                                                                                                                                                                                                                                              i
+24>                                                                                                                                                                                                                                                                                                                = 
+25>                                                                                                                                                                                                                                                                                                                  0
+26>                                                                                                                                                                                                                                                                                                                   ; 
+27>                                                                                                                                                                                                                                                                                                                     i
+28>                                                                                                                                                                                                                                                                                                                       < 
+29>                                                                                                                                                                                                                                                                                                                         1
+30>                                                                                                                                                                                                                                                                                                                          ; 
+31>                                                                                                                                                                                                                                                                                                                            i
+32>                                                                                                                                                                                                                                                                                                                             ++
+33>                                                                                                                                                                                                                                                                                                                               ) 
+34>                                                                                                                                                                                                                                                                                                                                 {
 1->Emitted(66, 1) Source(97, 1) + SourceIndex(0)
 2 >Emitted(66, 4) Source(97, 4) + SourceIndex(0)
 3 >Emitted(66, 5) Source(97, 5) + SourceIndex(0)
 4 >Emitted(66, 6) Source(97, 6) + SourceIndex(0)
-5 >Emitted(66, 7) Source(97, 6) + SourceIndex(0)
-6 >Emitted(66, 48) Source(102, 40) + SourceIndex(0)
-7 >Emitted(66, 50) Source(97, 7) + SourceIndex(0)
-8 >Emitted(66, 62) Source(97, 24) + SourceIndex(0)
-9 >Emitted(66, 64) Source(97, 7) + SourceIndex(0)
-10>Emitted(66, 104) Source(97, 24) + SourceIndex(0)
-11>Emitted(66, 106) Source(98, 5) + SourceIndex(0)
-12>Emitted(66, 118) Source(101, 25) + SourceIndex(0)
-13>Emitted(66, 120) Source(98, 5) + SourceIndex(0)
-14>Emitted(66, 165) Source(101, 25) + SourceIndex(0)
-15>Emitted(66, 167) Source(99, 9) + SourceIndex(0)
-16>Emitted(66, 179) Source(99, 34) + SourceIndex(0)
-17>Emitted(66, 181) Source(99, 9) + SourceIndex(0)
-18>Emitted(66, 229) Source(99, 34) + SourceIndex(0)
-19>Emitted(66, 231) Source(100, 9) + SourceIndex(0)
-20>Emitted(66, 243) Source(100, 38) + SourceIndex(0)
-21>Emitted(66, 245) Source(100, 9) + SourceIndex(0)
-22>Emitted(66, 297) Source(100, 38) + SourceIndex(0)
-23>Emitted(66, 303) Source(102, 40) + SourceIndex(0)
-24>Emitted(66, 305) Source(102, 42) + SourceIndex(0)
-25>Emitted(66, 306) Source(102, 43) + SourceIndex(0)
-26>Emitted(66, 309) Source(102, 46) + SourceIndex(0)
-27>Emitted(66, 310) Source(102, 47) + SourceIndex(0)
-28>Emitted(66, 312) Source(102, 49) + SourceIndex(0)
-29>Emitted(66, 313) Source(102, 50) + SourceIndex(0)
-30>Emitted(66, 316) Source(102, 53) + SourceIndex(0)
-31>Emitted(66, 317) Source(102, 54) + SourceIndex(0)
-32>Emitted(66, 319) Source(102, 56) + SourceIndex(0)
-33>Emitted(66, 320) Source(102, 57) + SourceIndex(0)
-34>Emitted(66, 322) Source(102, 59) + SourceIndex(0)
-35>Emitted(66, 324) Source(102, 61) + SourceIndex(0)
-36>Emitted(66, 325) Source(102, 62) + SourceIndex(0)
+5 >Emitted(66, 47) Source(102, 40) + SourceIndex(0)
+6 >Emitted(66, 49) Source(97, 7) + SourceIndex(0)
+7 >Emitted(66, 61) Source(97, 24) + SourceIndex(0)
+8 >Emitted(66, 63) Source(97, 7) + SourceIndex(0)
+9 >Emitted(66, 103) Source(97, 24) + SourceIndex(0)
+10>Emitted(66, 105) Source(98, 5) + SourceIndex(0)
+11>Emitted(66, 117) Source(101, 25) + SourceIndex(0)
+12>Emitted(66, 119) Source(98, 5) + SourceIndex(0)
+13>Emitted(66, 164) Source(101, 25) + SourceIndex(0)
+14>Emitted(66, 166) Source(99, 9) + SourceIndex(0)
+15>Emitted(66, 178) Source(99, 34) + SourceIndex(0)
+16>Emitted(66, 180) Source(99, 9) + SourceIndex(0)
+17>Emitted(66, 228) Source(99, 34) + SourceIndex(0)
+18>Emitted(66, 230) Source(100, 9) + SourceIndex(0)
+19>Emitted(66, 242) Source(100, 38) + SourceIndex(0)
+20>Emitted(66, 244) Source(100, 9) + SourceIndex(0)
+21>Emitted(66, 296) Source(100, 38) + SourceIndex(0)
+22>Emitted(66, 303) Source(102, 42) + SourceIndex(0)
+23>Emitted(66, 304) Source(102, 43) + SourceIndex(0)
+24>Emitted(66, 307) Source(102, 46) + SourceIndex(0)
+25>Emitted(66, 308) Source(102, 47) + SourceIndex(0)
+26>Emitted(66, 310) Source(102, 49) + SourceIndex(0)
+27>Emitted(66, 311) Source(102, 50) + SourceIndex(0)
+28>Emitted(66, 314) Source(102, 53) + SourceIndex(0)
+29>Emitted(66, 315) Source(102, 54) + SourceIndex(0)
+30>Emitted(66, 317) Source(102, 56) + SourceIndex(0)
+31>Emitted(66, 318) Source(102, 57) + SourceIndex(0)
+32>Emitted(66, 320) Source(102, 59) + SourceIndex(0)
+33>Emitted(66, 322) Source(102, 61) + SourceIndex(0)
+34>Emitted(66, 323) Source(102, 62) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2664,94 +2565,88 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(68, 1) Source(104, 1) + SourceIndex(0)
 2 >Emitted(68, 2) Source(104, 2) + SourceIndex(0)
 ---
->>>for ((_33 = robotA[0], numberA3 = _33 === void 0 ? -1 : _33, robotAInfo = robotA.slice(1), robotA), i = 0; i < 1; i++) {
+>>>for (_33 = robotA[0], numberA3 = _33 === void 0 ? -1 : _33, robotAInfo = robotA.slice(1), robotA, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                           ^^
-10>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                         ^^
-12>                                                                                           ^^^^^^
-13>                                                                                                 ^
-14>                                                                                                  ^^
-15>                                                                                                    ^
-16>                                                                                                     ^^^
-17>                                                                                                        ^
-18>                                                                                                         ^^
-19>                                                                                                           ^
-20>                                                                                                            ^^^
-21>                                                                                                               ^
-22>                                                                                                                ^^
-23>                                                                                                                  ^
-24>                                                                                                                   ^^
-25>                                                                                                                     ^^
-26>                                                                                                                       ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                          ^^
+9 >                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                        ^^
+11>                                                                                          ^^^^^^
+12>                                                                                                ^^
+13>                                                                                                  ^
+14>                                                                                                   ^^^
+15>                                                                                                      ^
+16>                                                                                                       ^^
+17>                                                                                                         ^
+18>                                                                                                          ^^^
+19>                                                                                                             ^
+20>                                                                                                              ^^
+21>                                                                                                                ^
+22>                                                                                                                 ^^
+23>                                                                                                                   ^^
+24>                                                                                                                     ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     [
-6 >      numberA3 = -1
-7 >                     
-8 >                       numberA3 = -1
-9 >                                                           , 
-10>                                                             ...robotAInfo
-11>                                                                                         ] = 
-12>                                                                                           robotA
-13>                                                                                                 
-14>                                                                                                  , 
-15>                                                                                                    i
-16>                                                                                                      = 
-17>                                                                                                        0
-18>                                                                                                         ; 
-19>                                                                                                           i
-20>                                                                                                             < 
-21>                                                                                                               1
-22>                                                                                                                ; 
-23>                                                                                                                  i
-24>                                                                                                                   ++
-25>                                                                                                                     ) 
-26>                                                                                                                       {
+4 >    ([
+5 >     numberA3 = -1
+6 >                    
+7 >                      numberA3 = -1
+8 >                                                          , 
+9 >                                                            ...robotAInfo
+10>                                                                                        ] = 
+11>                                                                                          robotA
+12>                                                                                                , 
+13>                                                                                                  i
+14>                                                                                                    = 
+15>                                                                                                      0
+16>                                                                                                       ; 
+17>                                                                                                         i
+18>                                                                                                           < 
+19>                                                                                                             1
+20>                                                                                                              ; 
+21>                                                                                                                i
+22>                                                                                                                 ++
+23>                                                                                                                   ) 
+24>                                                                                                                     {
 1->Emitted(69, 1) Source(106, 1) + SourceIndex(0)
 2 >Emitted(69, 4) Source(106, 4) + SourceIndex(0)
 3 >Emitted(69, 5) Source(106, 5) + SourceIndex(0)
-4 >Emitted(69, 6) Source(106, 6) + SourceIndex(0)
-5 >Emitted(69, 7) Source(106, 7) + SourceIndex(0)
-6 >Emitted(69, 22) Source(106, 20) + SourceIndex(0)
-7 >Emitted(69, 24) Source(106, 7) + SourceIndex(0)
-8 >Emitted(69, 60) Source(106, 20) + SourceIndex(0)
-9 >Emitted(69, 62) Source(106, 22) + SourceIndex(0)
-10>Emitted(69, 90) Source(106, 35) + SourceIndex(0)
-11>Emitted(69, 92) Source(106, 39) + SourceIndex(0)
-12>Emitted(69, 98) Source(106, 45) + SourceIndex(0)
-13>Emitted(69, 99) Source(106, 45) + SourceIndex(0)
-14>Emitted(69, 101) Source(106, 47) + SourceIndex(0)
-15>Emitted(69, 102) Source(106, 48) + SourceIndex(0)
-16>Emitted(69, 105) Source(106, 51) + SourceIndex(0)
-17>Emitted(69, 106) Source(106, 52) + SourceIndex(0)
-18>Emitted(69, 108) Source(106, 54) + SourceIndex(0)
-19>Emitted(69, 109) Source(106, 55) + SourceIndex(0)
-20>Emitted(69, 112) Source(106, 58) + SourceIndex(0)
-21>Emitted(69, 113) Source(106, 59) + SourceIndex(0)
-22>Emitted(69, 115) Source(106, 61) + SourceIndex(0)
-23>Emitted(69, 116) Source(106, 62) + SourceIndex(0)
-24>Emitted(69, 118) Source(106, 64) + SourceIndex(0)
-25>Emitted(69, 120) Source(106, 66) + SourceIndex(0)
-26>Emitted(69, 121) Source(106, 67) + SourceIndex(0)
+4 >Emitted(69, 6) Source(106, 7) + SourceIndex(0)
+5 >Emitted(69, 21) Source(106, 20) + SourceIndex(0)
+6 >Emitted(69, 23) Source(106, 7) + SourceIndex(0)
+7 >Emitted(69, 59) Source(106, 20) + SourceIndex(0)
+8 >Emitted(69, 61) Source(106, 22) + SourceIndex(0)
+9 >Emitted(69, 89) Source(106, 35) + SourceIndex(0)
+10>Emitted(69, 91) Source(106, 39) + SourceIndex(0)
+11>Emitted(69, 97) Source(106, 45) + SourceIndex(0)
+12>Emitted(69, 99) Source(106, 47) + SourceIndex(0)
+13>Emitted(69, 100) Source(106, 48) + SourceIndex(0)
+14>Emitted(69, 103) Source(106, 51) + SourceIndex(0)
+15>Emitted(69, 104) Source(106, 52) + SourceIndex(0)
+16>Emitted(69, 106) Source(106, 54) + SourceIndex(0)
+17>Emitted(69, 107) Source(106, 55) + SourceIndex(0)
+18>Emitted(69, 110) Source(106, 58) + SourceIndex(0)
+19>Emitted(69, 111) Source(106, 59) + SourceIndex(0)
+20>Emitted(69, 113) Source(106, 61) + SourceIndex(0)
+21>Emitted(69, 114) Source(106, 62) + SourceIndex(0)
+22>Emitted(69, 116) Source(106, 64) + SourceIndex(0)
+23>Emitted(69, 118) Source(106, 66) + SourceIndex(0)
+24>Emitted(69, 119) Source(106, 67) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2783,93 +2678,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(71, 1) Source(108, 1) + SourceIndex(0)
 2 >Emitted(71, 2) Source(108, 2) + SourceIndex(0)
 ---
->>>for ((_34 = getRobot(), _35 = _34[0], numberA3 = _35 === void 0 ? -1 : _35, robotAInfo = _34.slice(1), _34), i = 0; i < 1; i++) {
+>>>for (_34 = getRobot(), _35 = _34[0], numberA3 = _35 === void 0 ? -1 : _35, robotAInfo = _34.slice(1), _34, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^
-7 >                      ^^
-8 >                        ^^^^^^^^^^^^
-9 >                                    ^^
-10>                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                          ^^
-12>                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                     ^^^^^^
-14>                                                                                                           ^^
-15>                                                                                                             ^
-16>                                                                                                              ^^^
-17>                                                                                                                 ^
-18>                                                                                                                  ^^
-19>                                                                                                                    ^
-20>                                                                                                                     ^^^
-21>                                                                                                                        ^
-22>                                                                                                                         ^^
-23>                                                                                                                           ^
-24>                                                                                                                            ^^
-25>                                                                                                                              ^^
-26>                                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^
+6 >                     ^^
+7 >                       ^^^^^^^^^^^^
+8 >                                   ^^
+9 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                         ^^
+11>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                    ^^^^^^^
+13>                                                                                                           ^
+14>                                                                                                            ^^^
+15>                                                                                                               ^
+16>                                                                                                                ^^
+17>                                                                                                                  ^
+18>                                                                                                                   ^^^
+19>                                                                                                                      ^
+20>                                                                                                                       ^^
+21>                                                                                                                         ^
+22>                                                                                                                          ^^
+23>                                                                                                                            ^^
+24>                                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA3 = -1, ...robotAInfo] = getRobot()
-7 >                      
-8 >                        numberA3 = -1
-9 >                                    
-10>                                      numberA3 = -1
-11>                                                                          , 
-12>                                                                            ...robotAInfo
-13>                                                                                                     ] = getRobot()
-14>                                                                                                           , 
-15>                                                                                                             i
-16>                                                                                                               = 
-17>                                                                                                                 0
-18>                                                                                                                  ; 
-19>                                                                                                                    i
-20>                                                                                                                      < 
-21>                                                                                                                        1
-22>                                                                                                                         ; 
-23>                                                                                                                           i
-24>                                                                                                                            ++
-25>                                                                                                                              ) 
-26>                                                                                                                                {
+5 >     [numberA3 = -1, ...robotAInfo] = getRobot()
+6 >                     
+7 >                       numberA3 = -1
+8 >                                   
+9 >                                     numberA3 = -1
+10>                                                                         , 
+11>                                                                           ...robotAInfo
+12>                                                                                                    ] = getRobot(), 
+13>                                                                                                           i
+14>                                                                                                             = 
+15>                                                                                                               0
+16>                                                                                                                ; 
+17>                                                                                                                  i
+18>                                                                                                                    < 
+19>                                                                                                                      1
+20>                                                                                                                       ; 
+21>                                                                                                                         i
+22>                                                                                                                          ++
+23>                                                                                                                            ) 
+24>                                                                                                                              {
 1->Emitted(72, 1) Source(109, 1) + SourceIndex(0)
 2 >Emitted(72, 4) Source(109, 4) + SourceIndex(0)
 3 >Emitted(72, 5) Source(109, 5) + SourceIndex(0)
 4 >Emitted(72, 6) Source(109, 6) + SourceIndex(0)
-5 >Emitted(72, 7) Source(109, 6) + SourceIndex(0)
-6 >Emitted(72, 23) Source(109, 49) + SourceIndex(0)
-7 >Emitted(72, 25) Source(109, 7) + SourceIndex(0)
-8 >Emitted(72, 37) Source(109, 20) + SourceIndex(0)
-9 >Emitted(72, 39) Source(109, 7) + SourceIndex(0)
-10>Emitted(72, 75) Source(109, 20) + SourceIndex(0)
-11>Emitted(72, 77) Source(109, 22) + SourceIndex(0)
-12>Emitted(72, 102) Source(109, 35) + SourceIndex(0)
-13>Emitted(72, 108) Source(109, 49) + SourceIndex(0)
-14>Emitted(72, 110) Source(109, 51) + SourceIndex(0)
-15>Emitted(72, 111) Source(109, 52) + SourceIndex(0)
-16>Emitted(72, 114) Source(109, 55) + SourceIndex(0)
-17>Emitted(72, 115) Source(109, 56) + SourceIndex(0)
-18>Emitted(72, 117) Source(109, 58) + SourceIndex(0)
-19>Emitted(72, 118) Source(109, 59) + SourceIndex(0)
-20>Emitted(72, 121) Source(109, 62) + SourceIndex(0)
-21>Emitted(72, 122) Source(109, 63) + SourceIndex(0)
-22>Emitted(72, 124) Source(109, 65) + SourceIndex(0)
-23>Emitted(72, 125) Source(109, 66) + SourceIndex(0)
-24>Emitted(72, 127) Source(109, 68) + SourceIndex(0)
-25>Emitted(72, 129) Source(109, 70) + SourceIndex(0)
-26>Emitted(72, 130) Source(109, 71) + SourceIndex(0)
+5 >Emitted(72, 22) Source(109, 49) + SourceIndex(0)
+6 >Emitted(72, 24) Source(109, 7) + SourceIndex(0)
+7 >Emitted(72, 36) Source(109, 20) + SourceIndex(0)
+8 >Emitted(72, 38) Source(109, 7) + SourceIndex(0)
+9 >Emitted(72, 74) Source(109, 20) + SourceIndex(0)
+10>Emitted(72, 76) Source(109, 22) + SourceIndex(0)
+11>Emitted(72, 101) Source(109, 35) + SourceIndex(0)
+12>Emitted(72, 108) Source(109, 51) + SourceIndex(0)
+13>Emitted(72, 109) Source(109, 52) + SourceIndex(0)
+14>Emitted(72, 112) Source(109, 55) + SourceIndex(0)
+15>Emitted(72, 113) Source(109, 56) + SourceIndex(0)
+16>Emitted(72, 115) Source(109, 58) + SourceIndex(0)
+17>Emitted(72, 116) Source(109, 59) + SourceIndex(0)
+18>Emitted(72, 119) Source(109, 62) + SourceIndex(0)
+19>Emitted(72, 120) Source(109, 63) + SourceIndex(0)
+20>Emitted(72, 122) Source(109, 65) + SourceIndex(0)
+21>Emitted(72, 123) Source(109, 66) + SourceIndex(0)
+22>Emitted(72, 125) Source(109, 68) + SourceIndex(0)
+23>Emitted(72, 127) Source(109, 70) + SourceIndex(0)
+24>Emitted(72, 128) Source(109, 71) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2901,93 +2790,87 @@ sourceFile:sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(74, 1) Source(111, 1) + SourceIndex(0)
 2 >Emitted(74, 2) Source(111, 2) + SourceIndex(0)
 ---
->>>for ((_36 = [2, "trimmer", "trimming"], _37 = _36[0], numberA3 = _37 === void 0 ? -1 : _37, robotAInfo = _36.slice(1), _36), i = 0; i < 1; i++) {
+>>>for (_36 = [2, "trimmer", "trimming"], _37 = _36[0], numberA3 = _37 === void 0 ? -1 : _37, robotAInfo = _36.slice(1), _36, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                      ^^
-8 >                                        ^^^^^^^^^^^^
-9 >                                                    ^^
-10>                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                          ^^
-12>                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                     ^^^^^^
-14>                                                                                                                           ^^
-15>                                                                                                                             ^
-16>                                                                                                                              ^^^
-17>                                                                                                                                 ^
-18>                                                                                                                                  ^^
-19>                                                                                                                                    ^
-20>                                                                                                                                     ^^^
-21>                                                                                                                                        ^
-22>                                                                                                                                         ^^
-23>                                                                                                                                           ^
-24>                                                                                                                                            ^^
-25>                                                                                                                                              ^^
-26>                                                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                     ^^
+7 >                                       ^^^^^^^^^^^^
+8 >                                                   ^^
+9 >                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                         ^^
+11>                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                    ^^^^^^^
+13>                                                                                                                           ^
+14>                                                                                                                            ^^^
+15>                                                                                                                               ^
+16>                                                                                                                                ^^
+17>                                                                                                                                  ^
+18>                                                                                                                                   ^^^
+19>                                                                                                                                      ^
+20>                                                                                                                                       ^^
+21>                                                                                                                                         ^
+22>                                                                                                                                          ^^
+23>                                                                                                                                            ^^
+24>                                                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      [numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"]
-7 >                                      
-8 >                                        numberA3 = -1
-9 >                                                    
-10>                                                      numberA3 = -1
-11>                                                                                          , 
-12>                                                                                            ...robotAInfo
-13>                                                                                                                     ] = <Robot>[2, "trimmer", "trimming"]
-14>                                                                                                                           , 
-15>                                                                                                                             i
-16>                                                                                                                               = 
-17>                                                                                                                                 0
-18>                                                                                                                                  ; 
-19>                                                                                                                                    i
-20>                                                                                                                                      < 
-21>                                                                                                                                        1
-22>                                                                                                                                         ; 
-23>                                                                                                                                           i
-24>                                                                                                                                            ++
-25>                                                                                                                                              ) 
-26>                                                                                                                                                {
+5 >     [numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"]
+6 >                                     
+7 >                                       numberA3 = -1
+8 >                                                   
+9 >                                                     numberA3 = -1
+10>                                                                                         , 
+11>                                                                                           ...robotAInfo
+12>                                                                                                                    ] = <Robot>[2, "trimmer", "trimming"], 
+13>                                                                                                                           i
+14>                                                                                                                             = 
+15>                                                                                                                               0
+16>                                                                                                                                ; 
+17>                                                                                                                                  i
+18>                                                                                                                                    < 
+19>                                                                                                                                      1
+20>                                                                                                                                       ; 
+21>                                                                                                                                         i
+22>                                                                                                                                          ++
+23>                                                                                                                                            ) 
+24>                                                                                                                                              {
 1->Emitted(75, 1) Source(112, 1) + SourceIndex(0)
 2 >Emitted(75, 4) Source(112, 4) + SourceIndex(0)
 3 >Emitted(75, 5) Source(112, 5) + SourceIndex(0)
 4 >Emitted(75, 6) Source(112, 6) + SourceIndex(0)
-5 >Emitted(75, 7) Source(112, 6) + SourceIndex(0)
-6 >Emitted(75, 39) Source(112, 72) + SourceIndex(0)
-7 >Emitted(75, 41) Source(112, 7) + SourceIndex(0)
-8 >Emitted(75, 53) Source(112, 20) + SourceIndex(0)
-9 >Emitted(75, 55) Source(112, 7) + SourceIndex(0)
-10>Emitted(75, 91) Source(112, 20) + SourceIndex(0)
-11>Emitted(75, 93) Source(112, 22) + SourceIndex(0)
-12>Emitted(75, 118) Source(112, 35) + SourceIndex(0)
-13>Emitted(75, 124) Source(112, 72) + SourceIndex(0)
-14>Emitted(75, 126) Source(112, 74) + SourceIndex(0)
-15>Emitted(75, 127) Source(112, 75) + SourceIndex(0)
-16>Emitted(75, 130) Source(112, 78) + SourceIndex(0)
-17>Emitted(75, 131) Source(112, 79) + SourceIndex(0)
-18>Emitted(75, 133) Source(112, 81) + SourceIndex(0)
-19>Emitted(75, 134) Source(112, 82) + SourceIndex(0)
-20>Emitted(75, 137) Source(112, 85) + SourceIndex(0)
-21>Emitted(75, 138) Source(112, 86) + SourceIndex(0)
-22>Emitted(75, 140) Source(112, 88) + SourceIndex(0)
-23>Emitted(75, 141) Source(112, 89) + SourceIndex(0)
-24>Emitted(75, 143) Source(112, 91) + SourceIndex(0)
-25>Emitted(75, 145) Source(112, 93) + SourceIndex(0)
-26>Emitted(75, 146) Source(112, 94) + SourceIndex(0)
+5 >Emitted(75, 38) Source(112, 72) + SourceIndex(0)
+6 >Emitted(75, 40) Source(112, 7) + SourceIndex(0)
+7 >Emitted(75, 52) Source(112, 20) + SourceIndex(0)
+8 >Emitted(75, 54) Source(112, 7) + SourceIndex(0)
+9 >Emitted(75, 90) Source(112, 20) + SourceIndex(0)
+10>Emitted(75, 92) Source(112, 22) + SourceIndex(0)
+11>Emitted(75, 117) Source(112, 35) + SourceIndex(0)
+12>Emitted(75, 124) Source(112, 74) + SourceIndex(0)
+13>Emitted(75, 125) Source(112, 75) + SourceIndex(0)
+14>Emitted(75, 128) Source(112, 78) + SourceIndex(0)
+15>Emitted(75, 129) Source(112, 79) + SourceIndex(0)
+16>Emitted(75, 131) Source(112, 81) + SourceIndex(0)
+17>Emitted(75, 132) Source(112, 82) + SourceIndex(0)
+18>Emitted(75, 135) Source(112, 85) + SourceIndex(0)
+19>Emitted(75, 136) Source(112, 86) + SourceIndex(0)
+20>Emitted(75, 138) Source(112, 88) + SourceIndex(0)
+21>Emitted(75, 139) Source(112, 89) + SourceIndex(0)
+22>Emitted(75, 141) Source(112, 91) + SourceIndex(0)
+23>Emitted(75, 143) Source(112, 93) + SourceIndex(0)
+24>Emitted(75, 144) Source(112, 94) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.js.map
index d9f2e446f04..a0295550f0b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForObjectBindingPattern.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPattern.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,GAAG,CAAC,CAAM,sBAAW,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,2BAAW,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,uDAAW,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAO,0BAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAO,+BAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAO,yFAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAEzD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAM,sBAAW,EAAE,oBAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAA8C,EAAzC,eAAW,EAAE,iBAAa,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,2CAAiF,EAA5E,eAAW,EAAE,iBAAa,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,2BAAW,EAAE,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5G,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,oBAA0F,EAArF,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,8EACoF,EAD/E,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAErE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPattern.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,kBAAW,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,uBAAW,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,mDAAW,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAO,IAAA,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAO,IAAA,2BAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAO,IAAA,qFAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAEzD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,kBAAW,EAAE,oBAAa,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAA0C,EAAzC,eAAW,EAAE,iBAAa,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,2CAA6E,EAA5E,eAAW,EAAE,iBAAa,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,uBAAW,EAAE,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5G,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,oBAAsF,EAArF,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,8EACgF,EAD/E,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAErE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.sourcemap.txt
index 61689b46799..5ea0b7e360d 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.sourcemap.txt
@@ -213,58 +213,61 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^
-6 >                           ^^
-7 >                             ^
-8 >                              ^^^
-9 >                                 ^
-10>                                  ^^
-11>                                    ^
-12>                                     ^^^
-13>                                        ^
-14>                                         ^^
-15>                                           ^
-16>                                            ^^
-17>                                              ^^
-18>                                                ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^
+7 >                           ^^
+8 >                             ^
+9 >                              ^^^
+10>                                 ^
+11>                                  ^^
+12>                                    ^
+13>                                     ^^^
+14>                                        ^
+15>                                         ^^
+16>                                           ^
+17>                                            ^^
+18>                                              ^^
+19>                                                ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA
-6 >                            } = robot, 
-7 >                             i
-8 >                               = 
-9 >                                 0
-10>                                  ; 
-11>                                    i
-12>                                      < 
-13>                                        1
-14>                                         ; 
-15>                                           i
-16>                                            ++
-17>                                              ) 
-18>                                                {
+5 >     
+6 >         name: nameA
+7 >                            } = robot, 
+8 >                             i
+9 >                               = 
+10>                                 0
+11>                                  ; 
+12>                                    i
+13>                                      < 
+14>                                        1
+15>                                         ; 
+16>                                           i
+17>                                            ++
+18>                                              ) 
+19>                                                {
 1->Emitted(9, 1) Source(26, 1) + SourceIndex(0)
 2 >Emitted(9, 4) Source(26, 4) + SourceIndex(0)
 3 >Emitted(9, 5) Source(26, 5) + SourceIndex(0)
 4 >Emitted(9, 6) Source(26, 11) + SourceIndex(0)
-5 >Emitted(9, 28) Source(26, 22) + SourceIndex(0)
-6 >Emitted(9, 30) Source(26, 34) + SourceIndex(0)
-7 >Emitted(9, 31) Source(26, 35) + SourceIndex(0)
-8 >Emitted(9, 34) Source(26, 38) + SourceIndex(0)
-9 >Emitted(9, 35) Source(26, 39) + SourceIndex(0)
-10>Emitted(9, 37) Source(26, 41) + SourceIndex(0)
-11>Emitted(9, 38) Source(26, 42) + SourceIndex(0)
-12>Emitted(9, 41) Source(26, 45) + SourceIndex(0)
-13>Emitted(9, 42) Source(26, 46) + SourceIndex(0)
-14>Emitted(9, 44) Source(26, 48) + SourceIndex(0)
-15>Emitted(9, 45) Source(26, 49) + SourceIndex(0)
-16>Emitted(9, 47) Source(26, 51) + SourceIndex(0)
-17>Emitted(9, 49) Source(26, 53) + SourceIndex(0)
-18>Emitted(9, 50) Source(26, 54) + SourceIndex(0)
+5 >Emitted(9, 10) Source(26, 11) + SourceIndex(0)
+6 >Emitted(9, 28) Source(26, 22) + SourceIndex(0)
+7 >Emitted(9, 30) Source(26, 34) + SourceIndex(0)
+8 >Emitted(9, 31) Source(26, 35) + SourceIndex(0)
+9 >Emitted(9, 34) Source(26, 38) + SourceIndex(0)
+10>Emitted(9, 35) Source(26, 39) + SourceIndex(0)
+11>Emitted(9, 37) Source(26, 41) + SourceIndex(0)
+12>Emitted(9, 38) Source(26, 42) + SourceIndex(0)
+13>Emitted(9, 41) Source(26, 45) + SourceIndex(0)
+14>Emitted(9, 42) Source(26, 46) + SourceIndex(0)
+15>Emitted(9, 44) Source(26, 48) + SourceIndex(0)
+16>Emitted(9, 45) Source(26, 49) + SourceIndex(0)
+17>Emitted(9, 47) Source(26, 51) + SourceIndex(0)
+18>Emitted(9, 49) Source(26, 53) + SourceIndex(0)
+19>Emitted(9, 50) Source(26, 54) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -308,57 +311,60 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                ^^
-7 >                                  ^
-8 >                                   ^^^
-9 >                                      ^
-10>                                       ^^
-11>                                         ^
-12>                                          ^^^
-13>                                             ^
-14>                                              ^^
-15>                                                ^
-16>                                                 ^^
-17>                                                   ^^
-18>                                                     ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                ^^
+8 >                                  ^
+9 >                                   ^^^
+10>                                      ^
+11>                                       ^^
+12>                                         ^
+13>                                          ^^^
+14>                                             ^
+15>                                              ^^
+16>                                                ^
+17>                                                 ^^
+18>                                                   ^^
+19>                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA
-6 >                                 } = getRobot(), 
-7 >                                  i
-8 >                                    = 
-9 >                                      0
-10>                                       ; 
-11>                                         i
-12>                                           < 
-13>                                             1
-14>                                              ; 
-15>                                                i
-16>                                                 ++
-17>                                                   ) 
-18>                                                     {
+5 >     
+6 >         name: nameA
+7 >                                 } = getRobot(), 
+8 >                                  i
+9 >                                    = 
+10>                                      0
+11>                                       ; 
+12>                                         i
+13>                                           < 
+14>                                             1
+15>                                              ; 
+16>                                                i
+17>                                                 ++
+18>                                                   ) 
+19>                                                     {
 1->Emitted(12, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(12, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(12, 5) Source(29, 5) + SourceIndex(0)
 4 >Emitted(12, 6) Source(29, 11) + SourceIndex(0)
-5 >Emitted(12, 33) Source(29, 22) + SourceIndex(0)
-6 >Emitted(12, 35) Source(29, 39) + SourceIndex(0)
-7 >Emitted(12, 36) Source(29, 40) + SourceIndex(0)
-8 >Emitted(12, 39) Source(29, 43) + SourceIndex(0)
-9 >Emitted(12, 40) Source(29, 44) + SourceIndex(0)
-10>Emitted(12, 42) Source(29, 46) + SourceIndex(0)
-11>Emitted(12, 43) Source(29, 47) + SourceIndex(0)
-12>Emitted(12, 46) Source(29, 50) + SourceIndex(0)
-13>Emitted(12, 47) Source(29, 51) + SourceIndex(0)
-14>Emitted(12, 49) Source(29, 53) + SourceIndex(0)
-15>Emitted(12, 50) Source(29, 54) + SourceIndex(0)
-16>Emitted(12, 52) Source(29, 56) + SourceIndex(0)
-17>Emitted(12, 54) Source(29, 58) + SourceIndex(0)
-18>Emitted(12, 55) Source(29, 59) + SourceIndex(0)
+5 >Emitted(12, 10) Source(29, 11) + SourceIndex(0)
+6 >Emitted(12, 33) Source(29, 22) + SourceIndex(0)
+7 >Emitted(12, 35) Source(29, 39) + SourceIndex(0)
+8 >Emitted(12, 36) Source(29, 40) + SourceIndex(0)
+9 >Emitted(12, 39) Source(29, 43) + SourceIndex(0)
+10>Emitted(12, 40) Source(29, 44) + SourceIndex(0)
+11>Emitted(12, 42) Source(29, 46) + SourceIndex(0)
+12>Emitted(12, 43) Source(29, 47) + SourceIndex(0)
+13>Emitted(12, 46) Source(29, 50) + SourceIndex(0)
+14>Emitted(12, 47) Source(29, 51) + SourceIndex(0)
+15>Emitted(12, 49) Source(29, 53) + SourceIndex(0)
+16>Emitted(12, 50) Source(29, 54) + SourceIndex(0)
+17>Emitted(12, 52) Source(29, 56) + SourceIndex(0)
+18>Emitted(12, 54) Source(29, 58) + SourceIndex(0)
+19>Emitted(12, 55) Source(29, 59) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -402,57 +408,60 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                            ^^
-7 >                                                              ^
-8 >                                                               ^^^
-9 >                                                                  ^
-10>                                                                   ^^
-11>                                                                     ^
-12>                                                                      ^^^
-13>                                                                         ^
-14>                                                                          ^^
-15>                                                                            ^
-16>                                                                             ^^
-17>                                                                               ^^
-18>                                                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                            ^^
+8 >                                                              ^
+9 >                                                               ^^^
+10>                                                                  ^
+11>                                                                   ^^
+12>                                                                     ^
+13>                                                                      ^^^
+14>                                                                         ^
+15>                                                                          ^^
+16>                                                                            ^
+17>                                                                             ^^
+18>                                                                               ^^
+19>                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA
-6 >                                                             } = <Robot>{ name: "trimmer", skill: "trimming" }, 
-7 >                                                              i
-8 >                                                                = 
-9 >                                                                  0
-10>                                                                   ; 
-11>                                                                     i
-12>                                                                       < 
-13>                                                                         1
-14>                                                                          ; 
-15>                                                                            i
-16>                                                                             ++
-17>                                                                               ) 
-18>                                                                                 {
+5 >     
+6 >         name: nameA
+7 >                                                             } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+8 >                                                              i
+9 >                                                                = 
+10>                                                                  0
+11>                                                                   ; 
+12>                                                                     i
+13>                                                                       < 
+14>                                                                         1
+15>                                                                          ; 
+16>                                                                            i
+17>                                                                             ++
+18>                                                                               ) 
+19>                                                                                 {
 1->Emitted(15, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(15, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(15, 5) Source(32, 5) + SourceIndex(0)
 4 >Emitted(15, 6) Source(32, 11) + SourceIndex(0)
-5 >Emitted(15, 61) Source(32, 22) + SourceIndex(0)
-6 >Emitted(15, 63) Source(32, 74) + SourceIndex(0)
-7 >Emitted(15, 64) Source(32, 75) + SourceIndex(0)
-8 >Emitted(15, 67) Source(32, 78) + SourceIndex(0)
-9 >Emitted(15, 68) Source(32, 79) + SourceIndex(0)
-10>Emitted(15, 70) Source(32, 81) + SourceIndex(0)
-11>Emitted(15, 71) Source(32, 82) + SourceIndex(0)
-12>Emitted(15, 74) Source(32, 85) + SourceIndex(0)
-13>Emitted(15, 75) Source(32, 86) + SourceIndex(0)
-14>Emitted(15, 77) Source(32, 88) + SourceIndex(0)
-15>Emitted(15, 78) Source(32, 89) + SourceIndex(0)
-16>Emitted(15, 80) Source(32, 91) + SourceIndex(0)
-17>Emitted(15, 82) Source(32, 93) + SourceIndex(0)
-18>Emitted(15, 83) Source(32, 94) + SourceIndex(0)
+5 >Emitted(15, 10) Source(32, 11) + SourceIndex(0)
+6 >Emitted(15, 61) Source(32, 22) + SourceIndex(0)
+7 >Emitted(15, 63) Source(32, 74) + SourceIndex(0)
+8 >Emitted(15, 64) Source(32, 75) + SourceIndex(0)
+9 >Emitted(15, 67) Source(32, 78) + SourceIndex(0)
+10>Emitted(15, 68) Source(32, 79) + SourceIndex(0)
+11>Emitted(15, 70) Source(32, 81) + SourceIndex(0)
+12>Emitted(15, 71) Source(32, 82) + SourceIndex(0)
+13>Emitted(15, 74) Source(32, 85) + SourceIndex(0)
+14>Emitted(15, 75) Source(32, 86) + SourceIndex(0)
+15>Emitted(15, 77) Source(32, 88) + SourceIndex(0)
+16>Emitted(15, 78) Source(32, 89) + SourceIndex(0)
+17>Emitted(15, 80) Source(32, 91) + SourceIndex(0)
+18>Emitted(15, 82) Source(32, 93) + SourceIndex(0)
+19>Emitted(15, 83) Source(32, 94) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -496,69 +505,72 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                               ^^
-7 >                                 ^^^^^^^^^^^^^^^^^^^^^
-8 >                                                      ^^
-9 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                 ^^
-11>                                                                                   ^
-12>                                                                                    ^^^
-13>                                                                                       ^
-14>                                                                                        ^^
-15>                                                                                          ^
-16>                                                                                           ^^^
-17>                                                                                              ^
-18>                                                                                               ^^
-19>                                                                                                 ^
-20>                                                                                                  ^^
-21>                                                                                                    ^^
-22>                                                                                                      ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^
+7 >                               ^^
+8 >                                 ^^^^^^^^^^^^^^^^^^^^^
+9 >                                                      ^^
+10>                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                 ^^
+12>                                                                                   ^
+13>                                                                                    ^^^
+14>                                                                                       ^
+15>                                                                                        ^^
+16>                                                                                          ^
+17>                                                                                           ^^^
+18>                                                                                              ^
+19>                                                                                               ^^
+20>                                                                                                 ^
+21>                                                                                                  ^^
+22>                                                                                                    ^^
+23>                                                                                                      ^
 1->
   >
 2 >for
 3 >    
 4 >    (let { 
-5 >     skills: { primary: primaryA, secondary: secondaryA }
-6 >                               
-7 >                                 primary: primaryA
-8 >                                                      , 
-9 >                                                        secondary: secondaryA
-10>                                                                                  } } = multiRobot, 
-11>                                                                                   i
-12>                                                                                     = 
-13>                                                                                       0
-14>                                                                                        ; 
-15>                                                                                          i
-16>                                                                                            < 
-17>                                                                                              1
-18>                                                                                               ; 
-19>                                                                                                 i
-20>                                                                                                  ++
-21>                                                                                                    ) 
-22>                                                                                                      {
+5 >     
+6 >         skills: { primary: primaryA, secondary: secondaryA }
+7 >                               
+8 >                                 primary: primaryA
+9 >                                                      , 
+10>                                                        secondary: secondaryA
+11>                                                                                  } } = multiRobot, 
+12>                                                                                   i
+13>                                                                                     = 
+14>                                                                                       0
+15>                                                                                        ; 
+16>                                                                                          i
+17>                                                                                            < 
+18>                                                                                              1
+19>                                                                                               ; 
+20>                                                                                                 i
+21>                                                                                                  ++
+22>                                                                                                    ) 
+23>                                                                                                      {
 1->Emitted(18, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(18, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(18, 5) Source(35, 5) + SourceIndex(0)
 4 >Emitted(18, 6) Source(35, 12) + SourceIndex(0)
-5 >Emitted(18, 32) Source(35, 64) + SourceIndex(0)
-6 >Emitted(18, 34) Source(35, 22) + SourceIndex(0)
-7 >Emitted(18, 55) Source(35, 39) + SourceIndex(0)
-8 >Emitted(18, 57) Source(35, 41) + SourceIndex(0)
-9 >Emitted(18, 82) Source(35, 62) + SourceIndex(0)
-10>Emitted(18, 84) Source(35, 81) + SourceIndex(0)
-11>Emitted(18, 85) Source(35, 82) + SourceIndex(0)
-12>Emitted(18, 88) Source(35, 85) + SourceIndex(0)
-13>Emitted(18, 89) Source(35, 86) + SourceIndex(0)
-14>Emitted(18, 91) Source(35, 88) + SourceIndex(0)
-15>Emitted(18, 92) Source(35, 89) + SourceIndex(0)
-16>Emitted(18, 95) Source(35, 92) + SourceIndex(0)
-17>Emitted(18, 96) Source(35, 93) + SourceIndex(0)
-18>Emitted(18, 98) Source(35, 95) + SourceIndex(0)
-19>Emitted(18, 99) Source(35, 96) + SourceIndex(0)
-20>Emitted(18, 101) Source(35, 98) + SourceIndex(0)
-21>Emitted(18, 103) Source(35, 100) + SourceIndex(0)
-22>Emitted(18, 104) Source(35, 101) + SourceIndex(0)
+5 >Emitted(18, 10) Source(35, 12) + SourceIndex(0)
+6 >Emitted(18, 32) Source(35, 64) + SourceIndex(0)
+7 >Emitted(18, 34) Source(35, 22) + SourceIndex(0)
+8 >Emitted(18, 55) Source(35, 39) + SourceIndex(0)
+9 >Emitted(18, 57) Source(35, 41) + SourceIndex(0)
+10>Emitted(18, 82) Source(35, 62) + SourceIndex(0)
+11>Emitted(18, 84) Source(35, 81) + SourceIndex(0)
+12>Emitted(18, 85) Source(35, 82) + SourceIndex(0)
+13>Emitted(18, 88) Source(35, 85) + SourceIndex(0)
+14>Emitted(18, 89) Source(35, 86) + SourceIndex(0)
+15>Emitted(18, 91) Source(35, 88) + SourceIndex(0)
+16>Emitted(18, 92) Source(35, 89) + SourceIndex(0)
+17>Emitted(18, 95) Source(35, 92) + SourceIndex(0)
+18>Emitted(18, 96) Source(35, 93) + SourceIndex(0)
+19>Emitted(18, 98) Source(35, 95) + SourceIndex(0)
+20>Emitted(18, 99) Source(35, 96) + SourceIndex(0)
+21>Emitted(18, 101) Source(35, 98) + SourceIndex(0)
+22>Emitted(18, 103) Source(35, 100) + SourceIndex(0)
+23>Emitted(18, 104) Source(35, 101) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -602,69 +614,72 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                    ^^
-7 >                                      ^^^^^^^^^^^^^^^^^^^^^
-8 >                                                           ^^
-9 >                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                      ^^
-11>                                                                                        ^
-12>                                                                                         ^^^
-13>                                                                                            ^
-14>                                                                                             ^^
-15>                                                                                               ^
-16>                                                                                                ^^^
-17>                                                                                                   ^
-18>                                                                                                    ^^
-19>                                                                                                      ^
-20>                                                                                                       ^^
-21>                                                                                                         ^^
-22>                                                                                                           ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                    ^^
+8 >                                      ^^^^^^^^^^^^^^^^^^^^^
+9 >                                                           ^^
+10>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                      ^^
+12>                                                                                        ^
+13>                                                                                         ^^^
+14>                                                                                            ^
+15>                                                                                             ^^
+16>                                                                                               ^
+17>                                                                                                ^^^
+18>                                                                                                   ^
+19>                                                                                                    ^^
+20>                                                                                                      ^
+21>                                                                                                       ^^
+22>                                                                                                         ^^
+23>                                                                                                           ^
 1->
   >
 2 >for
 3 >    
 4 >    (let { 
-5 >     skills: { primary: primaryA, secondary: secondaryA }
-6 >                                    
-7 >                                      primary: primaryA
-8 >                                                           , 
-9 >                                                             secondary: secondaryA
-10>                                                                                       } } = getMultiRobot(), 
-11>                                                                                        i
-12>                                                                                          = 
-13>                                                                                            0
-14>                                                                                             ; 
-15>                                                                                               i
-16>                                                                                                 < 
-17>                                                                                                   1
-18>                                                                                                    ; 
-19>                                                                                                      i
-20>                                                                                                       ++
-21>                                                                                                         ) 
-22>                                                                                                           {
+5 >     
+6 >         skills: { primary: primaryA, secondary: secondaryA }
+7 >                                    
+8 >                                      primary: primaryA
+9 >                                                           , 
+10>                                                             secondary: secondaryA
+11>                                                                                       } } = getMultiRobot(), 
+12>                                                                                        i
+13>                                                                                          = 
+14>                                                                                            0
+15>                                                                                             ; 
+16>                                                                                               i
+17>                                                                                                 < 
+18>                                                                                                   1
+19>                                                                                                    ; 
+20>                                                                                                      i
+21>                                                                                                       ++
+22>                                                                                                         ) 
+23>                                                                                                           {
 1->Emitted(21, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(38, 5) + SourceIndex(0)
 4 >Emitted(21, 6) Source(38, 12) + SourceIndex(0)
-5 >Emitted(21, 37) Source(38, 64) + SourceIndex(0)
-6 >Emitted(21, 39) Source(38, 22) + SourceIndex(0)
-7 >Emitted(21, 60) Source(38, 39) + SourceIndex(0)
-8 >Emitted(21, 62) Source(38, 41) + SourceIndex(0)
-9 >Emitted(21, 87) Source(38, 62) + SourceIndex(0)
-10>Emitted(21, 89) Source(38, 86) + SourceIndex(0)
-11>Emitted(21, 90) Source(38, 87) + SourceIndex(0)
-12>Emitted(21, 93) Source(38, 90) + SourceIndex(0)
-13>Emitted(21, 94) Source(38, 91) + SourceIndex(0)
-14>Emitted(21, 96) Source(38, 93) + SourceIndex(0)
-15>Emitted(21, 97) Source(38, 94) + SourceIndex(0)
-16>Emitted(21, 100) Source(38, 97) + SourceIndex(0)
-17>Emitted(21, 101) Source(38, 98) + SourceIndex(0)
-18>Emitted(21, 103) Source(38, 100) + SourceIndex(0)
-19>Emitted(21, 104) Source(38, 101) + SourceIndex(0)
-20>Emitted(21, 106) Source(38, 103) + SourceIndex(0)
-21>Emitted(21, 108) Source(38, 105) + SourceIndex(0)
-22>Emitted(21, 109) Source(38, 106) + SourceIndex(0)
+5 >Emitted(21, 10) Source(38, 12) + SourceIndex(0)
+6 >Emitted(21, 37) Source(38, 64) + SourceIndex(0)
+7 >Emitted(21, 39) Source(38, 22) + SourceIndex(0)
+8 >Emitted(21, 60) Source(38, 39) + SourceIndex(0)
+9 >Emitted(21, 62) Source(38, 41) + SourceIndex(0)
+10>Emitted(21, 87) Source(38, 62) + SourceIndex(0)
+11>Emitted(21, 89) Source(38, 86) + SourceIndex(0)
+12>Emitted(21, 90) Source(38, 87) + SourceIndex(0)
+13>Emitted(21, 93) Source(38, 90) + SourceIndex(0)
+14>Emitted(21, 94) Source(38, 91) + SourceIndex(0)
+15>Emitted(21, 96) Source(38, 93) + SourceIndex(0)
+16>Emitted(21, 97) Source(38, 94) + SourceIndex(0)
+17>Emitted(21, 100) Source(38, 97) + SourceIndex(0)
+18>Emitted(21, 101) Source(38, 98) + SourceIndex(0)
+19>Emitted(21, 103) Source(38, 100) + SourceIndex(0)
+20>Emitted(21, 104) Source(38, 101) + SourceIndex(0)
+21>Emitted(21, 106) Source(38, 103) + SourceIndex(0)
+22>Emitted(21, 108) Source(38, 105) + SourceIndex(0)
+23>Emitted(21, 109) Source(38, 106) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -708,71 +723,74 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                              ^^
-7 >                                                                                                ^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                                                                     ^^
-9 >                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                                ^^
-11>                                                                                                                                                  ^
-12>                                                                                                                                                   ^^^
-13>                                                                                                                                                      ^
-14>                                                                                                                                                       ^^
-15>                                                                                                                                                         ^
-16>                                                                                                                                                          ^^^
-17>                                                                                                                                                             ^
-18>                                                                                                                                                              ^^
-19>                                                                                                                                                                ^
-20>                                                                                                                                                                 ^^
-21>                                                                                                                                                                   ^^
-22>                                                                                                                                                                     ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                                              ^^
+8 >                                                                                                ^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                     ^^
+10>                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                ^^
+12>                                                                                                                                                  ^
+13>                                                                                                                                                   ^^^
+14>                                                                                                                                                      ^
+15>                                                                                                                                                       ^^
+16>                                                                                                                                                         ^
+17>                                                                                                                                                          ^^^
+18>                                                                                                                                                             ^
+19>                                                                                                                                                              ^^
+20>                                                                                                                                                                ^
+21>                                                                                                                                                                 ^^
+22>                                                                                                                                                                   ^^
+23>                                                                                                                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (let { 
-5 >     skills: { primary: primaryA, secondary: secondaryA }
-6 >                                                                                              
-7 >                                                                                                primary: primaryA
-8 >                                                                                                                     , 
-9 >                                                                                                                       secondary: secondaryA
-10>                                                                                                                                                 } } =
+5 >     
+6 >         skills: { primary: primaryA, secondary: secondaryA }
+7 >                                                                                              
+8 >                                                                                                primary: primaryA
+9 >                                                                                                                     , 
+10>                                                                                                                       secondary: secondaryA
+11>                                                                                                                                                 } } =
   >                                                                                                                                                    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >                                                                                                                                                    
-11>                                                                                                                                                  i
-12>                                                                                                                                                    = 
-13>                                                                                                                                                      0
-14>                                                                                                                                                       ; 
-15>                                                                                                                                                         i
-16>                                                                                                                                                           < 
-17>                                                                                                                                                             1
-18>                                                                                                                                                              ; 
-19>                                                                                                                                                                i
-20>                                                                                                                                                                 ++
-21>                                                                                                                                                                   ) 
-22>                                                                                                                                                                     {
+12>                                                                                                                                                  i
+13>                                                                                                                                                    = 
+14>                                                                                                                                                      0
+15>                                                                                                                                                       ; 
+16>                                                                                                                                                         i
+17>                                                                                                                                                           < 
+18>                                                                                                                                                             1
+19>                                                                                                                                                              ; 
+20>                                                                                                                                                                i
+21>                                                                                                                                                                 ++
+22>                                                                                                                                                                   ) 
+23>                                                                                                                                                                     {
 1->Emitted(24, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(24, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(24, 5) Source(41, 5) + SourceIndex(0)
 4 >Emitted(24, 6) Source(41, 12) + SourceIndex(0)
-5 >Emitted(24, 95) Source(41, 64) + SourceIndex(0)
-6 >Emitted(24, 97) Source(41, 22) + SourceIndex(0)
-7 >Emitted(24, 118) Source(41, 39) + SourceIndex(0)
-8 >Emitted(24, 120) Source(41, 41) + SourceIndex(0)
-9 >Emitted(24, 145) Source(41, 62) + SourceIndex(0)
-10>Emitted(24, 147) Source(43, 5) + SourceIndex(0)
-11>Emitted(24, 148) Source(43, 6) + SourceIndex(0)
-12>Emitted(24, 151) Source(43, 9) + SourceIndex(0)
-13>Emitted(24, 152) Source(43, 10) + SourceIndex(0)
-14>Emitted(24, 154) Source(43, 12) + SourceIndex(0)
-15>Emitted(24, 155) Source(43, 13) + SourceIndex(0)
-16>Emitted(24, 158) Source(43, 16) + SourceIndex(0)
-17>Emitted(24, 159) Source(43, 17) + SourceIndex(0)
-18>Emitted(24, 161) Source(43, 19) + SourceIndex(0)
-19>Emitted(24, 162) Source(43, 20) + SourceIndex(0)
-20>Emitted(24, 164) Source(43, 22) + SourceIndex(0)
-21>Emitted(24, 166) Source(43, 24) + SourceIndex(0)
-22>Emitted(24, 167) Source(43, 25) + SourceIndex(0)
+5 >Emitted(24, 10) Source(41, 12) + SourceIndex(0)
+6 >Emitted(24, 95) Source(41, 64) + SourceIndex(0)
+7 >Emitted(24, 97) Source(41, 22) + SourceIndex(0)
+8 >Emitted(24, 118) Source(41, 39) + SourceIndex(0)
+9 >Emitted(24, 120) Source(41, 41) + SourceIndex(0)
+10>Emitted(24, 145) Source(41, 62) + SourceIndex(0)
+11>Emitted(24, 147) Source(43, 5) + SourceIndex(0)
+12>Emitted(24, 148) Source(43, 6) + SourceIndex(0)
+13>Emitted(24, 151) Source(43, 9) + SourceIndex(0)
+14>Emitted(24, 152) Source(43, 10) + SourceIndex(0)
+15>Emitted(24, 154) Source(43, 12) + SourceIndex(0)
+16>Emitted(24, 155) Source(43, 13) + SourceIndex(0)
+17>Emitted(24, 158) Source(43, 16) + SourceIndex(0)
+18>Emitted(24, 159) Source(43, 17) + SourceIndex(0)
+19>Emitted(24, 161) Source(43, 19) + SourceIndex(0)
+20>Emitted(24, 162) Source(43, 20) + SourceIndex(0)
+21>Emitted(24, 164) Source(43, 22) + SourceIndex(0)
+22>Emitted(24, 166) Source(43, 24) + SourceIndex(0)
+23>Emitted(24, 167) Source(43, 25) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -816,64 +834,67 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^
-6 >                           ^^
-7 >                             ^^^^^^^^^^^^^^^^^^^^
-8 >                                                 ^^
-9 >                                                   ^
-10>                                                    ^^^
-11>                                                       ^
-12>                                                        ^^
-13>                                                          ^
-14>                                                           ^^^
-15>                                                              ^
-16>                                                               ^^
-17>                                                                 ^
-18>                                                                  ^^
-19>                                                                    ^^
-20>                                                                      ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^
+7 >                           ^^
+8 >                             ^^^^^^^^^^^^^^^^^^^^
+9 >                                                 ^^
+10>                                                   ^
+11>                                                    ^^^
+12>                                                       ^
+13>                                                        ^^
+14>                                                          ^
+15>                                                           ^^^
+16>                                                              ^
+17>                                                               ^^
+18>                                                                 ^
+19>                                                                  ^^
+20>                                                                    ^^
+21>                                                                      ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA
-6 >                           , 
-7 >                             skill: skillA
-8 >                                                  } = robot, 
-9 >                                                   i
-10>                                                     = 
-11>                                                       0
-12>                                                        ; 
-13>                                                          i
-14>                                                            < 
-15>                                                              1
-16>                                                               ; 
-17>                                                                 i
-18>                                                                  ++
-19>                                                                    ) 
-20>                                                                      {
+5 >     
+6 >         name: nameA
+7 >                           , 
+8 >                             skill: skillA
+9 >                                                  } = robot, 
+10>                                                   i
+11>                                                     = 
+12>                                                       0
+13>                                                        ; 
+14>                                                          i
+15>                                                            < 
+16>                                                              1
+17>                                                               ; 
+18>                                                                 i
+19>                                                                  ++
+20>                                                                    ) 
+21>                                                                      {
 1->Emitted(27, 1) Source(47, 1) + SourceIndex(0)
 2 >Emitted(27, 4) Source(47, 4) + SourceIndex(0)
 3 >Emitted(27, 5) Source(47, 5) + SourceIndex(0)
 4 >Emitted(27, 6) Source(47, 11) + SourceIndex(0)
-5 >Emitted(27, 28) Source(47, 22) + SourceIndex(0)
-6 >Emitted(27, 30) Source(47, 24) + SourceIndex(0)
-7 >Emitted(27, 50) Source(47, 37) + SourceIndex(0)
-8 >Emitted(27, 52) Source(47, 49) + SourceIndex(0)
-9 >Emitted(27, 53) Source(47, 50) + SourceIndex(0)
-10>Emitted(27, 56) Source(47, 53) + SourceIndex(0)
-11>Emitted(27, 57) Source(47, 54) + SourceIndex(0)
-12>Emitted(27, 59) Source(47, 56) + SourceIndex(0)
-13>Emitted(27, 60) Source(47, 57) + SourceIndex(0)
-14>Emitted(27, 63) Source(47, 60) + SourceIndex(0)
-15>Emitted(27, 64) Source(47, 61) + SourceIndex(0)
-16>Emitted(27, 66) Source(47, 63) + SourceIndex(0)
-17>Emitted(27, 67) Source(47, 64) + SourceIndex(0)
-18>Emitted(27, 69) Source(47, 66) + SourceIndex(0)
-19>Emitted(27, 71) Source(47, 68) + SourceIndex(0)
-20>Emitted(27, 72) Source(47, 69) + SourceIndex(0)
+5 >Emitted(27, 10) Source(47, 11) + SourceIndex(0)
+6 >Emitted(27, 28) Source(47, 22) + SourceIndex(0)
+7 >Emitted(27, 30) Source(47, 24) + SourceIndex(0)
+8 >Emitted(27, 50) Source(47, 37) + SourceIndex(0)
+9 >Emitted(27, 52) Source(47, 49) + SourceIndex(0)
+10>Emitted(27, 53) Source(47, 50) + SourceIndex(0)
+11>Emitted(27, 56) Source(47, 53) + SourceIndex(0)
+12>Emitted(27, 57) Source(47, 54) + SourceIndex(0)
+13>Emitted(27, 59) Source(47, 56) + SourceIndex(0)
+14>Emitted(27, 60) Source(47, 57) + SourceIndex(0)
+15>Emitted(27, 63) Source(47, 60) + SourceIndex(0)
+16>Emitted(27, 64) Source(47, 61) + SourceIndex(0)
+17>Emitted(27, 66) Source(47, 63) + SourceIndex(0)
+18>Emitted(27, 67) Source(47, 64) + SourceIndex(0)
+19>Emitted(27, 69) Source(47, 66) + SourceIndex(0)
+20>Emitted(27, 71) Source(47, 68) + SourceIndex(0)
+21>Emitted(27, 72) Source(47, 69) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -940,9 +961,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {name: nameA, skill: skillA } = getRobot()
+6 >         {name: nameA, skill: skillA } = getRobot()
 7 >                        
 8 >                          name: nameA
 9 >                                         , 
@@ -963,8 +984,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 1->Emitted(30, 1) Source(50, 1) + SourceIndex(0)
 2 >Emitted(30, 4) Source(50, 4) + SourceIndex(0)
 3 >Emitted(30, 5) Source(50, 5) + SourceIndex(0)
-4 >Emitted(30, 6) Source(50, 6) + SourceIndex(0)
-5 >Emitted(30, 10) Source(50, 6) + SourceIndex(0)
+4 >Emitted(30, 6) Source(50, 10) + SourceIndex(0)
+5 >Emitted(30, 10) Source(50, 10) + SourceIndex(0)
 6 >Emitted(30, 25) Source(50, 52) + SourceIndex(0)
 7 >Emitted(30, 27) Source(50, 11) + SourceIndex(0)
 8 >Emitted(30, 42) Source(50, 22) + SourceIndex(0)
@@ -1049,9 +1070,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >         {name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }
 7 >                                                    
 8 >                                                      name: nameA
 9 >                                                                     , 
@@ -1072,8 +1093,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 1->Emitted(33, 1) Source(53, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(53, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(53, 5) + SourceIndex(0)
-4 >Emitted(33, 6) Source(53, 6) + SourceIndex(0)
-5 >Emitted(33, 10) Source(53, 6) + SourceIndex(0)
+4 >Emitted(33, 6) Source(53, 10) + SourceIndex(0)
+5 >Emitted(33, 10) Source(53, 10) + SourceIndex(0)
 6 >Emitted(33, 53) Source(53, 87) + SourceIndex(0)
 7 >Emitted(33, 55) Source(53, 11) + SourceIndex(0)
 8 >Emitted(33, 70) Source(53, 22) + SourceIndex(0)
@@ -1135,75 +1156,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                ^^
-7 >                                  ^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                        ^^
-9 >                                                          ^^^^^^^^^^^^^^^^^^^^^
-10>                                                                               ^^
-11>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                          ^^
-13>                                                                                                            ^
-14>                                                                                                             ^^^
-15>                                                                                                                ^
-16>                                                                                                                 ^^
-17>                                                                                                                   ^
-18>                                                                                                                    ^^^
-19>                                                                                                                       ^
-20>                                                                                                                        ^^
-21>                                                                                                                          ^
-22>                                                                                                                           ^^
-23>                                                                                                                             ^^
-24>                                                                                                                               ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                ^^
+8 >                                  ^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                        ^^
+10>                                                          ^^^^^^^^^^^^^^^^^^^^^
+11>                                                                               ^^
+12>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                          ^^
+14>                                                                                                            ^
+15>                                                                                                             ^^^
+16>                                                                                                                ^
+17>                                                                                                                 ^^
+18>                                                                                                                   ^
+19>                                                                                                                    ^^^
+20>                                                                                                                       ^
+21>                                                                                                                        ^^
+22>                                                                                                                          ^
+23>                                                                                                                           ^^
+24>                                                                                                                             ^^
+25>                                                                                                                               ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA
-6 >                                , 
-7 >                                  skills: { primary: primaryA, secondary: secondaryA }
-8 >                                                        
-9 >                                                          primary: primaryA
-10>                                                                               , 
-11>                                                                                 secondary: secondaryA
-12>                                                                                                           } } = multiRobot, 
-13>                                                                                                            i
-14>                                                                                                              = 
-15>                                                                                                                0
-16>                                                                                                                 ; 
-17>                                                                                                                   i
-18>                                                                                                                     < 
-19>                                                                                                                       1
-20>                                                                                                                        ; 
-21>                                                                                                                          i
-22>                                                                                                                           ++
-23>                                                                                                                             ) 
-24>                                                                                                                               {
+5 >     
+6 >         name: nameA
+7 >                                , 
+8 >                                  skills: { primary: primaryA, secondary: secondaryA }
+9 >                                                        
+10>                                                          primary: primaryA
+11>                                                                               , 
+12>                                                                                 secondary: secondaryA
+13>                                                                                                           } } = multiRobot, 
+14>                                                                                                            i
+15>                                                                                                              = 
+16>                                                                                                                0
+17>                                                                                                                 ; 
+18>                                                                                                                   i
+19>                                                                                                                     < 
+20>                                                                                                                       1
+21>                                                                                                                        ; 
+22>                                                                                                                          i
+23>                                                                                                                           ++
+24>                                                                                                                             ) 
+25>                                                                                                                               {
 1->Emitted(36, 1) Source(56, 1) + SourceIndex(0)
 2 >Emitted(36, 4) Source(56, 4) + SourceIndex(0)
 3 >Emitted(36, 5) Source(56, 5) + SourceIndex(0)
 4 >Emitted(36, 6) Source(56, 11) + SourceIndex(0)
-5 >Emitted(36, 33) Source(56, 22) + SourceIndex(0)
-6 >Emitted(36, 35) Source(56, 24) + SourceIndex(0)
-7 >Emitted(36, 57) Source(56, 76) + SourceIndex(0)
-8 >Emitted(36, 59) Source(56, 34) + SourceIndex(0)
-9 >Emitted(36, 80) Source(56, 51) + SourceIndex(0)
-10>Emitted(36, 82) Source(56, 53) + SourceIndex(0)
-11>Emitted(36, 107) Source(56, 74) + SourceIndex(0)
-12>Emitted(36, 109) Source(56, 93) + SourceIndex(0)
-13>Emitted(36, 110) Source(56, 94) + SourceIndex(0)
-14>Emitted(36, 113) Source(56, 97) + SourceIndex(0)
-15>Emitted(36, 114) Source(56, 98) + SourceIndex(0)
-16>Emitted(36, 116) Source(56, 100) + SourceIndex(0)
-17>Emitted(36, 117) Source(56, 101) + SourceIndex(0)
-18>Emitted(36, 120) Source(56, 104) + SourceIndex(0)
-19>Emitted(36, 121) Source(56, 105) + SourceIndex(0)
-20>Emitted(36, 123) Source(56, 107) + SourceIndex(0)
-21>Emitted(36, 124) Source(56, 108) + SourceIndex(0)
-22>Emitted(36, 126) Source(56, 110) + SourceIndex(0)
-23>Emitted(36, 128) Source(56, 112) + SourceIndex(0)
-24>Emitted(36, 129) Source(56, 113) + SourceIndex(0)
+5 >Emitted(36, 10) Source(56, 11) + SourceIndex(0)
+6 >Emitted(36, 33) Source(56, 22) + SourceIndex(0)
+7 >Emitted(36, 35) Source(56, 24) + SourceIndex(0)
+8 >Emitted(36, 57) Source(56, 76) + SourceIndex(0)
+9 >Emitted(36, 59) Source(56, 34) + SourceIndex(0)
+10>Emitted(36, 80) Source(56, 51) + SourceIndex(0)
+11>Emitted(36, 82) Source(56, 53) + SourceIndex(0)
+12>Emitted(36, 107) Source(56, 74) + SourceIndex(0)
+13>Emitted(36, 109) Source(56, 93) + SourceIndex(0)
+14>Emitted(36, 110) Source(56, 94) + SourceIndex(0)
+15>Emitted(36, 113) Source(56, 97) + SourceIndex(0)
+16>Emitted(36, 114) Source(56, 98) + SourceIndex(0)
+17>Emitted(36, 116) Source(56, 100) + SourceIndex(0)
+18>Emitted(36, 117) Source(56, 101) + SourceIndex(0)
+19>Emitted(36, 120) Source(56, 104) + SourceIndex(0)
+20>Emitted(36, 121) Source(56, 105) + SourceIndex(0)
+21>Emitted(36, 123) Source(56, 107) + SourceIndex(0)
+22>Emitted(36, 124) Source(56, 108) + SourceIndex(0)
+23>Emitted(36, 126) Source(56, 110) + SourceIndex(0)
+24>Emitted(36, 128) Source(56, 112) + SourceIndex(0)
+25>Emitted(36, 129) Source(56, 113) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1274,9 +1298,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot()
+6 >         {name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot()
 7 >                             
 8 >                               name: nameA
 9 >                                              , 
@@ -1301,8 +1325,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 1->Emitted(39, 1) Source(59, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(59, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(59, 5) + SourceIndex(0)
-4 >Emitted(39, 6) Source(59, 6) + SourceIndex(0)
-5 >Emitted(39, 10) Source(59, 6) + SourceIndex(0)
+4 >Emitted(39, 6) Source(59, 10) + SourceIndex(0)
+5 >Emitted(39, 10) Source(59, 10) + SourceIndex(0)
 6 >Emitted(39, 30) Source(59, 96) + SourceIndex(0)
 7 >Emitted(39, 32) Source(59, 11) + SourceIndex(0)
 8 >Emitted(39, 47) Source(59, 22) + SourceIndex(0)
@@ -1395,9 +1419,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
+6 >         {name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
   >             <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 7 >                                                                                       
 8 >                                                                                         name: nameA
@@ -1425,8 +1449,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern.ts
 1->Emitted(42, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(62, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(62, 5) + SourceIndex(0)
-4 >Emitted(42, 6) Source(62, 6) + SourceIndex(0)
-5 >Emitted(42, 10) Source(62, 6) + SourceIndex(0)
+4 >Emitted(42, 6) Source(62, 10) + SourceIndex(0)
+5 >Emitted(42, 10) Source(62, 10) + SourceIndex(0)
 6 >Emitted(42, 88) Source(63, 90) + SourceIndex(0)
 7 >Emitted(42, 90) Source(62, 11) + SourceIndex(0)
 8 >Emitted(42, 105) Source(62, 22) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js
index f7073765d04..1684ebfecaa 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js
@@ -121,79 +121,79 @@ function getMultiRobot() {
 }
 var nameA, primaryA, secondaryA, i, skillA;
 var name, primary, secondary, skill;
-for ((nameA = robot.name, robot), i = 0; i < 1; i++) {
+for (nameA = robot.name, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_a = getRobot(), nameA = _a.name, _a), i = 0; i < 1; i++) {
+for (_a = getRobot(), nameA = _a.name, _a, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_b = { name: "trimmer", skill: "trimming" }, nameA = _b.name, _b), i = 0; i < 1; i++) {
+for (_b = { name: "trimmer", skill: "trimming" }, nameA = _b.name, _b, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_c = multiRobot.skills, primaryA = _c.primary, secondaryA = _c.secondary, multiRobot), i = 0; i < 1; i++) {
+for (_c = multiRobot.skills, primaryA = _c.primary, secondaryA = _c.secondary, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_d = getMultiRobot(), _e = _d.skills, primaryA = _e.primary, secondaryA = _e.secondary, _d), i = 0; i < 1; i++) {
+for (_d = getMultiRobot(), _e = _d.skills, primaryA = _e.primary, secondaryA = _e.secondary, _d, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_f = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _g = _f.skills, primaryA = _g.primary, secondaryA = _g.secondary, _f),
+for (_f = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _g = _f.skills, primaryA = _g.primary, secondaryA = _g.secondary, _f,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((name = robot.name, robot), i = 0; i < 1; i++) {
+for (name = robot.name, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_h = getRobot(), name = _h.name, _h), i = 0; i < 1; i++) {
+for (_h = getRobot(), name = _h.name, _h, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_j = { name: "trimmer", skill: "trimming" }, name = _j.name, _j), i = 0; i < 1; i++) {
+for (_j = { name: "trimmer", skill: "trimming" }, name = _j.name, _j, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_k = multiRobot.skills, primary = _k.primary, secondary = _k.secondary, multiRobot), i = 0; i < 1; i++) {
+for (_k = multiRobot.skills, primary = _k.primary, secondary = _k.secondary, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_l = getMultiRobot(), _m = _l.skills, primary = _m.primary, secondary = _m.secondary, _l), i = 0; i < 1; i++) {
+for (_l = getMultiRobot(), _m = _l.skills, primary = _m.primary, secondary = _m.secondary, _l, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_o = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _p = _o.skills, primary = _p.primary, secondary = _p.secondary, _o),
+for (_o = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _p = _o.skills, primary = _p.primary, secondary = _p.secondary, _o,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((nameA = robot.name, skillA = robot.skill, robot), i = 0; i < 1; i++) {
+for (nameA = robot.name, skillA = robot.skill, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_q = getRobot(), nameA = _q.name, skillA = _q.skill, _q), i = 0; i < 1; i++) {
+for (_q = getRobot(), nameA = _q.name, skillA = _q.skill, _q, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_r = { name: "trimmer", skill: "trimming" }, nameA = _r.name, skillA = _r.skill, _r), i = 0; i < 1; i++) {
+for (_r = { name: "trimmer", skill: "trimming" }, nameA = _r.name, skillA = _r.skill, _r, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((nameA = multiRobot.name, _s = multiRobot.skills, primaryA = _s.primary, secondaryA = _s.secondary, multiRobot), i = 0; i < 1; i++) {
+for (nameA = multiRobot.name, _s = multiRobot.skills, primaryA = _s.primary, secondaryA = _s.secondary, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_t = getMultiRobot(), nameA = _t.name, _u = _t.skills, primaryA = _u.primary, secondaryA = _u.secondary, _t), i = 0; i < 1; i++) {
+for (_t = getMultiRobot(), nameA = _t.name, _u = _t.skills, primaryA = _u.primary, secondaryA = _u.secondary, _t, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_v = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, nameA = _v.name, _w = _v.skills, primaryA = _w.primary, secondaryA = _w.secondary, _v),
+for (_v = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, nameA = _v.name, _w = _v.skills, primaryA = _w.primary, secondaryA = _w.secondary, _v,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((name = robot.name, skill = robot.skill, robot), i = 0; i < 1; i++) {
+for (name = robot.name, skill = robot.skill, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_x = getRobot(), name = _x.name, skill = _x.skill, _x), i = 0; i < 1; i++) {
+for (_x = getRobot(), name = _x.name, skill = _x.skill, _x, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_y = { name: "trimmer", skill: "trimming" }, name = _y.name, skill = _y.skill, _y), i = 0; i < 1; i++) {
+for (_y = { name: "trimmer", skill: "trimming" }, name = _y.name, skill = _y.skill, _y, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((name = multiRobot.name, _z = multiRobot.skills, primary = _z.primary, secondary = _z.secondary, multiRobot), i = 0; i < 1; i++) {
+for (name = multiRobot.name, _z = multiRobot.skills, primary = _z.primary, secondary = _z.secondary, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_0 = getMultiRobot(), name = _0.name, _1 = _0.skills, primary = _1.primary, secondary = _1.secondary, _0), i = 0; i < 1; i++) {
+for (_0 = getMultiRobot(), name = _0.name, _1 = _0.skills, primary = _1.primary, secondary = _1.secondary, _0, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_2 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, name = _2.name, _3 = _2.skills, primary = _3.primary, secondary = _3.secondary, _2),
+for (_2 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, name = _2.name, _3 = _2.skills, primary = _3.primary, secondary = _3.secondary, _2,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js.map
index cb6d6d9fe4a..1c3f77da043 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForObjectBindingPattern2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPattern2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAC,CAAE,kBAAW,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAA4B,EAA1B,eAAW,KAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,2CAA+D,EAA7D,eAAW,KAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAE,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAO,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5F,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAA0E,EAAxE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,KAAsB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,8EACoF,EADlF,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,KACgC;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAE,iBAAI,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAqB,EAAnB,cAAI,KAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,2CAAwD,EAAtD,cAAI,KAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAE,sBAA8B,EAApB,oBAAO,EAAE,wBAAS,EAAO,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAAoD,EAAlD,cAA8B,EAApB,oBAAO,EAAE,wBAAS,KAAsB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,8EACoF,EADlF,cAA8B,EAApB,oBAAO,EAAE,wBAAS,KACsD;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAC,CAAE,kBAAW,EAAE,oBAAa,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAA2C,EAAzC,eAAW,EAAE,iBAAa,KAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,2CAA8E,EAA5E,eAAW,EAAE,iBAAa,KAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAE,uBAAW,EAAE,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAO,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAAuF,EAArF,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,KAAsB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9G,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,8EACoF,EADlF,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,KACmB;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAE,iBAAI,EAAE,mBAAK,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAA4B,EAA1B,cAAI,EAAE,gBAAK,KAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,2CAA+D,EAA7D,cAAI,EAAE,gBAAK,KAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAE,sBAAI,EAAE,sBAA8B,EAApB,oBAAO,EAAE,wBAAS,EAAO,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAA0D,EAAxD,cAAI,EAAE,cAA8B,EAApB,oBAAO,EAAE,wBAAS,KAAsB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,8EACoF,EADlF,cAAI,EAAE,cAA8B,EAApB,oBAAO,EAAE,wBAAS,KACgD;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPattern2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAG,kBAAW,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAA4B,EAA1B,eAAW,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAA+D,EAA7D,eAAW,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAG,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAO,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5F,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAA0E,EAAxE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,MAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EACoF,EADlF,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAErD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAG,iBAAI,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAqB,EAAnB,cAAI,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAwD,EAAtD,cAAI,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAG,sBAA8B,EAApB,oBAAO,EAAE,wBAAS,EAAO,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAAoD,EAAlD,cAA8B,EAApB,oBAAO,EAAE,wBAAS,MAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EACoF,EADlF,cAA8B,EAApB,oBAAO,EAAE,wBAAS;IAE/B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAG,kBAAW,EAAE,oBAAa,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAA2C,EAAzC,eAAW,EAAE,iBAAa,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAA8E,EAA5E,eAAW,EAAE,iBAAa,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAG,uBAAW,EAAE,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,EAAO,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAAuF,EAArF,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,MAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9G,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EACoF,EADlF,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAElE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAG,iBAAI,EAAE,mBAAK,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAA4B,EAA1B,cAAI,EAAE,gBAAK,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAA+D,EAA7D,cAAI,EAAE,gBAAK,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAG,sBAAI,EAAE,sBAA8B,EAApB,oBAAO,EAAE,wBAAS,EAAO,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAA0D,EAAxD,cAAI,EAAE,cAA8B,EAApB,oBAAO,EAAE,wBAAS,MAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EACoF,EADlF,cAAI,EAAE,cAA8B,EAApB,oBAAO,EAAE,wBAAS;IAErC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.sourcemap.txt
index 3744cc2e7ab..1f6bd10d5f5 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.sourcemap.txt
@@ -259,7 +259,7 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 8 >                            ^^
 9 >                              ^^^^^
 10>                                   ^
-11>                                    ^^^^^^^^^^^^^^^^^^^->
+11>                                    ^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >let 
@@ -282,75 +282,69 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 9 >Emitted(10, 36) Source(27, 68) + SourceIndex(0)
 10>Emitted(10, 37) Source(27, 69) + SourceIndex(0)
 ---
->>>for ((nameA = robot.name, robot), i = 0; i < 1; i++) {
+>>>for (nameA = robot.name, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^
-7 >                        ^^
-8 >                          ^^^^^
-9 >                               ^
-10>                                ^^
-11>                                  ^
-12>                                   ^^^
-13>                                      ^
-14>                                       ^^
-15>                                         ^
-16>                                          ^^^
-17>                                             ^
-18>                                              ^^
-19>                                                ^
-20>                                                 ^^
-21>                                                   ^^
-22>                                                     ^
+5 >     ^^^^^^^^^^^^^^^^^^
+6 >                       ^^
+7 >                         ^^^^^
+8 >                              ^^
+9 >                                ^
+10>                                 ^^^
+11>                                    ^
+12>                                     ^^
+13>                                       ^
+14>                                        ^^^
+15>                                           ^
+16>                                            ^^
+17>                                              ^
+18>                                               ^^
+19>                                                 ^^
+20>                                                   ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name: nameA
-7 >                         } = 
-8 >                          robot
-9 >                               
-10>                                , 
-11>                                  i
-12>                                    = 
-13>                                      0
-14>                                       ; 
-15>                                         i
-16>                                           < 
-17>                                             1
-18>                                              ; 
-19>                                                i
-20>                                                 ++
-21>                                                   ) 
-22>                                                     {
+4 >    ({ 
+5 >     name: nameA
+6 >                        } = 
+7 >                         robot
+8 >                              , 
+9 >                                i
+10>                                  = 
+11>                                    0
+12>                                     ; 
+13>                                       i
+14>                                         < 
+15>                                           1
+16>                                            ; 
+17>                                              i
+18>                                               ++
+19>                                                 ) 
+20>                                                   {
 1->Emitted(11, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(11, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(11, 5) Source(29, 5) + SourceIndex(0)
-4 >Emitted(11, 6) Source(29, 6) + SourceIndex(0)
-5 >Emitted(11, 7) Source(29, 8) + SourceIndex(0)
-6 >Emitted(11, 25) Source(29, 19) + SourceIndex(0)
-7 >Emitted(11, 27) Source(29, 24) + SourceIndex(0)
-8 >Emitted(11, 32) Source(29, 29) + SourceIndex(0)
-9 >Emitted(11, 33) Source(29, 29) + SourceIndex(0)
-10>Emitted(11, 35) Source(29, 31) + SourceIndex(0)
-11>Emitted(11, 36) Source(29, 32) + SourceIndex(0)
-12>Emitted(11, 39) Source(29, 35) + SourceIndex(0)
-13>Emitted(11, 40) Source(29, 36) + SourceIndex(0)
-14>Emitted(11, 42) Source(29, 38) + SourceIndex(0)
-15>Emitted(11, 43) Source(29, 39) + SourceIndex(0)
-16>Emitted(11, 46) Source(29, 42) + SourceIndex(0)
-17>Emitted(11, 47) Source(29, 43) + SourceIndex(0)
-18>Emitted(11, 49) Source(29, 45) + SourceIndex(0)
-19>Emitted(11, 50) Source(29, 46) + SourceIndex(0)
-20>Emitted(11, 52) Source(29, 48) + SourceIndex(0)
-21>Emitted(11, 54) Source(29, 50) + SourceIndex(0)
-22>Emitted(11, 55) Source(29, 51) + SourceIndex(0)
+4 >Emitted(11, 6) Source(29, 8) + SourceIndex(0)
+5 >Emitted(11, 24) Source(29, 19) + SourceIndex(0)
+6 >Emitted(11, 26) Source(29, 24) + SourceIndex(0)
+7 >Emitted(11, 31) Source(29, 29) + SourceIndex(0)
+8 >Emitted(11, 33) Source(29, 31) + SourceIndex(0)
+9 >Emitted(11, 34) Source(29, 32) + SourceIndex(0)
+10>Emitted(11, 37) Source(29, 35) + SourceIndex(0)
+11>Emitted(11, 38) Source(29, 36) + SourceIndex(0)
+12>Emitted(11, 40) Source(29, 38) + SourceIndex(0)
+13>Emitted(11, 41) Source(29, 39) + SourceIndex(0)
+14>Emitted(11, 44) Source(29, 42) + SourceIndex(0)
+15>Emitted(11, 45) Source(29, 43) + SourceIndex(0)
+16>Emitted(11, 47) Source(29, 45) + SourceIndex(0)
+17>Emitted(11, 48) Source(29, 46) + SourceIndex(0)
+18>Emitted(11, 50) Source(29, 48) + SourceIndex(0)
+19>Emitted(11, 52) Source(29, 50) + SourceIndex(0)
+20>Emitted(11, 53) Source(29, 51) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -382,81 +376,75 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(13, 1) Source(31, 1) + SourceIndex(0)
 2 >Emitted(13, 2) Source(31, 2) + SourceIndex(0)
 ---
->>>for ((_a = getRobot(), nameA = _a.name, _a), i = 0; i < 1; i++) {
+>>>for (_a = getRobot(), nameA = _a.name, _a, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^
-9 >                                      ^^^^^
-10>                                           ^^
-11>                                             ^
-12>                                              ^^^
-13>                                                 ^
-14>                                                  ^^
-15>                                                    ^
-16>                                                     ^^^
-17>                                                        ^
-18>                                                         ^^
-19>                                                           ^
-20>                                                            ^^
-21>                                                              ^^
-22>                                                                ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^
+8 >                                     ^^^^^^
+9 >                                           ^
+10>                                            ^^^
+11>                                               ^
+12>                                                ^^
+13>                                                  ^
+14>                                                   ^^^
+15>                                                      ^
+16>                                                       ^^
+17>                                                         ^
+18>                                                          ^^
+19>                                                            ^^
+20>                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name: nameA } = getRobot()
-7 >                     
-8 >                       name: nameA
-9 >                                       } = getRobot()
-10>                                           , 
-11>                                             i
-12>                                               = 
-13>                                                 0
-14>                                                  ; 
-15>                                                    i
-16>                                                      < 
-17>                                                        1
-18>                                                         ; 
-19>                                                           i
-20>                                                            ++
-21>                                                              ) 
-22>                                                                {
+5 >     { name: nameA } = getRobot()
+6 >                    
+7 >                      name: nameA
+8 >                                      } = getRobot(), 
+9 >                                           i
+10>                                             = 
+11>                                               0
+12>                                                ; 
+13>                                                  i
+14>                                                    < 
+15>                                                      1
+16>                                                       ; 
+17>                                                         i
+18>                                                          ++
+19>                                                            ) 
+20>                                                              {
 1->Emitted(14, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(14, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(14, 5) Source(32, 5) + SourceIndex(0)
 4 >Emitted(14, 6) Source(32, 6) + SourceIndex(0)
-5 >Emitted(14, 7) Source(32, 6) + SourceIndex(0)
-6 >Emitted(14, 22) Source(32, 34) + SourceIndex(0)
-7 >Emitted(14, 24) Source(32, 8) + SourceIndex(0)
-8 >Emitted(14, 39) Source(32, 19) + SourceIndex(0)
-9 >Emitted(14, 44) Source(32, 34) + SourceIndex(0)
-10>Emitted(14, 46) Source(32, 36) + SourceIndex(0)
-11>Emitted(14, 47) Source(32, 37) + SourceIndex(0)
-12>Emitted(14, 50) Source(32, 40) + SourceIndex(0)
-13>Emitted(14, 51) Source(32, 41) + SourceIndex(0)
-14>Emitted(14, 53) Source(32, 43) + SourceIndex(0)
-15>Emitted(14, 54) Source(32, 44) + SourceIndex(0)
-16>Emitted(14, 57) Source(32, 47) + SourceIndex(0)
-17>Emitted(14, 58) Source(32, 48) + SourceIndex(0)
-18>Emitted(14, 60) Source(32, 50) + SourceIndex(0)
-19>Emitted(14, 61) Source(32, 51) + SourceIndex(0)
-20>Emitted(14, 63) Source(32, 53) + SourceIndex(0)
-21>Emitted(14, 65) Source(32, 55) + SourceIndex(0)
-22>Emitted(14, 66) Source(32, 56) + SourceIndex(0)
+5 >Emitted(14, 21) Source(32, 34) + SourceIndex(0)
+6 >Emitted(14, 23) Source(32, 8) + SourceIndex(0)
+7 >Emitted(14, 38) Source(32, 19) + SourceIndex(0)
+8 >Emitted(14, 44) Source(32, 36) + SourceIndex(0)
+9 >Emitted(14, 45) Source(32, 37) + SourceIndex(0)
+10>Emitted(14, 48) Source(32, 40) + SourceIndex(0)
+11>Emitted(14, 49) Source(32, 41) + SourceIndex(0)
+12>Emitted(14, 51) Source(32, 43) + SourceIndex(0)
+13>Emitted(14, 52) Source(32, 44) + SourceIndex(0)
+14>Emitted(14, 55) Source(32, 47) + SourceIndex(0)
+15>Emitted(14, 56) Source(32, 48) + SourceIndex(0)
+16>Emitted(14, 58) Source(32, 50) + SourceIndex(0)
+17>Emitted(14, 59) Source(32, 51) + SourceIndex(0)
+18>Emitted(14, 61) Source(32, 53) + SourceIndex(0)
+19>Emitted(14, 63) Source(32, 55) + SourceIndex(0)
+20>Emitted(14, 64) Source(32, 56) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -488,81 +476,75 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(16, 1) Source(34, 1) + SourceIndex(0)
 2 >Emitted(16, 2) Source(34, 2) + SourceIndex(0)
 ---
->>>for ((_b = { name: "trimmer", skill: "trimming" }, nameA = _b.name, _b), i = 0; i < 1; i++) {
+>>>for (_b = { name: "trimmer", skill: "trimming" }, nameA = _b.name, _b, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^^
-9 >                                                                  ^^^^^
-10>                                                                       ^^
-11>                                                                         ^
-12>                                                                          ^^^
-13>                                                                             ^
-14>                                                                              ^^
-15>                                                                                ^
-16>                                                                                 ^^^
-17>                                                                                    ^
-18>                                                                                     ^^
-19>                                                                                       ^
-20>                                                                                        ^^
-21>                                                                                          ^^
-22>                                                                                            ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^^^^
+8 >                                                                 ^^^^^^
+9 >                                                                       ^
+10>                                                                        ^^^
+11>                                                                           ^
+12>                                                                            ^^
+13>                                                                              ^
+14>                                                                               ^^^
+15>                                                                                  ^
+16>                                                                                   ^^
+17>                                                                                     ^
+18>                                                                                      ^^
+19>                                                                                        ^^
+20>                                                                                          ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                 
-8 >                                                   name: nameA
-9 >                                                                   } = <Robot>{ name: "trimmer", skill: "trimming" }
-10>                                                                       , 
-11>                                                                         i
-12>                                                                           = 
-13>                                                                             0
-14>                                                                              ; 
-15>                                                                                i
-16>                                                                                  < 
-17>                                                                                    1
-18>                                                                                     ; 
-19>                                                                                       i
-20>                                                                                        ++
-21>                                                                                          ) 
-22>                                                                                            {
+5 >     { name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                
+7 >                                                  name: nameA
+8 >                                                                  } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+9 >                                                                       i
+10>                                                                         = 
+11>                                                                           0
+12>                                                                            ; 
+13>                                                                              i
+14>                                                                                < 
+15>                                                                                  1
+16>                                                                                   ; 
+17>                                                                                     i
+18>                                                                                      ++
+19>                                                                                        ) 
+20>                                                                                          {
 1->Emitted(17, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(17, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(17, 5) Source(35, 5) + SourceIndex(0)
 4 >Emitted(17, 6) Source(35, 6) + SourceIndex(0)
-5 >Emitted(17, 7) Source(35, 6) + SourceIndex(0)
-6 >Emitted(17, 50) Source(35, 69) + SourceIndex(0)
-7 >Emitted(17, 52) Source(35, 8) + SourceIndex(0)
-8 >Emitted(17, 67) Source(35, 19) + SourceIndex(0)
-9 >Emitted(17, 72) Source(35, 69) + SourceIndex(0)
-10>Emitted(17, 74) Source(35, 71) + SourceIndex(0)
-11>Emitted(17, 75) Source(35, 72) + SourceIndex(0)
-12>Emitted(17, 78) Source(35, 75) + SourceIndex(0)
-13>Emitted(17, 79) Source(35, 76) + SourceIndex(0)
-14>Emitted(17, 81) Source(35, 78) + SourceIndex(0)
-15>Emitted(17, 82) Source(35, 79) + SourceIndex(0)
-16>Emitted(17, 85) Source(35, 82) + SourceIndex(0)
-17>Emitted(17, 86) Source(35, 83) + SourceIndex(0)
-18>Emitted(17, 88) Source(35, 85) + SourceIndex(0)
-19>Emitted(17, 89) Source(35, 86) + SourceIndex(0)
-20>Emitted(17, 91) Source(35, 88) + SourceIndex(0)
-21>Emitted(17, 93) Source(35, 90) + SourceIndex(0)
-22>Emitted(17, 94) Source(35, 91) + SourceIndex(0)
+5 >Emitted(17, 49) Source(35, 69) + SourceIndex(0)
+6 >Emitted(17, 51) Source(35, 8) + SourceIndex(0)
+7 >Emitted(17, 66) Source(35, 19) + SourceIndex(0)
+8 >Emitted(17, 72) Source(35, 71) + SourceIndex(0)
+9 >Emitted(17, 73) Source(35, 72) + SourceIndex(0)
+10>Emitted(17, 76) Source(35, 75) + SourceIndex(0)
+11>Emitted(17, 77) Source(35, 76) + SourceIndex(0)
+12>Emitted(17, 79) Source(35, 78) + SourceIndex(0)
+13>Emitted(17, 80) Source(35, 79) + SourceIndex(0)
+14>Emitted(17, 83) Source(35, 82) + SourceIndex(0)
+15>Emitted(17, 84) Source(35, 83) + SourceIndex(0)
+16>Emitted(17, 86) Source(35, 85) + SourceIndex(0)
+17>Emitted(17, 87) Source(35, 86) + SourceIndex(0)
+18>Emitted(17, 89) Source(35, 88) + SourceIndex(0)
+19>Emitted(17, 91) Source(35, 90) + SourceIndex(0)
+20>Emitted(17, 92) Source(35, 91) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -594,93 +576,87 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(19, 1) Source(37, 1) + SourceIndex(0)
 2 >Emitted(19, 2) Source(37, 2) + SourceIndex(0)
 ---
->>>for ((_c = multiRobot.skills, primaryA = _c.primary, secondaryA = _c.secondary, multiRobot), i = 0; i < 1; i++) {
+>>>for (_c = multiRobot.skills, primaryA = _c.primary, secondaryA = _c.secondary, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^
-7 >                            ^^
-8 >                              ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                   ^^
-10>                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                              ^^
-12>                                                                                ^^^^^^^^^^
-13>                                                                                          ^
-14>                                                                                           ^^
-15>                                                                                             ^
-16>                                                                                              ^^^
-17>                                                                                                 ^
-18>                                                                                                  ^^
-19>                                                                                                    ^
-20>                                                                                                     ^^^
-21>                                                                                                        ^
-22>                                                                                                         ^^
-23>                                                                                                           ^
-24>                                                                                                            ^^
-25>                                                                                                              ^^
-26>                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^
+6 >                           ^^
+7 >                             ^^^^^^^^^^^^^^^^^^^^^
+8 >                                                  ^^
+9 >                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                             ^^
+11>                                                                               ^^^^^^^^^^
+12>                                                                                         ^^
+13>                                                                                           ^
+14>                                                                                            ^^^
+15>                                                                                               ^
+16>                                                                                                ^^
+17>                                                                                                  ^
+18>                                                                                                   ^^^
+19>                                                                                                      ^
+20>                                                                                                       ^^
+21>                                                                                                         ^
+22>                                                                                                          ^^
+23>                                                                                                            ^^
+24>                                                                                                              ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      skills: { primary: primaryA, secondary: secondaryA }
-7 >                            
-8 >                              primary: primaryA
-9 >                                                   , 
-10>                                                     secondary: secondaryA
-11>                                                                               } } = 
-12>                                                                                multiRobot
-13>                                                                                          
-14>                                                                                           , 
-15>                                                                                             i
-16>                                                                                               = 
-17>                                                                                                 0
-18>                                                                                                  ; 
-19>                                                                                                    i
-20>                                                                                                      < 
-21>                                                                                                        1
-22>                                                                                                         ; 
-23>                                                                                                           i
-24>                                                                                                            ++
-25>                                                                                                              ) 
-26>                                                                                                                {
+4 >    ({ 
+5 >     skills: { primary: primaryA, secondary: secondaryA }
+6 >                           
+7 >                             primary: primaryA
+8 >                                                  , 
+9 >                                                    secondary: secondaryA
+10>                                                                              } } = 
+11>                                                                               multiRobot
+12>                                                                                         , 
+13>                                                                                           i
+14>                                                                                             = 
+15>                                                                                               0
+16>                                                                                                ; 
+17>                                                                                                  i
+18>                                                                                                    < 
+19>                                                                                                      1
+20>                                                                                                       ; 
+21>                                                                                                         i
+22>                                                                                                          ++
+23>                                                                                                            ) 
+24>                                                                                                              {
 1->Emitted(20, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(20, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(20, 5) Source(38, 5) + SourceIndex(0)
-4 >Emitted(20, 6) Source(38, 6) + SourceIndex(0)
-5 >Emitted(20, 7) Source(38, 8) + SourceIndex(0)
-6 >Emitted(20, 29) Source(38, 60) + SourceIndex(0)
-7 >Emitted(20, 31) Source(38, 18) + SourceIndex(0)
-8 >Emitted(20, 52) Source(38, 35) + SourceIndex(0)
-9 >Emitted(20, 54) Source(38, 37) + SourceIndex(0)
-10>Emitted(20, 79) Source(38, 58) + SourceIndex(0)
-11>Emitted(20, 81) Source(38, 65) + SourceIndex(0)
-12>Emitted(20, 91) Source(38, 75) + SourceIndex(0)
-13>Emitted(20, 92) Source(38, 75) + SourceIndex(0)
-14>Emitted(20, 94) Source(38, 77) + SourceIndex(0)
-15>Emitted(20, 95) Source(38, 78) + SourceIndex(0)
-16>Emitted(20, 98) Source(38, 81) + SourceIndex(0)
-17>Emitted(20, 99) Source(38, 82) + SourceIndex(0)
-18>Emitted(20, 101) Source(38, 84) + SourceIndex(0)
-19>Emitted(20, 102) Source(38, 85) + SourceIndex(0)
-20>Emitted(20, 105) Source(38, 88) + SourceIndex(0)
-21>Emitted(20, 106) Source(38, 89) + SourceIndex(0)
-22>Emitted(20, 108) Source(38, 91) + SourceIndex(0)
-23>Emitted(20, 109) Source(38, 92) + SourceIndex(0)
-24>Emitted(20, 111) Source(38, 94) + SourceIndex(0)
-25>Emitted(20, 113) Source(38, 96) + SourceIndex(0)
-26>Emitted(20, 114) Source(38, 97) + SourceIndex(0)
+4 >Emitted(20, 6) Source(38, 8) + SourceIndex(0)
+5 >Emitted(20, 28) Source(38, 60) + SourceIndex(0)
+6 >Emitted(20, 30) Source(38, 18) + SourceIndex(0)
+7 >Emitted(20, 51) Source(38, 35) + SourceIndex(0)
+8 >Emitted(20, 53) Source(38, 37) + SourceIndex(0)
+9 >Emitted(20, 78) Source(38, 58) + SourceIndex(0)
+10>Emitted(20, 80) Source(38, 65) + SourceIndex(0)
+11>Emitted(20, 90) Source(38, 75) + SourceIndex(0)
+12>Emitted(20, 92) Source(38, 77) + SourceIndex(0)
+13>Emitted(20, 93) Source(38, 78) + SourceIndex(0)
+14>Emitted(20, 96) Source(38, 81) + SourceIndex(0)
+15>Emitted(20, 97) Source(38, 82) + SourceIndex(0)
+16>Emitted(20, 99) Source(38, 84) + SourceIndex(0)
+17>Emitted(20, 100) Source(38, 85) + SourceIndex(0)
+18>Emitted(20, 103) Source(38, 88) + SourceIndex(0)
+19>Emitted(20, 104) Source(38, 89) + SourceIndex(0)
+20>Emitted(20, 106) Source(38, 91) + SourceIndex(0)
+21>Emitted(20, 107) Source(38, 92) + SourceIndex(0)
+22>Emitted(20, 109) Source(38, 94) + SourceIndex(0)
+23>Emitted(20, 111) Source(38, 96) + SourceIndex(0)
+24>Emitted(20, 112) Source(38, 97) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -712,93 +688,87 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(22, 1) Source(40, 1) + SourceIndex(0)
 2 >Emitted(22, 2) Source(40, 2) + SourceIndex(0)
 ---
->>>for ((_d = getMultiRobot(), _e = _d.skills, primaryA = _e.primary, secondaryA = _e.secondary, _d), i = 0; i < 1; i++) {
+>>>for (_d = getMultiRobot(), _e = _d.skills, primaryA = _e.primary, secondaryA = _e.secondary, _d, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^
-9 >                                          ^^
-10>                                            ^^^^^^^^^^^^^^^^^^^^^
-11>                                                                 ^^
-12>                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                            ^^^^^
-14>                                                                                                 ^^
-15>                                                                                                   ^
-16>                                                                                                    ^^^
-17>                                                                                                       ^
-18>                                                                                                        ^^
-19>                                                                                                          ^
-20>                                                                                                           ^^^
-21>                                                                                                              ^
-22>                                                                                                               ^^
-23>                                                                                                                 ^
-24>                                                                                                                  ^^
-25>                                                                                                                    ^^
-26>                                                                                                                      ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                ^^
+11>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                           ^^^^^^
+13>                                                                                                 ^
+14>                                                                                                  ^^^
+15>                                                                                                     ^
+16>                                                                                                      ^^
+17>                                                                                                        ^
+18>                                                                                                         ^^^
+19>                                                                                                            ^
+20>                                                                                                             ^^
+21>                                                                                                               ^
+22>                                                                                                                ^^
+23>                                                                                                                  ^^
+24>                                                                                                                    ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot()
-7 >                          
-8 >                            skills: { primary: primaryA, secondary: secondaryA }
-9 >                                          
-10>                                            primary: primaryA
-11>                                                                 , 
-12>                                                                   secondary: secondaryA
-13>                                                                                             } } = getMultiRobot()
-14>                                                                                                 , 
-15>                                                                                                   i
-16>                                                                                                     = 
-17>                                                                                                       0
-18>                                                                                                        ; 
-19>                                                                                                          i
-20>                                                                                                            < 
-21>                                                                                                              1
-22>                                                                                                               ; 
-23>                                                                                                                 i
-24>                                                                                                                  ++
-25>                                                                                                                    ) 
-26>                                                                                                                      {
+5 >     { skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot()
+6 >                         
+7 >                           skills: { primary: primaryA, secondary: secondaryA }
+8 >                                         
+9 >                                           primary: primaryA
+10>                                                                , 
+11>                                                                  secondary: secondaryA
+12>                                                                                            } } = getMultiRobot(), 
+13>                                                                                                 i
+14>                                                                                                   = 
+15>                                                                                                     0
+16>                                                                                                      ; 
+17>                                                                                                        i
+18>                                                                                                          < 
+19>                                                                                                            1
+20>                                                                                                             ; 
+21>                                                                                                               i
+22>                                                                                                                ++
+23>                                                                                                                  ) 
+24>                                                                                                                    {
 1->Emitted(23, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(23, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(23, 5) Source(41, 5) + SourceIndex(0)
 4 >Emitted(23, 6) Source(41, 6) + SourceIndex(0)
-5 >Emitted(23, 7) Source(41, 6) + SourceIndex(0)
-6 >Emitted(23, 27) Source(41, 80) + SourceIndex(0)
-7 >Emitted(23, 29) Source(41, 8) + SourceIndex(0)
-8 >Emitted(23, 43) Source(41, 60) + SourceIndex(0)
-9 >Emitted(23, 45) Source(41, 18) + SourceIndex(0)
-10>Emitted(23, 66) Source(41, 35) + SourceIndex(0)
-11>Emitted(23, 68) Source(41, 37) + SourceIndex(0)
-12>Emitted(23, 93) Source(41, 58) + SourceIndex(0)
-13>Emitted(23, 98) Source(41, 80) + SourceIndex(0)
-14>Emitted(23, 100) Source(41, 82) + SourceIndex(0)
-15>Emitted(23, 101) Source(41, 83) + SourceIndex(0)
-16>Emitted(23, 104) Source(41, 86) + SourceIndex(0)
-17>Emitted(23, 105) Source(41, 87) + SourceIndex(0)
-18>Emitted(23, 107) Source(41, 89) + SourceIndex(0)
-19>Emitted(23, 108) Source(41, 90) + SourceIndex(0)
-20>Emitted(23, 111) Source(41, 93) + SourceIndex(0)
-21>Emitted(23, 112) Source(41, 94) + SourceIndex(0)
-22>Emitted(23, 114) Source(41, 96) + SourceIndex(0)
-23>Emitted(23, 115) Source(41, 97) + SourceIndex(0)
-24>Emitted(23, 117) Source(41, 99) + SourceIndex(0)
-25>Emitted(23, 119) Source(41, 101) + SourceIndex(0)
-26>Emitted(23, 120) Source(41, 102) + SourceIndex(0)
+5 >Emitted(23, 26) Source(41, 80) + SourceIndex(0)
+6 >Emitted(23, 28) Source(41, 8) + SourceIndex(0)
+7 >Emitted(23, 42) Source(41, 60) + SourceIndex(0)
+8 >Emitted(23, 44) Source(41, 18) + SourceIndex(0)
+9 >Emitted(23, 65) Source(41, 35) + SourceIndex(0)
+10>Emitted(23, 67) Source(41, 37) + SourceIndex(0)
+11>Emitted(23, 92) Source(41, 58) + SourceIndex(0)
+12>Emitted(23, 98) Source(41, 82) + SourceIndex(0)
+13>Emitted(23, 99) Source(41, 83) + SourceIndex(0)
+14>Emitted(23, 102) Source(41, 86) + SourceIndex(0)
+15>Emitted(23, 103) Source(41, 87) + SourceIndex(0)
+16>Emitted(23, 105) Source(41, 89) + SourceIndex(0)
+17>Emitted(23, 106) Source(41, 90) + SourceIndex(0)
+18>Emitted(23, 109) Source(41, 93) + SourceIndex(0)
+19>Emitted(23, 110) Source(41, 94) + SourceIndex(0)
+20>Emitted(23, 112) Source(41, 96) + SourceIndex(0)
+21>Emitted(23, 113) Source(41, 97) + SourceIndex(0)
+22>Emitted(23, 115) Source(41, 99) + SourceIndex(0)
+23>Emitted(23, 117) Source(41, 101) + SourceIndex(0)
+24>Emitted(23, 118) Source(41, 102) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -830,56 +800,49 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(25, 1) Source(43, 1) + SourceIndex(0)
 2 >Emitted(25, 2) Source(43, 2) + SourceIndex(0)
 ---
->>>for ((_f = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _g = _f.skills, primaryA = _g.primary, secondaryA = _g.secondary, _f),
+>>>for (_f = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _g = _f.skills, primaryA = _g.primary, secondaryA = _g.secondary, _f,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^
-9 >                                                                                                    ^^
-10>                                                                                                      ^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                           ^^
-12>                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                      ^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^
+8 >                                                                                                   ^^
+9 >                                                                                                     ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                          ^^
+11>                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { skills: { primary: primaryA, secondary: secondaryA } } =
-  >          <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                    
-8 >                                                                                      skills: { primary: primaryA, secondary: secondaryA }
-9 >                                                                                                    
-10>                                                                                                      primary: primaryA
-11>                                                                                                                           , 
-12>                                                                                                                             secondary: secondaryA
-13>                                                                                                                                                       } } =
-  >                                                                                                                                                          <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     { skills: { primary: primaryA, secondary: secondaryA } } =
+  >         <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                   
+7 >                                                                                     skills: { primary: primaryA, secondary: secondaryA }
+8 >                                                                                                   
+9 >                                                                                                     primary: primaryA
+10>                                                                                                                          , 
+11>                                                                                                                            secondary: secondaryA
 1->Emitted(26, 1) Source(44, 1) + SourceIndex(0)
 2 >Emitted(26, 4) Source(44, 4) + SourceIndex(0)
 3 >Emitted(26, 5) Source(44, 5) + SourceIndex(0)
 4 >Emitted(26, 6) Source(44, 6) + SourceIndex(0)
-5 >Emitted(26, 7) Source(44, 6) + SourceIndex(0)
-6 >Emitted(26, 85) Source(45, 90) + SourceIndex(0)
-7 >Emitted(26, 87) Source(44, 8) + SourceIndex(0)
-8 >Emitted(26, 101) Source(44, 60) + SourceIndex(0)
-9 >Emitted(26, 103) Source(44, 18) + SourceIndex(0)
-10>Emitted(26, 124) Source(44, 35) + SourceIndex(0)
-11>Emitted(26, 126) Source(44, 37) + SourceIndex(0)
-12>Emitted(26, 151) Source(44, 58) + SourceIndex(0)
-13>Emitted(26, 156) Source(45, 90) + SourceIndex(0)
+5 >Emitted(26, 84) Source(45, 90) + SourceIndex(0)
+6 >Emitted(26, 86) Source(44, 8) + SourceIndex(0)
+7 >Emitted(26, 100) Source(44, 60) + SourceIndex(0)
+8 >Emitted(26, 102) Source(44, 18) + SourceIndex(0)
+9 >Emitted(26, 123) Source(44, 35) + SourceIndex(0)
+10>Emitted(26, 125) Source(44, 37) + SourceIndex(0)
+11>Emitted(26, 150) Source(44, 58) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -896,7 +859,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 > } } =
+  >    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
@@ -954,81 +918,75 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(29, 1) Source(48, 1) + SourceIndex(0)
 2 >Emitted(29, 2) Source(48, 2) + SourceIndex(0)
 ---
->>>for ((name = robot.name, robot), i = 0; i < 1; i++) {
+>>>for (name = robot.name, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^
-7 >                       ^^
-8 >                         ^^^^^
-9 >                              ^
-10>                               ^^
-11>                                 ^
-12>                                  ^^^
-13>                                     ^
-14>                                      ^^
-15>                                        ^
-16>                                         ^^^
-17>                                            ^
-18>                                             ^^
-19>                                               ^
-20>                                                ^^
-21>                                                  ^^
-22>                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^
+6 >                      ^^
+7 >                        ^^^^^
+8 >                             ^^
+9 >                               ^
+10>                                ^^^
+11>                                   ^
+12>                                    ^^
+13>                                      ^
+14>                                       ^^^
+15>                                          ^
+16>                                           ^^
+17>                                             ^
+18>                                              ^^
+19>                                                ^^
+20>                                                  ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name
-7 >                        } = 
-8 >                         robot
-9 >                              
-10>                               , 
-11>                                 i
-12>                                   = 
-13>                                     0
-14>                                      ; 
-15>                                        i
-16>                                          < 
-17>                                            1
-18>                                             ; 
-19>                                               i
-20>                                                ++
-21>                                                  ) 
-22>                                                    {
+4 >    ({ 
+5 >     name
+6 >                       } = 
+7 >                        robot
+8 >                             , 
+9 >                               i
+10>                                 = 
+11>                                   0
+12>                                    ; 
+13>                                      i
+14>                                        < 
+15>                                          1
+16>                                           ; 
+17>                                             i
+18>                                              ++
+19>                                                ) 
+20>                                                  {
 1->Emitted(30, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(30, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(30, 5) Source(49, 5) + SourceIndex(0)
-4 >Emitted(30, 6) Source(49, 6) + SourceIndex(0)
-5 >Emitted(30, 7) Source(49, 8) + SourceIndex(0)
-6 >Emitted(30, 24) Source(49, 12) + SourceIndex(0)
-7 >Emitted(30, 26) Source(49, 17) + SourceIndex(0)
-8 >Emitted(30, 31) Source(49, 22) + SourceIndex(0)
-9 >Emitted(30, 32) Source(49, 22) + SourceIndex(0)
-10>Emitted(30, 34) Source(49, 24) + SourceIndex(0)
-11>Emitted(30, 35) Source(49, 25) + SourceIndex(0)
-12>Emitted(30, 38) Source(49, 28) + SourceIndex(0)
-13>Emitted(30, 39) Source(49, 29) + SourceIndex(0)
-14>Emitted(30, 41) Source(49, 31) + SourceIndex(0)
-15>Emitted(30, 42) Source(49, 32) + SourceIndex(0)
-16>Emitted(30, 45) Source(49, 35) + SourceIndex(0)
-17>Emitted(30, 46) Source(49, 36) + SourceIndex(0)
-18>Emitted(30, 48) Source(49, 38) + SourceIndex(0)
-19>Emitted(30, 49) Source(49, 39) + SourceIndex(0)
-20>Emitted(30, 51) Source(49, 41) + SourceIndex(0)
-21>Emitted(30, 53) Source(49, 43) + SourceIndex(0)
-22>Emitted(30, 54) Source(49, 44) + SourceIndex(0)
+4 >Emitted(30, 6) Source(49, 8) + SourceIndex(0)
+5 >Emitted(30, 23) Source(49, 12) + SourceIndex(0)
+6 >Emitted(30, 25) Source(49, 17) + SourceIndex(0)
+7 >Emitted(30, 30) Source(49, 22) + SourceIndex(0)
+8 >Emitted(30, 32) Source(49, 24) + SourceIndex(0)
+9 >Emitted(30, 33) Source(49, 25) + SourceIndex(0)
+10>Emitted(30, 36) Source(49, 28) + SourceIndex(0)
+11>Emitted(30, 37) Source(49, 29) + SourceIndex(0)
+12>Emitted(30, 39) Source(49, 31) + SourceIndex(0)
+13>Emitted(30, 40) Source(49, 32) + SourceIndex(0)
+14>Emitted(30, 43) Source(49, 35) + SourceIndex(0)
+15>Emitted(30, 44) Source(49, 36) + SourceIndex(0)
+16>Emitted(30, 46) Source(49, 38) + SourceIndex(0)
+17>Emitted(30, 47) Source(49, 39) + SourceIndex(0)
+18>Emitted(30, 49) Source(49, 41) + SourceIndex(0)
+19>Emitted(30, 51) Source(49, 43) + SourceIndex(0)
+20>Emitted(30, 52) Source(49, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1060,81 +1018,75 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(32, 1) Source(51, 1) + SourceIndex(0)
 2 >Emitted(32, 2) Source(51, 2) + SourceIndex(0)
 ---
->>>for ((_h = getRobot(), name = _h.name, _h), i = 0; i < 1; i++) {
+>>>for (_h = getRobot(), name = _h.name, _h, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^
-9 >                                     ^^^^^
-10>                                          ^^
-11>                                            ^
-12>                                             ^^^
-13>                                                ^
-14>                                                 ^^
-15>                                                   ^
-16>                                                    ^^^
-17>                                                       ^
-18>                                                        ^^
-19>                                                          ^
-20>                                                           ^^
-21>                                                             ^^
-22>                                                               ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^
+8 >                                    ^^^^^^
+9 >                                          ^
+10>                                           ^^^
+11>                                              ^
+12>                                               ^^
+13>                                                 ^
+14>                                                  ^^^
+15>                                                     ^
+16>                                                      ^^
+17>                                                        ^
+18>                                                         ^^
+19>                                                           ^^
+20>                                                             ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name } = getRobot()
-7 >                     
-8 >                       name
-9 >                                      } = getRobot()
-10>                                          , 
-11>                                            i
-12>                                              = 
-13>                                                0
-14>                                                 ; 
-15>                                                   i
-16>                                                     < 
-17>                                                       1
-18>                                                        ; 
-19>                                                          i
-20>                                                           ++
-21>                                                             ) 
-22>                                                               {
+5 >     { name } = getRobot()
+6 >                    
+7 >                      name
+8 >                                     } = getRobot(), 
+9 >                                          i
+10>                                            = 
+11>                                              0
+12>                                               ; 
+13>                                                 i
+14>                                                   < 
+15>                                                     1
+16>                                                      ; 
+17>                                                        i
+18>                                                         ++
+19>                                                           ) 
+20>                                                             {
 1->Emitted(33, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(52, 5) + SourceIndex(0)
 4 >Emitted(33, 6) Source(52, 6) + SourceIndex(0)
-5 >Emitted(33, 7) Source(52, 6) + SourceIndex(0)
-6 >Emitted(33, 22) Source(52, 27) + SourceIndex(0)
-7 >Emitted(33, 24) Source(52, 8) + SourceIndex(0)
-8 >Emitted(33, 38) Source(52, 12) + SourceIndex(0)
-9 >Emitted(33, 43) Source(52, 27) + SourceIndex(0)
-10>Emitted(33, 45) Source(52, 29) + SourceIndex(0)
-11>Emitted(33, 46) Source(52, 30) + SourceIndex(0)
-12>Emitted(33, 49) Source(52, 33) + SourceIndex(0)
-13>Emitted(33, 50) Source(52, 34) + SourceIndex(0)
-14>Emitted(33, 52) Source(52, 36) + SourceIndex(0)
-15>Emitted(33, 53) Source(52, 37) + SourceIndex(0)
-16>Emitted(33, 56) Source(52, 40) + SourceIndex(0)
-17>Emitted(33, 57) Source(52, 41) + SourceIndex(0)
-18>Emitted(33, 59) Source(52, 43) + SourceIndex(0)
-19>Emitted(33, 60) Source(52, 44) + SourceIndex(0)
-20>Emitted(33, 62) Source(52, 46) + SourceIndex(0)
-21>Emitted(33, 64) Source(52, 48) + SourceIndex(0)
-22>Emitted(33, 65) Source(52, 49) + SourceIndex(0)
+5 >Emitted(33, 21) Source(52, 27) + SourceIndex(0)
+6 >Emitted(33, 23) Source(52, 8) + SourceIndex(0)
+7 >Emitted(33, 37) Source(52, 12) + SourceIndex(0)
+8 >Emitted(33, 43) Source(52, 29) + SourceIndex(0)
+9 >Emitted(33, 44) Source(52, 30) + SourceIndex(0)
+10>Emitted(33, 47) Source(52, 33) + SourceIndex(0)
+11>Emitted(33, 48) Source(52, 34) + SourceIndex(0)
+12>Emitted(33, 50) Source(52, 36) + SourceIndex(0)
+13>Emitted(33, 51) Source(52, 37) + SourceIndex(0)
+14>Emitted(33, 54) Source(52, 40) + SourceIndex(0)
+15>Emitted(33, 55) Source(52, 41) + SourceIndex(0)
+16>Emitted(33, 57) Source(52, 43) + SourceIndex(0)
+17>Emitted(33, 58) Source(52, 44) + SourceIndex(0)
+18>Emitted(33, 60) Source(52, 46) + SourceIndex(0)
+19>Emitted(33, 62) Source(52, 48) + SourceIndex(0)
+20>Emitted(33, 63) Source(52, 49) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1166,81 +1118,75 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(35, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(35, 2) Source(54, 2) + SourceIndex(0)
 ---
->>>for ((_j = { name: "trimmer", skill: "trimming" }, name = _j.name, _j), i = 0; i < 1; i++) {
+>>>for (_j = { name: "trimmer", skill: "trimming" }, name = _j.name, _j, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^
-9 >                                                                 ^^^^^
-10>                                                                      ^^
-11>                                                                        ^
-12>                                                                         ^^^
-13>                                                                            ^
-14>                                                                             ^^
-15>                                                                               ^
-16>                                                                                ^^^
-17>                                                                                   ^
-18>                                                                                    ^^
-19>                                                                                      ^
-20>                                                                                       ^^
-21>                                                                                         ^^
-22>                                                                                           ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^^^
+8 >                                                                ^^^^^^
+9 >                                                                      ^
+10>                                                                       ^^^
+11>                                                                          ^
+12>                                                                           ^^
+13>                                                                             ^
+14>                                                                              ^^^
+15>                                                                                 ^
+16>                                                                                  ^^
+17>                                                                                    ^
+18>                                                                                     ^^
+19>                                                                                       ^^
+20>                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                 
-8 >                                                   name
-9 >                                                                  } = <Robot>{ name: "trimmer", skill: "trimming" }
-10>                                                                      , 
-11>                                                                        i
-12>                                                                          = 
-13>                                                                            0
-14>                                                                             ; 
-15>                                                                               i
-16>                                                                                 < 
-17>                                                                                   1
-18>                                                                                    ; 
-19>                                                                                      i
-20>                                                                                       ++
-21>                                                                                         ) 
-22>                                                                                           {
+5 >     { name } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                
+7 >                                                  name
+8 >                                                                 } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+9 >                                                                      i
+10>                                                                        = 
+11>                                                                          0
+12>                                                                           ; 
+13>                                                                             i
+14>                                                                               < 
+15>                                                                                 1
+16>                                                                                  ; 
+17>                                                                                    i
+18>                                                                                     ++
+19>                                                                                       ) 
+20>                                                                                         {
 1->Emitted(36, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(36, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(36, 5) Source(55, 5) + SourceIndex(0)
 4 >Emitted(36, 6) Source(55, 6) + SourceIndex(0)
-5 >Emitted(36, 7) Source(55, 6) + SourceIndex(0)
-6 >Emitted(36, 50) Source(55, 62) + SourceIndex(0)
-7 >Emitted(36, 52) Source(55, 8) + SourceIndex(0)
-8 >Emitted(36, 66) Source(55, 12) + SourceIndex(0)
-9 >Emitted(36, 71) Source(55, 62) + SourceIndex(0)
-10>Emitted(36, 73) Source(55, 64) + SourceIndex(0)
-11>Emitted(36, 74) Source(55, 65) + SourceIndex(0)
-12>Emitted(36, 77) Source(55, 68) + SourceIndex(0)
-13>Emitted(36, 78) Source(55, 69) + SourceIndex(0)
-14>Emitted(36, 80) Source(55, 71) + SourceIndex(0)
-15>Emitted(36, 81) Source(55, 72) + SourceIndex(0)
-16>Emitted(36, 84) Source(55, 75) + SourceIndex(0)
-17>Emitted(36, 85) Source(55, 76) + SourceIndex(0)
-18>Emitted(36, 87) Source(55, 78) + SourceIndex(0)
-19>Emitted(36, 88) Source(55, 79) + SourceIndex(0)
-20>Emitted(36, 90) Source(55, 81) + SourceIndex(0)
-21>Emitted(36, 92) Source(55, 83) + SourceIndex(0)
-22>Emitted(36, 93) Source(55, 84) + SourceIndex(0)
+5 >Emitted(36, 49) Source(55, 62) + SourceIndex(0)
+6 >Emitted(36, 51) Source(55, 8) + SourceIndex(0)
+7 >Emitted(36, 65) Source(55, 12) + SourceIndex(0)
+8 >Emitted(36, 71) Source(55, 64) + SourceIndex(0)
+9 >Emitted(36, 72) Source(55, 65) + SourceIndex(0)
+10>Emitted(36, 75) Source(55, 68) + SourceIndex(0)
+11>Emitted(36, 76) Source(55, 69) + SourceIndex(0)
+12>Emitted(36, 78) Source(55, 71) + SourceIndex(0)
+13>Emitted(36, 79) Source(55, 72) + SourceIndex(0)
+14>Emitted(36, 82) Source(55, 75) + SourceIndex(0)
+15>Emitted(36, 83) Source(55, 76) + SourceIndex(0)
+16>Emitted(36, 85) Source(55, 78) + SourceIndex(0)
+17>Emitted(36, 86) Source(55, 79) + SourceIndex(0)
+18>Emitted(36, 88) Source(55, 81) + SourceIndex(0)
+19>Emitted(36, 90) Source(55, 83) + SourceIndex(0)
+20>Emitted(36, 91) Source(55, 84) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1272,93 +1218,87 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(38, 1) Source(57, 1) + SourceIndex(0)
 2 >Emitted(38, 2) Source(57, 2) + SourceIndex(0)
 ---
->>>for ((_k = multiRobot.skills, primary = _k.primary, secondary = _k.secondary, multiRobot), i = 0; i < 1; i++) {
+>>>for (_k = multiRobot.skills, primary = _k.primary, secondary = _k.secondary, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^
-7 >                            ^^
-8 >                              ^^^^^^^^^^^^^^^^^^^^
-9 >                                                  ^^
-10>                                                    ^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                            ^^
-12>                                                                              ^^^^^^^^^^
-13>                                                                                        ^
-14>                                                                                         ^^
-15>                                                                                           ^
-16>                                                                                            ^^^
-17>                                                                                               ^
-18>                                                                                                ^^
-19>                                                                                                  ^
-20>                                                                                                   ^^^
-21>                                                                                                      ^
-22>                                                                                                       ^^
-23>                                                                                                         ^
-24>                                                                                                          ^^
-25>                                                                                                            ^^
-26>                                                                                                              ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^
+6 >                           ^^
+7 >                             ^^^^^^^^^^^^^^^^^^^^
+8 >                                                 ^^
+9 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                           ^^
+11>                                                                             ^^^^^^^^^^
+12>                                                                                       ^^
+13>                                                                                         ^
+14>                                                                                          ^^^
+15>                                                                                             ^
+16>                                                                                              ^^
+17>                                                                                                ^
+18>                                                                                                 ^^^
+19>                                                                                                    ^
+20>                                                                                                     ^^
+21>                                                                                                       ^
+22>                                                                                                        ^^
+23>                                                                                                          ^^
+24>                                                                                                            ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      skills: { primary, secondary }
-7 >                            
-8 >                              primary
-9 >                                                  , 
-10>                                                    secondary
-11>                                                                             } } = 
-12>                                                                              multiRobot
-13>                                                                                        
-14>                                                                                         , 
-15>                                                                                           i
-16>                                                                                             = 
-17>                                                                                               0
-18>                                                                                                ; 
-19>                                                                                                  i
-20>                                                                                                    < 
-21>                                                                                                      1
-22>                                                                                                       ; 
-23>                                                                                                         i
-24>                                                                                                          ++
-25>                                                                                                            ) 
-26>                                                                                                              {
+4 >    ({ 
+5 >     skills: { primary, secondary }
+6 >                           
+7 >                             primary
+8 >                                                 , 
+9 >                                                   secondary
+10>                                                                            } } = 
+11>                                                                             multiRobot
+12>                                                                                       , 
+13>                                                                                         i
+14>                                                                                           = 
+15>                                                                                             0
+16>                                                                                              ; 
+17>                                                                                                i
+18>                                                                                                  < 
+19>                                                                                                    1
+20>                                                                                                     ; 
+21>                                                                                                       i
+22>                                                                                                        ++
+23>                                                                                                          ) 
+24>                                                                                                            {
 1->Emitted(39, 1) Source(58, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(58, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(58, 5) + SourceIndex(0)
-4 >Emitted(39, 6) Source(58, 6) + SourceIndex(0)
-5 >Emitted(39, 7) Source(58, 8) + SourceIndex(0)
-6 >Emitted(39, 29) Source(58, 38) + SourceIndex(0)
-7 >Emitted(39, 31) Source(58, 18) + SourceIndex(0)
-8 >Emitted(39, 51) Source(58, 25) + SourceIndex(0)
-9 >Emitted(39, 53) Source(58, 27) + SourceIndex(0)
-10>Emitted(39, 77) Source(58, 36) + SourceIndex(0)
-11>Emitted(39, 79) Source(58, 43) + SourceIndex(0)
-12>Emitted(39, 89) Source(58, 53) + SourceIndex(0)
-13>Emitted(39, 90) Source(58, 53) + SourceIndex(0)
-14>Emitted(39, 92) Source(58, 55) + SourceIndex(0)
-15>Emitted(39, 93) Source(58, 56) + SourceIndex(0)
-16>Emitted(39, 96) Source(58, 59) + SourceIndex(0)
-17>Emitted(39, 97) Source(58, 60) + SourceIndex(0)
-18>Emitted(39, 99) Source(58, 62) + SourceIndex(0)
-19>Emitted(39, 100) Source(58, 63) + SourceIndex(0)
-20>Emitted(39, 103) Source(58, 66) + SourceIndex(0)
-21>Emitted(39, 104) Source(58, 67) + SourceIndex(0)
-22>Emitted(39, 106) Source(58, 69) + SourceIndex(0)
-23>Emitted(39, 107) Source(58, 70) + SourceIndex(0)
-24>Emitted(39, 109) Source(58, 72) + SourceIndex(0)
-25>Emitted(39, 111) Source(58, 74) + SourceIndex(0)
-26>Emitted(39, 112) Source(58, 75) + SourceIndex(0)
+4 >Emitted(39, 6) Source(58, 8) + SourceIndex(0)
+5 >Emitted(39, 28) Source(58, 38) + SourceIndex(0)
+6 >Emitted(39, 30) Source(58, 18) + SourceIndex(0)
+7 >Emitted(39, 50) Source(58, 25) + SourceIndex(0)
+8 >Emitted(39, 52) Source(58, 27) + SourceIndex(0)
+9 >Emitted(39, 76) Source(58, 36) + SourceIndex(0)
+10>Emitted(39, 78) Source(58, 43) + SourceIndex(0)
+11>Emitted(39, 88) Source(58, 53) + SourceIndex(0)
+12>Emitted(39, 90) Source(58, 55) + SourceIndex(0)
+13>Emitted(39, 91) Source(58, 56) + SourceIndex(0)
+14>Emitted(39, 94) Source(58, 59) + SourceIndex(0)
+15>Emitted(39, 95) Source(58, 60) + SourceIndex(0)
+16>Emitted(39, 97) Source(58, 62) + SourceIndex(0)
+17>Emitted(39, 98) Source(58, 63) + SourceIndex(0)
+18>Emitted(39, 101) Source(58, 66) + SourceIndex(0)
+19>Emitted(39, 102) Source(58, 67) + SourceIndex(0)
+20>Emitted(39, 104) Source(58, 69) + SourceIndex(0)
+21>Emitted(39, 105) Source(58, 70) + SourceIndex(0)
+22>Emitted(39, 107) Source(58, 72) + SourceIndex(0)
+23>Emitted(39, 109) Source(58, 74) + SourceIndex(0)
+24>Emitted(39, 110) Source(58, 75) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1390,93 +1330,87 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(41, 1) Source(60, 1) + SourceIndex(0)
 2 >Emitted(41, 2) Source(60, 2) + SourceIndex(0)
 ---
->>>for ((_l = getMultiRobot(), _m = _l.skills, primary = _m.primary, secondary = _m.secondary, _l), i = 0; i < 1; i++) {
+>>>for (_l = getMultiRobot(), _m = _l.skills, primary = _m.primary, secondary = _m.secondary, _l, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^
-9 >                                          ^^
-10>                                            ^^^^^^^^^^^^^^^^^^^^
-11>                                                                ^^
-12>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                          ^^^^^
-14>                                                                                               ^^
-15>                                                                                                 ^
-16>                                                                                                  ^^^
-17>                                                                                                     ^
-18>                                                                                                      ^^
-19>                                                                                                        ^
-20>                                                                                                         ^^^
-21>                                                                                                            ^
-22>                                                                                                             ^^
-23>                                                                                                               ^
-24>                                                                                                                ^^
-25>                                                                                                                  ^^
-26>                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^^^^^^^
+10>                                                               ^^
+11>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                         ^^^^^^
+13>                                                                                               ^
+14>                                                                                                ^^^
+15>                                                                                                   ^
+16>                                                                                                    ^^
+17>                                                                                                      ^
+18>                                                                                                       ^^^
+19>                                                                                                          ^
+20>                                                                                                           ^^
+21>                                                                                                             ^
+22>                                                                                                              ^^
+23>                                                                                                                ^^
+24>                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { skills: { primary, secondary } } = getMultiRobot()
-7 >                          
-8 >                            skills: { primary, secondary }
-9 >                                          
-10>                                            primary
-11>                                                                , 
-12>                                                                  secondary
-13>                                                                                           } } = getMultiRobot()
-14>                                                                                               , 
-15>                                                                                                 i
-16>                                                                                                   = 
-17>                                                                                                     0
-18>                                                                                                      ; 
-19>                                                                                                        i
-20>                                                                                                          < 
-21>                                                                                                            1
-22>                                                                                                             ; 
-23>                                                                                                               i
-24>                                                                                                                ++
-25>                                                                                                                  ) 
-26>                                                                                                                    {
+5 >     { skills: { primary, secondary } } = getMultiRobot()
+6 >                         
+7 >                           skills: { primary, secondary }
+8 >                                         
+9 >                                           primary
+10>                                                               , 
+11>                                                                 secondary
+12>                                                                                          } } = getMultiRobot(), 
+13>                                                                                               i
+14>                                                                                                 = 
+15>                                                                                                   0
+16>                                                                                                    ; 
+17>                                                                                                      i
+18>                                                                                                        < 
+19>                                                                                                          1
+20>                                                                                                           ; 
+21>                                                                                                             i
+22>                                                                                                              ++
+23>                                                                                                                ) 
+24>                                                                                                                  {
 1->Emitted(42, 1) Source(61, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(61, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(61, 5) + SourceIndex(0)
 4 >Emitted(42, 6) Source(61, 6) + SourceIndex(0)
-5 >Emitted(42, 7) Source(61, 6) + SourceIndex(0)
-6 >Emitted(42, 27) Source(61, 58) + SourceIndex(0)
-7 >Emitted(42, 29) Source(61, 8) + SourceIndex(0)
-8 >Emitted(42, 43) Source(61, 38) + SourceIndex(0)
-9 >Emitted(42, 45) Source(61, 18) + SourceIndex(0)
-10>Emitted(42, 65) Source(61, 25) + SourceIndex(0)
-11>Emitted(42, 67) Source(61, 27) + SourceIndex(0)
-12>Emitted(42, 91) Source(61, 36) + SourceIndex(0)
-13>Emitted(42, 96) Source(61, 58) + SourceIndex(0)
-14>Emitted(42, 98) Source(61, 60) + SourceIndex(0)
-15>Emitted(42, 99) Source(61, 61) + SourceIndex(0)
-16>Emitted(42, 102) Source(61, 64) + SourceIndex(0)
-17>Emitted(42, 103) Source(61, 65) + SourceIndex(0)
-18>Emitted(42, 105) Source(61, 67) + SourceIndex(0)
-19>Emitted(42, 106) Source(61, 68) + SourceIndex(0)
-20>Emitted(42, 109) Source(61, 71) + SourceIndex(0)
-21>Emitted(42, 110) Source(61, 72) + SourceIndex(0)
-22>Emitted(42, 112) Source(61, 74) + SourceIndex(0)
-23>Emitted(42, 113) Source(61, 75) + SourceIndex(0)
-24>Emitted(42, 115) Source(61, 77) + SourceIndex(0)
-25>Emitted(42, 117) Source(61, 79) + SourceIndex(0)
-26>Emitted(42, 118) Source(61, 80) + SourceIndex(0)
+5 >Emitted(42, 26) Source(61, 58) + SourceIndex(0)
+6 >Emitted(42, 28) Source(61, 8) + SourceIndex(0)
+7 >Emitted(42, 42) Source(61, 38) + SourceIndex(0)
+8 >Emitted(42, 44) Source(61, 18) + SourceIndex(0)
+9 >Emitted(42, 64) Source(61, 25) + SourceIndex(0)
+10>Emitted(42, 66) Source(61, 27) + SourceIndex(0)
+11>Emitted(42, 90) Source(61, 36) + SourceIndex(0)
+12>Emitted(42, 96) Source(61, 60) + SourceIndex(0)
+13>Emitted(42, 97) Source(61, 61) + SourceIndex(0)
+14>Emitted(42, 100) Source(61, 64) + SourceIndex(0)
+15>Emitted(42, 101) Source(61, 65) + SourceIndex(0)
+16>Emitted(42, 103) Source(61, 67) + SourceIndex(0)
+17>Emitted(42, 104) Source(61, 68) + SourceIndex(0)
+18>Emitted(42, 107) Source(61, 71) + SourceIndex(0)
+19>Emitted(42, 108) Source(61, 72) + SourceIndex(0)
+20>Emitted(42, 110) Source(61, 74) + SourceIndex(0)
+21>Emitted(42, 111) Source(61, 75) + SourceIndex(0)
+22>Emitted(42, 113) Source(61, 77) + SourceIndex(0)
+23>Emitted(42, 115) Source(61, 79) + SourceIndex(0)
+24>Emitted(42, 116) Source(61, 80) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1508,56 +1442,49 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(44, 1) Source(63, 1) + SourceIndex(0)
 2 >Emitted(44, 2) Source(63, 2) + SourceIndex(0)
 ---
->>>for ((_o = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _p = _o.skills, primary = _p.primary, secondary = _p.secondary, _o),
+>>>for (_o = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _p = _o.skills, primary = _p.primary, secondary = _p.secondary, _o,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^
-9 >                                                                                                    ^^
-10>                                                                                                      ^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                          ^^
-12>                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                    ^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^
+8 >                                                                                                   ^^
+9 >                                                                                                     ^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                         ^^
+11>                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { skills: { primary, secondary } } =
-  >          <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                    
-8 >                                                                                      skills: { primary, secondary }
-9 >                                                                                                    
-10>                                                                                                      primary
-11>                                                                                                                          , 
-12>                                                                                                                            secondary
-13>                                                                                                                                                     } } =
-  >                                                                                                                                                        <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     { skills: { primary, secondary } } =
+  >         <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                   
+7 >                                                                                     skills: { primary, secondary }
+8 >                                                                                                   
+9 >                                                                                                     primary
+10>                                                                                                                         , 
+11>                                                                                                                           secondary
 1->Emitted(45, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(64, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(64, 5) + SourceIndex(0)
 4 >Emitted(45, 6) Source(64, 6) + SourceIndex(0)
-5 >Emitted(45, 7) Source(64, 6) + SourceIndex(0)
-6 >Emitted(45, 85) Source(65, 90) + SourceIndex(0)
-7 >Emitted(45, 87) Source(64, 8) + SourceIndex(0)
-8 >Emitted(45, 101) Source(64, 38) + SourceIndex(0)
-9 >Emitted(45, 103) Source(64, 18) + SourceIndex(0)
-10>Emitted(45, 123) Source(64, 25) + SourceIndex(0)
-11>Emitted(45, 125) Source(64, 27) + SourceIndex(0)
-12>Emitted(45, 149) Source(64, 36) + SourceIndex(0)
-13>Emitted(45, 154) Source(65, 90) + SourceIndex(0)
+5 >Emitted(45, 84) Source(65, 90) + SourceIndex(0)
+6 >Emitted(45, 86) Source(64, 8) + SourceIndex(0)
+7 >Emitted(45, 100) Source(64, 38) + SourceIndex(0)
+8 >Emitted(45, 102) Source(64, 18) + SourceIndex(0)
+9 >Emitted(45, 122) Source(64, 25) + SourceIndex(0)
+10>Emitted(45, 124) Source(64, 27) + SourceIndex(0)
+11>Emitted(45, 148) Source(64, 36) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -1574,7 +1501,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 > } } =
+  >    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
@@ -1632,89 +1560,83 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(48, 1) Source(68, 1) + SourceIndex(0)
 2 >Emitted(48, 2) Source(68, 2) + SourceIndex(0)
 ---
->>>for ((nameA = robot.name, skillA = robot.skill, robot), i = 0; i < 1; i++) {
+>>>for (nameA = robot.name, skillA = robot.skill, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^
-7 >                        ^^
-8 >                          ^^^^^^^^^^^^^^^^^^^^
-9 >                                              ^^
-10>                                                ^^^^^
-11>                                                     ^
-12>                                                      ^^
-13>                                                        ^
-14>                                                         ^^^
-15>                                                            ^
-16>                                                             ^^
-17>                                                               ^
-18>                                                                ^^^
-19>                                                                   ^
-20>                                                                    ^^
-21>                                                                      ^
-22>                                                                       ^^
-23>                                                                         ^^
-24>                                                                           ^
+5 >     ^^^^^^^^^^^^^^^^^^
+6 >                       ^^
+7 >                         ^^^^^^^^^^^^^^^^^^^^
+8 >                                             ^^
+9 >                                               ^^^^^
+10>                                                    ^^
+11>                                                      ^
+12>                                                       ^^^
+13>                                                          ^
+14>                                                           ^^
+15>                                                             ^
+16>                                                              ^^^
+17>                                                                 ^
+18>                                                                  ^^
+19>                                                                    ^
+20>                                                                     ^^
+21>                                                                       ^^
+22>                                                                         ^
 1->
   >
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name: nameA
-7 >                        , 
-8 >                          skill: skillA
-9 >                                               } = 
-10>                                                robot
-11>                                                     
-12>                                                      , 
-13>                                                        i
-14>                                                          = 
-15>                                                            0
-16>                                                             ; 
-17>                                                               i
-18>                                                                 < 
-19>                                                                   1
-20>                                                                    ; 
-21>                                                                      i
-22>                                                                       ++
-23>                                                                         ) 
-24>                                                                           {
+4 >    ({ 
+5 >     name: nameA
+6 >                       , 
+7 >                         skill: skillA
+8 >                                              } = 
+9 >                                               robot
+10>                                                    , 
+11>                                                      i
+12>                                                        = 
+13>                                                          0
+14>                                                           ; 
+15>                                                             i
+16>                                                               < 
+17>                                                                 1
+18>                                                                  ; 
+19>                                                                    i
+20>                                                                     ++
+21>                                                                       ) 
+22>                                                                         {
 1->Emitted(49, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(71, 5) + SourceIndex(0)
-4 >Emitted(49, 6) Source(71, 6) + SourceIndex(0)
-5 >Emitted(49, 7) Source(71, 8) + SourceIndex(0)
-6 >Emitted(49, 25) Source(71, 19) + SourceIndex(0)
-7 >Emitted(49, 27) Source(71, 21) + SourceIndex(0)
-8 >Emitted(49, 47) Source(71, 34) + SourceIndex(0)
-9 >Emitted(49, 49) Source(71, 39) + SourceIndex(0)
-10>Emitted(49, 54) Source(71, 44) + SourceIndex(0)
-11>Emitted(49, 55) Source(71, 44) + SourceIndex(0)
-12>Emitted(49, 57) Source(71, 46) + SourceIndex(0)
-13>Emitted(49, 58) Source(71, 47) + SourceIndex(0)
-14>Emitted(49, 61) Source(71, 50) + SourceIndex(0)
-15>Emitted(49, 62) Source(71, 51) + SourceIndex(0)
-16>Emitted(49, 64) Source(71, 53) + SourceIndex(0)
-17>Emitted(49, 65) Source(71, 54) + SourceIndex(0)
-18>Emitted(49, 68) Source(71, 57) + SourceIndex(0)
-19>Emitted(49, 69) Source(71, 58) + SourceIndex(0)
-20>Emitted(49, 71) Source(71, 60) + SourceIndex(0)
-21>Emitted(49, 72) Source(71, 61) + SourceIndex(0)
-22>Emitted(49, 74) Source(71, 63) + SourceIndex(0)
-23>Emitted(49, 76) Source(71, 65) + SourceIndex(0)
-24>Emitted(49, 77) Source(71, 66) + SourceIndex(0)
+4 >Emitted(49, 6) Source(71, 8) + SourceIndex(0)
+5 >Emitted(49, 24) Source(71, 19) + SourceIndex(0)
+6 >Emitted(49, 26) Source(71, 21) + SourceIndex(0)
+7 >Emitted(49, 46) Source(71, 34) + SourceIndex(0)
+8 >Emitted(49, 48) Source(71, 39) + SourceIndex(0)
+9 >Emitted(49, 53) Source(71, 44) + SourceIndex(0)
+10>Emitted(49, 55) Source(71, 46) + SourceIndex(0)
+11>Emitted(49, 56) Source(71, 47) + SourceIndex(0)
+12>Emitted(49, 59) Source(71, 50) + SourceIndex(0)
+13>Emitted(49, 60) Source(71, 51) + SourceIndex(0)
+14>Emitted(49, 62) Source(71, 53) + SourceIndex(0)
+15>Emitted(49, 63) Source(71, 54) + SourceIndex(0)
+16>Emitted(49, 66) Source(71, 57) + SourceIndex(0)
+17>Emitted(49, 67) Source(71, 58) + SourceIndex(0)
+18>Emitted(49, 69) Source(71, 60) + SourceIndex(0)
+19>Emitted(49, 70) Source(71, 61) + SourceIndex(0)
+20>Emitted(49, 72) Source(71, 63) + SourceIndex(0)
+21>Emitted(49, 74) Source(71, 65) + SourceIndex(0)
+22>Emitted(49, 75) Source(71, 66) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1746,87 +1668,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(51, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(51, 2) Source(73, 2) + SourceIndex(0)
 ---
->>>for ((_q = getRobot(), nameA = _q.name, skillA = _q.skill, _q), i = 0; i < 1; i++) {
+>>>for (_q = getRobot(), nameA = _q.name, skillA = _q.skill, _q, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^
-9 >                                      ^^
-10>                                        ^^^^^^^^^^^^^^^^^
-11>                                                         ^^^^^
-12>                                                              ^^
-13>                                                                ^
-14>                                                                 ^^^
-15>                                                                    ^
-16>                                                                     ^^
-17>                                                                       ^
-18>                                                                        ^^^
-19>                                                                           ^
-20>                                                                            ^^
-21>                                                                              ^
-22>                                                                               ^^
-23>                                                                                 ^^
-24>                                                                                   ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^
+8 >                                     ^^
+9 >                                       ^^^^^^^^^^^^^^^^^
+10>                                                        ^^^^^^
+11>                                                              ^
+12>                                                               ^^^
+13>                                                                  ^
+14>                                                                   ^^
+15>                                                                     ^
+16>                                                                      ^^^
+17>                                                                         ^
+18>                                                                          ^^
+19>                                                                            ^
+20>                                                                             ^^
+21>                                                                               ^^
+22>                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name: nameA, skill: skillA } = getRobot()
-7 >                     
-8 >                       name: nameA
-9 >                                      , 
-10>                                        skill: skillA
-11>                                                          } = getRobot()
-12>                                                              , 
-13>                                                                i
-14>                                                                  = 
-15>                                                                    0
-16>                                                                     ; 
-17>                                                                       i
-18>                                                                         < 
-19>                                                                           1
-20>                                                                            ; 
-21>                                                                              i
-22>                                                                               ++
-23>                                                                                 ) 
-24>                                                                                   {
+5 >     { name: nameA, skill: skillA } = getRobot()
+6 >                    
+7 >                      name: nameA
+8 >                                     , 
+9 >                                       skill: skillA
+10>                                                         } = getRobot(), 
+11>                                                              i
+12>                                                                = 
+13>                                                                  0
+14>                                                                   ; 
+15>                                                                     i
+16>                                                                       < 
+17>                                                                         1
+18>                                                                          ; 
+19>                                                                            i
+20>                                                                             ++
+21>                                                                               ) 
+22>                                                                                 {
 1->Emitted(52, 1) Source(74, 1) + SourceIndex(0)
 2 >Emitted(52, 4) Source(74, 4) + SourceIndex(0)
 3 >Emitted(52, 5) Source(74, 5) + SourceIndex(0)
 4 >Emitted(52, 6) Source(74, 6) + SourceIndex(0)
-5 >Emitted(52, 7) Source(74, 6) + SourceIndex(0)
-6 >Emitted(52, 22) Source(74, 49) + SourceIndex(0)
-7 >Emitted(52, 24) Source(74, 8) + SourceIndex(0)
-8 >Emitted(52, 39) Source(74, 19) + SourceIndex(0)
-9 >Emitted(52, 41) Source(74, 21) + SourceIndex(0)
-10>Emitted(52, 58) Source(74, 34) + SourceIndex(0)
-11>Emitted(52, 63) Source(74, 49) + SourceIndex(0)
-12>Emitted(52, 65) Source(74, 51) + SourceIndex(0)
-13>Emitted(52, 66) Source(74, 52) + SourceIndex(0)
-14>Emitted(52, 69) Source(74, 55) + SourceIndex(0)
-15>Emitted(52, 70) Source(74, 56) + SourceIndex(0)
-16>Emitted(52, 72) Source(74, 58) + SourceIndex(0)
-17>Emitted(52, 73) Source(74, 59) + SourceIndex(0)
-18>Emitted(52, 76) Source(74, 62) + SourceIndex(0)
-19>Emitted(52, 77) Source(74, 63) + SourceIndex(0)
-20>Emitted(52, 79) Source(74, 65) + SourceIndex(0)
-21>Emitted(52, 80) Source(74, 66) + SourceIndex(0)
-22>Emitted(52, 82) Source(74, 68) + SourceIndex(0)
-23>Emitted(52, 84) Source(74, 70) + SourceIndex(0)
-24>Emitted(52, 85) Source(74, 71) + SourceIndex(0)
+5 >Emitted(52, 21) Source(74, 49) + SourceIndex(0)
+6 >Emitted(52, 23) Source(74, 8) + SourceIndex(0)
+7 >Emitted(52, 38) Source(74, 19) + SourceIndex(0)
+8 >Emitted(52, 40) Source(74, 21) + SourceIndex(0)
+9 >Emitted(52, 57) Source(74, 34) + SourceIndex(0)
+10>Emitted(52, 63) Source(74, 51) + SourceIndex(0)
+11>Emitted(52, 64) Source(74, 52) + SourceIndex(0)
+12>Emitted(52, 67) Source(74, 55) + SourceIndex(0)
+13>Emitted(52, 68) Source(74, 56) + SourceIndex(0)
+14>Emitted(52, 70) Source(74, 58) + SourceIndex(0)
+15>Emitted(52, 71) Source(74, 59) + SourceIndex(0)
+16>Emitted(52, 74) Source(74, 62) + SourceIndex(0)
+17>Emitted(52, 75) Source(74, 63) + SourceIndex(0)
+18>Emitted(52, 77) Source(74, 65) + SourceIndex(0)
+19>Emitted(52, 78) Source(74, 66) + SourceIndex(0)
+20>Emitted(52, 80) Source(74, 68) + SourceIndex(0)
+21>Emitted(52, 82) Source(74, 70) + SourceIndex(0)
+22>Emitted(52, 83) Source(74, 71) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1858,87 +1774,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(54, 1) Source(76, 1) + SourceIndex(0)
 2 >Emitted(54, 2) Source(76, 2) + SourceIndex(0)
 ---
->>>for ((_r = { name: "trimmer", skill: "trimming" }, nameA = _r.name, skillA = _r.skill, _r), i = 0; i < 1; i++) {
+>>>for (_r = { name: "trimmer", skill: "trimming" }, nameA = _r.name, skillA = _r.skill, _r, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^^
-9 >                                                                  ^^
-10>                                                                    ^^^^^^^^^^^^^^^^^
-11>                                                                                     ^^^^^
-12>                                                                                          ^^
-13>                                                                                            ^
-14>                                                                                             ^^^
-15>                                                                                                ^
-16>                                                                                                 ^^
-17>                                                                                                   ^
-18>                                                                                                    ^^^
-19>                                                                                                       ^
-20>                                                                                                        ^^
-21>                                                                                                          ^
-22>                                                                                                           ^^
-23>                                                                                                             ^^
-24>                                                                                                               ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^^^^
+8 >                                                                 ^^
+9 >                                                                   ^^^^^^^^^^^^^^^^^
+10>                                                                                    ^^^^^^
+11>                                                                                          ^
+12>                                                                                           ^^^
+13>                                                                                              ^
+14>                                                                                               ^^
+15>                                                                                                 ^
+16>                                                                                                  ^^^
+17>                                                                                                     ^
+18>                                                                                                      ^^
+19>                                                                                                        ^
+20>                                                                                                         ^^
+21>                                                                                                           ^^
+22>                                                                                                             ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                 
-8 >                                                   name: nameA
-9 >                                                                  , 
-10>                                                                    skill: skillA
-11>                                                                                      } = <Robot>{ name: "trimmer", skill: "trimming" }
-12>                                                                                          , 
-13>                                                                                            i
-14>                                                                                              = 
-15>                                                                                                0
-16>                                                                                                 ; 
-17>                                                                                                   i
-18>                                                                                                     < 
-19>                                                                                                       1
-20>                                                                                                        ; 
-21>                                                                                                          i
-22>                                                                                                           ++
-23>                                                                                                             ) 
-24>                                                                                                               {
+5 >     { name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                
+7 >                                                  name: nameA
+8 >                                                                 , 
+9 >                                                                   skill: skillA
+10>                                                                                     } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+11>                                                                                          i
+12>                                                                                            = 
+13>                                                                                              0
+14>                                                                                               ; 
+15>                                                                                                 i
+16>                                                                                                   < 
+17>                                                                                                     1
+18>                                                                                                      ; 
+19>                                                                                                        i
+20>                                                                                                         ++
+21>                                                                                                           ) 
+22>                                                                                                             {
 1->Emitted(55, 1) Source(77, 1) + SourceIndex(0)
 2 >Emitted(55, 4) Source(77, 4) + SourceIndex(0)
 3 >Emitted(55, 5) Source(77, 5) + SourceIndex(0)
 4 >Emitted(55, 6) Source(77, 6) + SourceIndex(0)
-5 >Emitted(55, 7) Source(77, 6) + SourceIndex(0)
-6 >Emitted(55, 50) Source(77, 84) + SourceIndex(0)
-7 >Emitted(55, 52) Source(77, 8) + SourceIndex(0)
-8 >Emitted(55, 67) Source(77, 19) + SourceIndex(0)
-9 >Emitted(55, 69) Source(77, 21) + SourceIndex(0)
-10>Emitted(55, 86) Source(77, 34) + SourceIndex(0)
-11>Emitted(55, 91) Source(77, 84) + SourceIndex(0)
-12>Emitted(55, 93) Source(77, 86) + SourceIndex(0)
-13>Emitted(55, 94) Source(77, 87) + SourceIndex(0)
-14>Emitted(55, 97) Source(77, 90) + SourceIndex(0)
-15>Emitted(55, 98) Source(77, 91) + SourceIndex(0)
-16>Emitted(55, 100) Source(77, 93) + SourceIndex(0)
-17>Emitted(55, 101) Source(77, 94) + SourceIndex(0)
-18>Emitted(55, 104) Source(77, 97) + SourceIndex(0)
-19>Emitted(55, 105) Source(77, 98) + SourceIndex(0)
-20>Emitted(55, 107) Source(77, 100) + SourceIndex(0)
-21>Emitted(55, 108) Source(77, 101) + SourceIndex(0)
-22>Emitted(55, 110) Source(77, 103) + SourceIndex(0)
-23>Emitted(55, 112) Source(77, 105) + SourceIndex(0)
-24>Emitted(55, 113) Source(77, 106) + SourceIndex(0)
+5 >Emitted(55, 49) Source(77, 84) + SourceIndex(0)
+6 >Emitted(55, 51) Source(77, 8) + SourceIndex(0)
+7 >Emitted(55, 66) Source(77, 19) + SourceIndex(0)
+8 >Emitted(55, 68) Source(77, 21) + SourceIndex(0)
+9 >Emitted(55, 85) Source(77, 34) + SourceIndex(0)
+10>Emitted(55, 91) Source(77, 86) + SourceIndex(0)
+11>Emitted(55, 92) Source(77, 87) + SourceIndex(0)
+12>Emitted(55, 95) Source(77, 90) + SourceIndex(0)
+13>Emitted(55, 96) Source(77, 91) + SourceIndex(0)
+14>Emitted(55, 98) Source(77, 93) + SourceIndex(0)
+15>Emitted(55, 99) Source(77, 94) + SourceIndex(0)
+16>Emitted(55, 102) Source(77, 97) + SourceIndex(0)
+17>Emitted(55, 103) Source(77, 98) + SourceIndex(0)
+18>Emitted(55, 105) Source(77, 100) + SourceIndex(0)
+19>Emitted(55, 106) Source(77, 101) + SourceIndex(0)
+20>Emitted(55, 108) Source(77, 103) + SourceIndex(0)
+21>Emitted(55, 110) Source(77, 105) + SourceIndex(0)
+22>Emitted(55, 111) Source(77, 106) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1970,99 +1880,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(57, 1) Source(79, 1) + SourceIndex(0)
 2 >Emitted(57, 2) Source(79, 2) + SourceIndex(0)
 ---
->>>for ((nameA = multiRobot.name, _s = multiRobot.skills, primaryA = _s.primary, secondaryA = _s.secondary, multiRobot), i = 0; i < 1; i++) {
+>>>for (nameA = multiRobot.name, _s = multiRobot.skills, primaryA = _s.primary, secondaryA = _s.secondary, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^
-7 >                             ^^
-8 >                               ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                     ^^
-10>                                                       ^^^^^^^^^^^^^^^^^^^^^
-11>                                                                            ^^
-12>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                       ^^
-14>                                                                                                         ^^^^^^^^^^
-15>                                                                                                                   ^
-16>                                                                                                                    ^^
-17>                                                                                                                      ^
-18>                                                                                                                       ^^^
-19>                                                                                                                          ^
-20>                                                                                                                           ^^
-21>                                                                                                                             ^
-22>                                                                                                                              ^^^
-23>                                                                                                                                 ^
-24>                                                                                                                                  ^^
-25>                                                                                                                                    ^
-26>                                                                                                                                     ^^
-27>                                                                                                                                       ^^
-28>                                                                                                                                         ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^
+6 >                            ^^
+7 >                              ^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                    ^^
+9 >                                                      ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                           ^^
+11>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                      ^^
+13>                                                                                                        ^^^^^^^^^^
+14>                                                                                                                  ^^
+15>                                                                                                                    ^
+16>                                                                                                                     ^^^
+17>                                                                                                                        ^
+18>                                                                                                                         ^^
+19>                                                                                                                           ^
+20>                                                                                                                            ^^^
+21>                                                                                                                               ^
+22>                                                                                                                                ^^
+23>                                                                                                                                  ^
+24>                                                                                                                                   ^^
+25>                                                                                                                                     ^^
+26>                                                                                                                                       ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name: nameA
-7 >                             , 
-8 >                               skills: { primary: primaryA, secondary: secondaryA }
-9 >                                                     
-10>                                                       primary: primaryA
-11>                                                                            , 
-12>                                                                              secondary: secondaryA
-13>                                                                                                        } } = 
-14>                                                                                                         multiRobot
-15>                                                                                                                   
-16>                                                                                                                    , 
-17>                                                                                                                      i
-18>                                                                                                                        = 
-19>                                                                                                                          0
-20>                                                                                                                           ; 
-21>                                                                                                                             i
-22>                                                                                                                               < 
-23>                                                                                                                                 1
-24>                                                                                                                                  ; 
-25>                                                                                                                                    i
-26>                                                                                                                                     ++
-27>                                                                                                                                       ) 
-28>                                                                                                                                         {
+4 >    ({ 
+5 >     name: nameA
+6 >                            , 
+7 >                              skills: { primary: primaryA, secondary: secondaryA }
+8 >                                                    
+9 >                                                      primary: primaryA
+10>                                                                           , 
+11>                                                                             secondary: secondaryA
+12>                                                                                                       } } = 
+13>                                                                                                        multiRobot
+14>                                                                                                                  , 
+15>                                                                                                                    i
+16>                                                                                                                      = 
+17>                                                                                                                        0
+18>                                                                                                                         ; 
+19>                                                                                                                           i
+20>                                                                                                                             < 
+21>                                                                                                                               1
+22>                                                                                                                                ; 
+23>                                                                                                                                  i
+24>                                                                                                                                   ++
+25>                                                                                                                                     ) 
+26>                                                                                                                                       {
 1->Emitted(58, 1) Source(80, 1) + SourceIndex(0)
 2 >Emitted(58, 4) Source(80, 4) + SourceIndex(0)
 3 >Emitted(58, 5) Source(80, 5) + SourceIndex(0)
-4 >Emitted(58, 6) Source(80, 6) + SourceIndex(0)
-5 >Emitted(58, 7) Source(80, 8) + SourceIndex(0)
-6 >Emitted(58, 30) Source(80, 19) + SourceIndex(0)
-7 >Emitted(58, 32) Source(80, 21) + SourceIndex(0)
-8 >Emitted(58, 54) Source(80, 73) + SourceIndex(0)
-9 >Emitted(58, 56) Source(80, 31) + SourceIndex(0)
-10>Emitted(58, 77) Source(80, 48) + SourceIndex(0)
-11>Emitted(58, 79) Source(80, 50) + SourceIndex(0)
-12>Emitted(58, 104) Source(80, 71) + SourceIndex(0)
-13>Emitted(58, 106) Source(80, 78) + SourceIndex(0)
-14>Emitted(58, 116) Source(80, 88) + SourceIndex(0)
-15>Emitted(58, 117) Source(80, 88) + SourceIndex(0)
-16>Emitted(58, 119) Source(80, 90) + SourceIndex(0)
-17>Emitted(58, 120) Source(80, 91) + SourceIndex(0)
-18>Emitted(58, 123) Source(80, 94) + SourceIndex(0)
-19>Emitted(58, 124) Source(80, 95) + SourceIndex(0)
-20>Emitted(58, 126) Source(80, 97) + SourceIndex(0)
-21>Emitted(58, 127) Source(80, 98) + SourceIndex(0)
-22>Emitted(58, 130) Source(80, 101) + SourceIndex(0)
-23>Emitted(58, 131) Source(80, 102) + SourceIndex(0)
-24>Emitted(58, 133) Source(80, 104) + SourceIndex(0)
-25>Emitted(58, 134) Source(80, 105) + SourceIndex(0)
-26>Emitted(58, 136) Source(80, 107) + SourceIndex(0)
-27>Emitted(58, 138) Source(80, 109) + SourceIndex(0)
-28>Emitted(58, 139) Source(80, 110) + SourceIndex(0)
+4 >Emitted(58, 6) Source(80, 8) + SourceIndex(0)
+5 >Emitted(58, 29) Source(80, 19) + SourceIndex(0)
+6 >Emitted(58, 31) Source(80, 21) + SourceIndex(0)
+7 >Emitted(58, 53) Source(80, 73) + SourceIndex(0)
+8 >Emitted(58, 55) Source(80, 31) + SourceIndex(0)
+9 >Emitted(58, 76) Source(80, 48) + SourceIndex(0)
+10>Emitted(58, 78) Source(80, 50) + SourceIndex(0)
+11>Emitted(58, 103) Source(80, 71) + SourceIndex(0)
+12>Emitted(58, 105) Source(80, 78) + SourceIndex(0)
+13>Emitted(58, 115) Source(80, 88) + SourceIndex(0)
+14>Emitted(58, 117) Source(80, 90) + SourceIndex(0)
+15>Emitted(58, 118) Source(80, 91) + SourceIndex(0)
+16>Emitted(58, 121) Source(80, 94) + SourceIndex(0)
+17>Emitted(58, 122) Source(80, 95) + SourceIndex(0)
+18>Emitted(58, 124) Source(80, 97) + SourceIndex(0)
+19>Emitted(58, 125) Source(80, 98) + SourceIndex(0)
+20>Emitted(58, 128) Source(80, 101) + SourceIndex(0)
+21>Emitted(58, 129) Source(80, 102) + SourceIndex(0)
+22>Emitted(58, 131) Source(80, 104) + SourceIndex(0)
+23>Emitted(58, 132) Source(80, 105) + SourceIndex(0)
+24>Emitted(58, 134) Source(80, 107) + SourceIndex(0)
+25>Emitted(58, 136) Source(80, 109) + SourceIndex(0)
+26>Emitted(58, 137) Source(80, 110) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2094,99 +1998,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(60, 1) Source(82, 1) + SourceIndex(0)
 2 >Emitted(60, 2) Source(82, 2) + SourceIndex(0)
 ---
->>>for ((_t = getMultiRobot(), nameA = _t.name, _u = _t.skills, primaryA = _u.primary, secondaryA = _u.secondary, _t), i = 0; i < 1; i++) {
+>>>for (_t = getMultiRobot(), nameA = _t.name, _u = _t.skills, primaryA = _u.primary, secondaryA = _u.secondary, _t, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^^
-9 >                                           ^^
-10>                                             ^^^^^^^^^^^^^^
-11>                                                           ^^
-12>                                                             ^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                  ^^
-14>                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                             ^^^^^
-16>                                                                                                                  ^^
-17>                                                                                                                    ^
-18>                                                                                                                     ^^^
-19>                                                                                                                        ^
-20>                                                                                                                         ^^
-21>                                                                                                                           ^
-22>                                                                                                                            ^^^
-23>                                                                                                                               ^
-24>                                                                                                                                ^^
-25>                                                                                                                                  ^
-26>                                                                                                                                   ^^
-27>                                                                                                                                     ^^
-28>                                                                                                                                       ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^
+10>                                                          ^^
+11>                                                            ^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                 ^^
+13>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                            ^^^^^^
+15>                                                                                                                  ^
+16>                                                                                                                   ^^^
+17>                                                                                                                      ^
+18>                                                                                                                       ^^
+19>                                                                                                                         ^
+20>                                                                                                                          ^^^
+21>                                                                                                                             ^
+22>                                                                                                                              ^^
+23>                                                                                                                                ^
+24>                                                                                                                                 ^^
+25>                                                                                                                                   ^^
+26>                                                                                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot()
-7 >                          
-8 >                            name: nameA
-9 >                                           , 
-10>                                             skills: { primary: primaryA, secondary: secondaryA }
-11>                                                           
-12>                                                             primary: primaryA
-13>                                                                                  , 
-14>                                                                                    secondary: secondaryA
-15>                                                                                                              } } = getMultiRobot()
-16>                                                                                                                  , 
-17>                                                                                                                    i
-18>                                                                                                                      = 
-19>                                                                                                                        0
-20>                                                                                                                         ; 
-21>                                                                                                                           i
-22>                                                                                                                             < 
-23>                                                                                                                               1
-24>                                                                                                                                ; 
-25>                                                                                                                                  i
-26>                                                                                                                                   ++
-27>                                                                                                                                     ) 
-28>                                                                                                                                       {
+5 >     { name: nameA, skills: { primary: primaryA, secondary: secondaryA } } = getMultiRobot()
+6 >                         
+7 >                           name: nameA
+8 >                                          , 
+9 >                                            skills: { primary: primaryA, secondary: secondaryA }
+10>                                                          
+11>                                                            primary: primaryA
+12>                                                                                 , 
+13>                                                                                   secondary: secondaryA
+14>                                                                                                             } } = getMultiRobot(), 
+15>                                                                                                                  i
+16>                                                                                                                    = 
+17>                                                                                                                      0
+18>                                                                                                                       ; 
+19>                                                                                                                         i
+20>                                                                                                                           < 
+21>                                                                                                                             1
+22>                                                                                                                              ; 
+23>                                                                                                                                i
+24>                                                                                                                                 ++
+25>                                                                                                                                   ) 
+26>                                                                                                                                     {
 1->Emitted(61, 1) Source(83, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(83, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(83, 5) + SourceIndex(0)
 4 >Emitted(61, 6) Source(83, 6) + SourceIndex(0)
-5 >Emitted(61, 7) Source(83, 6) + SourceIndex(0)
-6 >Emitted(61, 27) Source(83, 93) + SourceIndex(0)
-7 >Emitted(61, 29) Source(83, 8) + SourceIndex(0)
-8 >Emitted(61, 44) Source(83, 19) + SourceIndex(0)
-9 >Emitted(61, 46) Source(83, 21) + SourceIndex(0)
-10>Emitted(61, 60) Source(83, 73) + SourceIndex(0)
-11>Emitted(61, 62) Source(83, 31) + SourceIndex(0)
-12>Emitted(61, 83) Source(83, 48) + SourceIndex(0)
-13>Emitted(61, 85) Source(83, 50) + SourceIndex(0)
-14>Emitted(61, 110) Source(83, 71) + SourceIndex(0)
-15>Emitted(61, 115) Source(83, 93) + SourceIndex(0)
-16>Emitted(61, 117) Source(83, 95) + SourceIndex(0)
-17>Emitted(61, 118) Source(83, 96) + SourceIndex(0)
-18>Emitted(61, 121) Source(83, 99) + SourceIndex(0)
-19>Emitted(61, 122) Source(83, 100) + SourceIndex(0)
-20>Emitted(61, 124) Source(83, 102) + SourceIndex(0)
-21>Emitted(61, 125) Source(83, 103) + SourceIndex(0)
-22>Emitted(61, 128) Source(83, 106) + SourceIndex(0)
-23>Emitted(61, 129) Source(83, 107) + SourceIndex(0)
-24>Emitted(61, 131) Source(83, 109) + SourceIndex(0)
-25>Emitted(61, 132) Source(83, 110) + SourceIndex(0)
-26>Emitted(61, 134) Source(83, 112) + SourceIndex(0)
-27>Emitted(61, 136) Source(83, 114) + SourceIndex(0)
-28>Emitted(61, 137) Source(83, 115) + SourceIndex(0)
+5 >Emitted(61, 26) Source(83, 93) + SourceIndex(0)
+6 >Emitted(61, 28) Source(83, 8) + SourceIndex(0)
+7 >Emitted(61, 43) Source(83, 19) + SourceIndex(0)
+8 >Emitted(61, 45) Source(83, 21) + SourceIndex(0)
+9 >Emitted(61, 59) Source(83, 73) + SourceIndex(0)
+10>Emitted(61, 61) Source(83, 31) + SourceIndex(0)
+11>Emitted(61, 82) Source(83, 48) + SourceIndex(0)
+12>Emitted(61, 84) Source(83, 50) + SourceIndex(0)
+13>Emitted(61, 109) Source(83, 71) + SourceIndex(0)
+14>Emitted(61, 115) Source(83, 95) + SourceIndex(0)
+15>Emitted(61, 116) Source(83, 96) + SourceIndex(0)
+16>Emitted(61, 119) Source(83, 99) + SourceIndex(0)
+17>Emitted(61, 120) Source(83, 100) + SourceIndex(0)
+18>Emitted(61, 122) Source(83, 102) + SourceIndex(0)
+19>Emitted(61, 123) Source(83, 103) + SourceIndex(0)
+20>Emitted(61, 126) Source(83, 106) + SourceIndex(0)
+21>Emitted(61, 127) Source(83, 107) + SourceIndex(0)
+22>Emitted(61, 129) Source(83, 109) + SourceIndex(0)
+23>Emitted(61, 130) Source(83, 110) + SourceIndex(0)
+24>Emitted(61, 132) Source(83, 112) + SourceIndex(0)
+25>Emitted(61, 134) Source(83, 114) + SourceIndex(0)
+26>Emitted(61, 135) Source(83, 115) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2218,62 +2116,55 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(63, 1) Source(85, 1) + SourceIndex(0)
 2 >Emitted(63, 2) Source(85, 2) + SourceIndex(0)
 ---
->>>for ((_v = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, nameA = _v.name, _w = _v.skills, primaryA = _w.primary, secondaryA = _w.secondary, _v),
+>>>for (_v = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, nameA = _v.name, _w = _v.skills, primaryA = _w.primary, secondaryA = _w.secondary, _v,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^^
-9 >                                                                                                     ^^
-10>                                                                                                       ^^^^^^^^^^^^^^
-11>                                                                                                                     ^^
-12>                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                            ^^
-14>                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                       ^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^
+10>                                                                                                                    ^^
+11>                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                           ^^
+13>                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
-  >          <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                    
-8 >                                                                                      name: nameA
-9 >                                                                                                     , 
-10>                                                                                                       skills: { primary: primaryA, secondary: secondaryA }
-11>                                                                                                                     
-12>                                                                                                                       primary: primaryA
-13>                                                                                                                                            , 
-14>                                                                                                                                              secondary: secondaryA
-15>                                                                                                                                                                        } } =
-  >                                                                                                                                                                           <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     { name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
+  >         <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                   
+7 >                                                                                     name: nameA
+8 >                                                                                                    , 
+9 >                                                                                                      skills: { primary: primaryA, secondary: secondaryA }
+10>                                                                                                                    
+11>                                                                                                                      primary: primaryA
+12>                                                                                                                                           , 
+13>                                                                                                                                             secondary: secondaryA
 1->Emitted(64, 1) Source(86, 1) + SourceIndex(0)
 2 >Emitted(64, 4) Source(86, 4) + SourceIndex(0)
 3 >Emitted(64, 5) Source(86, 5) + SourceIndex(0)
 4 >Emitted(64, 6) Source(86, 6) + SourceIndex(0)
-5 >Emitted(64, 7) Source(86, 6) + SourceIndex(0)
-6 >Emitted(64, 85) Source(87, 90) + SourceIndex(0)
-7 >Emitted(64, 87) Source(86, 8) + SourceIndex(0)
-8 >Emitted(64, 102) Source(86, 19) + SourceIndex(0)
-9 >Emitted(64, 104) Source(86, 21) + SourceIndex(0)
-10>Emitted(64, 118) Source(86, 73) + SourceIndex(0)
-11>Emitted(64, 120) Source(86, 31) + SourceIndex(0)
-12>Emitted(64, 141) Source(86, 48) + SourceIndex(0)
-13>Emitted(64, 143) Source(86, 50) + SourceIndex(0)
-14>Emitted(64, 168) Source(86, 71) + SourceIndex(0)
-15>Emitted(64, 173) Source(87, 90) + SourceIndex(0)
+5 >Emitted(64, 84) Source(87, 90) + SourceIndex(0)
+6 >Emitted(64, 86) Source(86, 8) + SourceIndex(0)
+7 >Emitted(64, 101) Source(86, 19) + SourceIndex(0)
+8 >Emitted(64, 103) Source(86, 21) + SourceIndex(0)
+9 >Emitted(64, 117) Source(86, 73) + SourceIndex(0)
+10>Emitted(64, 119) Source(86, 31) + SourceIndex(0)
+11>Emitted(64, 140) Source(86, 48) + SourceIndex(0)
+12>Emitted(64, 142) Source(86, 50) + SourceIndex(0)
+13>Emitted(64, 167) Source(86, 71) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -2290,7 +2181,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 > } } =
+  >    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
@@ -2348,87 +2240,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(67, 1) Source(90, 1) + SourceIndex(0)
 2 >Emitted(67, 2) Source(90, 2) + SourceIndex(0)
 ---
->>>for ((name = robot.name, skill = robot.skill, robot), i = 0; i < 1; i++) {
+>>>for (name = robot.name, skill = robot.skill, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^
-7 >                       ^^
-8 >                         ^^^^^^^^^^^^^^^^^^^
-9 >                                            ^^
-10>                                              ^^^^^
-11>                                                   ^
-12>                                                    ^^
-13>                                                      ^
-14>                                                       ^^^
-15>                                                          ^
-16>                                                           ^^
-17>                                                             ^
-18>                                                              ^^^
-19>                                                                 ^
-20>                                                                  ^^
-21>                                                                    ^
-22>                                                                     ^^
-23>                                                                       ^^
-24>                                                                         ^
+5 >     ^^^^^^^^^^^^^^^^^
+6 >                      ^^
+7 >                        ^^^^^^^^^^^^^^^^^^^
+8 >                                           ^^
+9 >                                             ^^^^^
+10>                                                  ^^
+11>                                                    ^
+12>                                                     ^^^
+13>                                                        ^
+14>                                                         ^^
+15>                                                           ^
+16>                                                            ^^^
+17>                                                               ^
+18>                                                                ^^
+19>                                                                  ^
+20>                                                                   ^^
+21>                                                                     ^^
+22>                                                                       ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name
-7 >                       , 
-8 >                         skill
-9 >                                             } = 
-10>                                              robot
-11>                                                   
-12>                                                    , 
-13>                                                      i
-14>                                                        = 
-15>                                                          0
-16>                                                           ; 
-17>                                                             i
-18>                                                               < 
-19>                                                                 1
-20>                                                                  ; 
-21>                                                                    i
-22>                                                                     ++
-23>                                                                       ) 
-24>                                                                         {
+4 >    ({ 
+5 >     name
+6 >                      , 
+7 >                        skill
+8 >                                            } = 
+9 >                                             robot
+10>                                                  , 
+11>                                                    i
+12>                                                      = 
+13>                                                        0
+14>                                                         ; 
+15>                                                           i
+16>                                                             < 
+17>                                                               1
+18>                                                                ; 
+19>                                                                  i
+20>                                                                   ++
+21>                                                                     ) 
+22>                                                                       {
 1->Emitted(68, 1) Source(91, 1) + SourceIndex(0)
 2 >Emitted(68, 4) Source(91, 4) + SourceIndex(0)
 3 >Emitted(68, 5) Source(91, 5) + SourceIndex(0)
-4 >Emitted(68, 6) Source(91, 6) + SourceIndex(0)
-5 >Emitted(68, 7) Source(91, 8) + SourceIndex(0)
-6 >Emitted(68, 24) Source(91, 12) + SourceIndex(0)
-7 >Emitted(68, 26) Source(91, 14) + SourceIndex(0)
-8 >Emitted(68, 45) Source(91, 19) + SourceIndex(0)
-9 >Emitted(68, 47) Source(91, 24) + SourceIndex(0)
-10>Emitted(68, 52) Source(91, 29) + SourceIndex(0)
-11>Emitted(68, 53) Source(91, 29) + SourceIndex(0)
-12>Emitted(68, 55) Source(91, 31) + SourceIndex(0)
-13>Emitted(68, 56) Source(91, 32) + SourceIndex(0)
-14>Emitted(68, 59) Source(91, 35) + SourceIndex(0)
-15>Emitted(68, 60) Source(91, 36) + SourceIndex(0)
-16>Emitted(68, 62) Source(91, 38) + SourceIndex(0)
-17>Emitted(68, 63) Source(91, 39) + SourceIndex(0)
-18>Emitted(68, 66) Source(91, 42) + SourceIndex(0)
-19>Emitted(68, 67) Source(91, 43) + SourceIndex(0)
-20>Emitted(68, 69) Source(91, 45) + SourceIndex(0)
-21>Emitted(68, 70) Source(91, 46) + SourceIndex(0)
-22>Emitted(68, 72) Source(91, 48) + SourceIndex(0)
-23>Emitted(68, 74) Source(91, 50) + SourceIndex(0)
-24>Emitted(68, 75) Source(91, 51) + SourceIndex(0)
+4 >Emitted(68, 6) Source(91, 8) + SourceIndex(0)
+5 >Emitted(68, 23) Source(91, 12) + SourceIndex(0)
+6 >Emitted(68, 25) Source(91, 14) + SourceIndex(0)
+7 >Emitted(68, 44) Source(91, 19) + SourceIndex(0)
+8 >Emitted(68, 46) Source(91, 24) + SourceIndex(0)
+9 >Emitted(68, 51) Source(91, 29) + SourceIndex(0)
+10>Emitted(68, 53) Source(91, 31) + SourceIndex(0)
+11>Emitted(68, 54) Source(91, 32) + SourceIndex(0)
+12>Emitted(68, 57) Source(91, 35) + SourceIndex(0)
+13>Emitted(68, 58) Source(91, 36) + SourceIndex(0)
+14>Emitted(68, 60) Source(91, 38) + SourceIndex(0)
+15>Emitted(68, 61) Source(91, 39) + SourceIndex(0)
+16>Emitted(68, 64) Source(91, 42) + SourceIndex(0)
+17>Emitted(68, 65) Source(91, 43) + SourceIndex(0)
+18>Emitted(68, 67) Source(91, 45) + SourceIndex(0)
+19>Emitted(68, 68) Source(91, 46) + SourceIndex(0)
+20>Emitted(68, 70) Source(91, 48) + SourceIndex(0)
+21>Emitted(68, 72) Source(91, 50) + SourceIndex(0)
+22>Emitted(68, 73) Source(91, 51) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2460,87 +2346,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(70, 1) Source(93, 1) + SourceIndex(0)
 2 >Emitted(70, 2) Source(93, 2) + SourceIndex(0)
 ---
->>>for ((_x = getRobot(), name = _x.name, skill = _x.skill, _x), i = 0; i < 1; i++) {
+>>>for (_x = getRobot(), name = _x.name, skill = _x.skill, _x, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^
-9 >                                     ^^
-10>                                       ^^^^^^^^^^^^^^^^
-11>                                                       ^^^^^
-12>                                                            ^^
-13>                                                              ^
-14>                                                               ^^^
-15>                                                                  ^
-16>                                                                   ^^
-17>                                                                     ^
-18>                                                                      ^^^
-19>                                                                         ^
-20>                                                                          ^^
-21>                                                                            ^
-22>                                                                             ^^
-23>                                                                               ^^
-24>                                                                                 ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^
+8 >                                    ^^
+9 >                                      ^^^^^^^^^^^^^^^^
+10>                                                      ^^^^^^
+11>                                                            ^
+12>                                                             ^^^
+13>                                                                ^
+14>                                                                 ^^
+15>                                                                   ^
+16>                                                                    ^^^
+17>                                                                       ^
+18>                                                                        ^^
+19>                                                                          ^
+20>                                                                           ^^
+21>                                                                             ^^
+22>                                                                               ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name, skill } = getRobot()
-7 >                     
-8 >                       name
-9 >                                     , 
-10>                                       skill
-11>                                                        } = getRobot()
-12>                                                            , 
-13>                                                              i
-14>                                                                = 
-15>                                                                  0
-16>                                                                   ; 
-17>                                                                     i
-18>                                                                       < 
-19>                                                                         1
-20>                                                                          ; 
-21>                                                                            i
-22>                                                                             ++
-23>                                                                               ) 
-24>                                                                                 {
+5 >     { name, skill } = getRobot()
+6 >                    
+7 >                      name
+8 >                                    , 
+9 >                                      skill
+10>                                                       } = getRobot(), 
+11>                                                            i
+12>                                                              = 
+13>                                                                0
+14>                                                                 ; 
+15>                                                                   i
+16>                                                                     < 
+17>                                                                       1
+18>                                                                        ; 
+19>                                                                          i
+20>                                                                           ++
+21>                                                                             ) 
+22>                                                                               {
 1->Emitted(71, 1) Source(94, 1) + SourceIndex(0)
 2 >Emitted(71, 4) Source(94, 4) + SourceIndex(0)
 3 >Emitted(71, 5) Source(94, 5) + SourceIndex(0)
 4 >Emitted(71, 6) Source(94, 6) + SourceIndex(0)
-5 >Emitted(71, 7) Source(94, 6) + SourceIndex(0)
-6 >Emitted(71, 22) Source(94, 34) + SourceIndex(0)
-7 >Emitted(71, 24) Source(94, 8) + SourceIndex(0)
-8 >Emitted(71, 38) Source(94, 12) + SourceIndex(0)
-9 >Emitted(71, 40) Source(94, 14) + SourceIndex(0)
-10>Emitted(71, 56) Source(94, 19) + SourceIndex(0)
-11>Emitted(71, 61) Source(94, 34) + SourceIndex(0)
-12>Emitted(71, 63) Source(94, 36) + SourceIndex(0)
-13>Emitted(71, 64) Source(94, 37) + SourceIndex(0)
-14>Emitted(71, 67) Source(94, 40) + SourceIndex(0)
-15>Emitted(71, 68) Source(94, 41) + SourceIndex(0)
-16>Emitted(71, 70) Source(94, 43) + SourceIndex(0)
-17>Emitted(71, 71) Source(94, 44) + SourceIndex(0)
-18>Emitted(71, 74) Source(94, 47) + SourceIndex(0)
-19>Emitted(71, 75) Source(94, 48) + SourceIndex(0)
-20>Emitted(71, 77) Source(94, 50) + SourceIndex(0)
-21>Emitted(71, 78) Source(94, 51) + SourceIndex(0)
-22>Emitted(71, 80) Source(94, 53) + SourceIndex(0)
-23>Emitted(71, 82) Source(94, 55) + SourceIndex(0)
-24>Emitted(71, 83) Source(94, 56) + SourceIndex(0)
+5 >Emitted(71, 21) Source(94, 34) + SourceIndex(0)
+6 >Emitted(71, 23) Source(94, 8) + SourceIndex(0)
+7 >Emitted(71, 37) Source(94, 12) + SourceIndex(0)
+8 >Emitted(71, 39) Source(94, 14) + SourceIndex(0)
+9 >Emitted(71, 55) Source(94, 19) + SourceIndex(0)
+10>Emitted(71, 61) Source(94, 36) + SourceIndex(0)
+11>Emitted(71, 62) Source(94, 37) + SourceIndex(0)
+12>Emitted(71, 65) Source(94, 40) + SourceIndex(0)
+13>Emitted(71, 66) Source(94, 41) + SourceIndex(0)
+14>Emitted(71, 68) Source(94, 43) + SourceIndex(0)
+15>Emitted(71, 69) Source(94, 44) + SourceIndex(0)
+16>Emitted(71, 72) Source(94, 47) + SourceIndex(0)
+17>Emitted(71, 73) Source(94, 48) + SourceIndex(0)
+18>Emitted(71, 75) Source(94, 50) + SourceIndex(0)
+19>Emitted(71, 76) Source(94, 51) + SourceIndex(0)
+20>Emitted(71, 78) Source(94, 53) + SourceIndex(0)
+21>Emitted(71, 80) Source(94, 55) + SourceIndex(0)
+22>Emitted(71, 81) Source(94, 56) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2572,87 +2452,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(73, 1) Source(96, 1) + SourceIndex(0)
 2 >Emitted(73, 2) Source(96, 2) + SourceIndex(0)
 ---
->>>for ((_y = { name: "trimmer", skill: "trimming" }, name = _y.name, skill = _y.skill, _y), i = 0; i < 1; i++) {
+>>>for (_y = { name: "trimmer", skill: "trimming" }, name = _y.name, skill = _y.skill, _y, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^
-9 >                                                                 ^^
-10>                                                                   ^^^^^^^^^^^^^^^^
-11>                                                                                   ^^^^^
-12>                                                                                        ^^
-13>                                                                                          ^
-14>                                                                                           ^^^
-15>                                                                                              ^
-16>                                                                                               ^^
-17>                                                                                                 ^
-18>                                                                                                  ^^^
-19>                                                                                                     ^
-20>                                                                                                      ^^
-21>                                                                                                        ^
-22>                                                                                                         ^^
-23>                                                                                                           ^^
-24>                                                                                                             ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^^^
+8 >                                                                ^^
+9 >                                                                  ^^^^^^^^^^^^^^^^
+10>                                                                                  ^^^^^^
+11>                                                                                        ^
+12>                                                                                         ^^^
+13>                                                                                            ^
+14>                                                                                             ^^
+15>                                                                                               ^
+16>                                                                                                ^^^
+17>                                                                                                   ^
+18>                                                                                                    ^^
+19>                                                                                                      ^
+20>                                                                                                       ^^
+21>                                                                                                         ^^
+22>                                                                                                           ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                 
-8 >                                                   name
-9 >                                                                 , 
-10>                                                                   skill
-11>                                                                                    } = <Robot>{ name: "trimmer", skill: "trimming" }
-12>                                                                                        , 
-13>                                                                                          i
-14>                                                                                            = 
-15>                                                                                              0
-16>                                                                                               ; 
-17>                                                                                                 i
-18>                                                                                                   < 
-19>                                                                                                     1
-20>                                                                                                      ; 
-21>                                                                                                        i
-22>                                                                                                         ++
-23>                                                                                                           ) 
-24>                                                                                                             {
+5 >     { name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                
+7 >                                                  name
+8 >                                                                , 
+9 >                                                                  skill
+10>                                                                                   } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+11>                                                                                        i
+12>                                                                                          = 
+13>                                                                                            0
+14>                                                                                             ; 
+15>                                                                                               i
+16>                                                                                                 < 
+17>                                                                                                   1
+18>                                                                                                    ; 
+19>                                                                                                      i
+20>                                                                                                       ++
+21>                                                                                                         ) 
+22>                                                                                                           {
 1->Emitted(74, 1) Source(97, 1) + SourceIndex(0)
 2 >Emitted(74, 4) Source(97, 4) + SourceIndex(0)
 3 >Emitted(74, 5) Source(97, 5) + SourceIndex(0)
 4 >Emitted(74, 6) Source(97, 6) + SourceIndex(0)
-5 >Emitted(74, 7) Source(97, 6) + SourceIndex(0)
-6 >Emitted(74, 50) Source(97, 69) + SourceIndex(0)
-7 >Emitted(74, 52) Source(97, 8) + SourceIndex(0)
-8 >Emitted(74, 66) Source(97, 12) + SourceIndex(0)
-9 >Emitted(74, 68) Source(97, 14) + SourceIndex(0)
-10>Emitted(74, 84) Source(97, 19) + SourceIndex(0)
-11>Emitted(74, 89) Source(97, 69) + SourceIndex(0)
-12>Emitted(74, 91) Source(97, 71) + SourceIndex(0)
-13>Emitted(74, 92) Source(97, 72) + SourceIndex(0)
-14>Emitted(74, 95) Source(97, 75) + SourceIndex(0)
-15>Emitted(74, 96) Source(97, 76) + SourceIndex(0)
-16>Emitted(74, 98) Source(97, 78) + SourceIndex(0)
-17>Emitted(74, 99) Source(97, 79) + SourceIndex(0)
-18>Emitted(74, 102) Source(97, 82) + SourceIndex(0)
-19>Emitted(74, 103) Source(97, 83) + SourceIndex(0)
-20>Emitted(74, 105) Source(97, 85) + SourceIndex(0)
-21>Emitted(74, 106) Source(97, 86) + SourceIndex(0)
-22>Emitted(74, 108) Source(97, 88) + SourceIndex(0)
-23>Emitted(74, 110) Source(97, 90) + SourceIndex(0)
-24>Emitted(74, 111) Source(97, 91) + SourceIndex(0)
+5 >Emitted(74, 49) Source(97, 69) + SourceIndex(0)
+6 >Emitted(74, 51) Source(97, 8) + SourceIndex(0)
+7 >Emitted(74, 65) Source(97, 12) + SourceIndex(0)
+8 >Emitted(74, 67) Source(97, 14) + SourceIndex(0)
+9 >Emitted(74, 83) Source(97, 19) + SourceIndex(0)
+10>Emitted(74, 89) Source(97, 71) + SourceIndex(0)
+11>Emitted(74, 90) Source(97, 72) + SourceIndex(0)
+12>Emitted(74, 93) Source(97, 75) + SourceIndex(0)
+13>Emitted(74, 94) Source(97, 76) + SourceIndex(0)
+14>Emitted(74, 96) Source(97, 78) + SourceIndex(0)
+15>Emitted(74, 97) Source(97, 79) + SourceIndex(0)
+16>Emitted(74, 100) Source(97, 82) + SourceIndex(0)
+17>Emitted(74, 101) Source(97, 83) + SourceIndex(0)
+18>Emitted(74, 103) Source(97, 85) + SourceIndex(0)
+19>Emitted(74, 104) Source(97, 86) + SourceIndex(0)
+20>Emitted(74, 106) Source(97, 88) + SourceIndex(0)
+21>Emitted(74, 108) Source(97, 90) + SourceIndex(0)
+22>Emitted(74, 109) Source(97, 91) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2684,99 +2558,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(76, 1) Source(99, 1) + SourceIndex(0)
 2 >Emitted(76, 2) Source(99, 2) + SourceIndex(0)
 ---
->>>for ((name = multiRobot.name, _z = multiRobot.skills, primary = _z.primary, secondary = _z.secondary, multiRobot), i = 0; i < 1; i++) {
+>>>for (name = multiRobot.name, _z = multiRobot.skills, primary = _z.primary, secondary = _z.secondary, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^
-7 >                            ^^
-8 >                              ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                    ^^
-10>                                                      ^^^^^^^^^^^^^^^^^^^^
-11>                                                                          ^^
-12>                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                    ^^
-14>                                                                                                      ^^^^^^^^^^
-15>                                                                                                                ^
-16>                                                                                                                 ^^
-17>                                                                                                                   ^
-18>                                                                                                                    ^^^
-19>                                                                                                                       ^
-20>                                                                                                                        ^^
-21>                                                                                                                          ^
-22>                                                                                                                           ^^^
-23>                                                                                                                              ^
-24>                                                                                                                               ^^
-25>                                                                                                                                 ^
-26>                                                                                                                                  ^^
-27>                                                                                                                                    ^^
-28>                                                                                                                                      ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^
+6 >                           ^^
+7 >                             ^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                   ^^
+9 >                                                     ^^^^^^^^^^^^^^^^^^^^
+10>                                                                         ^^
+11>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                   ^^
+13>                                                                                                     ^^^^^^^^^^
+14>                                                                                                               ^^
+15>                                                                                                                 ^
+16>                                                                                                                  ^^^
+17>                                                                                                                     ^
+18>                                                                                                                      ^^
+19>                                                                                                                        ^
+20>                                                                                                                         ^^^
+21>                                                                                                                            ^
+22>                                                                                                                             ^^
+23>                                                                                                                               ^
+24>                                                                                                                                ^^
+25>                                                                                                                                  ^^
+26>                                                                                                                                    ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name
-7 >                            , 
-8 >                              skills: { primary, secondary }
-9 >                                                    
-10>                                                      primary
-11>                                                                          , 
-12>                                                                            secondary
-13>                                                                                                     } } = 
-14>                                                                                                      multiRobot
-15>                                                                                                                
-16>                                                                                                                 , 
-17>                                                                                                                   i
-18>                                                                                                                     = 
-19>                                                                                                                       0
-20>                                                                                                                        ; 
-21>                                                                                                                          i
-22>                                                                                                                            < 
-23>                                                                                                                              1
-24>                                                                                                                               ; 
-25>                                                                                                                                 i
-26>                                                                                                                                  ++
-27>                                                                                                                                    ) 
-28>                                                                                                                                      {
+4 >    ({ 
+5 >     name
+6 >                           , 
+7 >                             skills: { primary, secondary }
+8 >                                                   
+9 >                                                     primary
+10>                                                                         , 
+11>                                                                           secondary
+12>                                                                                                    } } = 
+13>                                                                                                     multiRobot
+14>                                                                                                               , 
+15>                                                                                                                 i
+16>                                                                                                                   = 
+17>                                                                                                                     0
+18>                                                                                                                      ; 
+19>                                                                                                                        i
+20>                                                                                                                          < 
+21>                                                                                                                            1
+22>                                                                                                                             ; 
+23>                                                                                                                               i
+24>                                                                                                                                ++
+25>                                                                                                                                  ) 
+26>                                                                                                                                    {
 1->Emitted(77, 1) Source(100, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(100, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(100, 5) + SourceIndex(0)
-4 >Emitted(77, 6) Source(100, 6) + SourceIndex(0)
-5 >Emitted(77, 7) Source(100, 8) + SourceIndex(0)
-6 >Emitted(77, 29) Source(100, 12) + SourceIndex(0)
-7 >Emitted(77, 31) Source(100, 14) + SourceIndex(0)
-8 >Emitted(77, 53) Source(100, 44) + SourceIndex(0)
-9 >Emitted(77, 55) Source(100, 24) + SourceIndex(0)
-10>Emitted(77, 75) Source(100, 31) + SourceIndex(0)
-11>Emitted(77, 77) Source(100, 33) + SourceIndex(0)
-12>Emitted(77, 101) Source(100, 42) + SourceIndex(0)
-13>Emitted(77, 103) Source(100, 49) + SourceIndex(0)
-14>Emitted(77, 113) Source(100, 59) + SourceIndex(0)
-15>Emitted(77, 114) Source(100, 59) + SourceIndex(0)
-16>Emitted(77, 116) Source(100, 61) + SourceIndex(0)
-17>Emitted(77, 117) Source(100, 62) + SourceIndex(0)
-18>Emitted(77, 120) Source(100, 65) + SourceIndex(0)
-19>Emitted(77, 121) Source(100, 66) + SourceIndex(0)
-20>Emitted(77, 123) Source(100, 68) + SourceIndex(0)
-21>Emitted(77, 124) Source(100, 69) + SourceIndex(0)
-22>Emitted(77, 127) Source(100, 72) + SourceIndex(0)
-23>Emitted(77, 128) Source(100, 73) + SourceIndex(0)
-24>Emitted(77, 130) Source(100, 75) + SourceIndex(0)
-25>Emitted(77, 131) Source(100, 76) + SourceIndex(0)
-26>Emitted(77, 133) Source(100, 78) + SourceIndex(0)
-27>Emitted(77, 135) Source(100, 80) + SourceIndex(0)
-28>Emitted(77, 136) Source(100, 81) + SourceIndex(0)
+4 >Emitted(77, 6) Source(100, 8) + SourceIndex(0)
+5 >Emitted(77, 28) Source(100, 12) + SourceIndex(0)
+6 >Emitted(77, 30) Source(100, 14) + SourceIndex(0)
+7 >Emitted(77, 52) Source(100, 44) + SourceIndex(0)
+8 >Emitted(77, 54) Source(100, 24) + SourceIndex(0)
+9 >Emitted(77, 74) Source(100, 31) + SourceIndex(0)
+10>Emitted(77, 76) Source(100, 33) + SourceIndex(0)
+11>Emitted(77, 100) Source(100, 42) + SourceIndex(0)
+12>Emitted(77, 102) Source(100, 49) + SourceIndex(0)
+13>Emitted(77, 112) Source(100, 59) + SourceIndex(0)
+14>Emitted(77, 114) Source(100, 61) + SourceIndex(0)
+15>Emitted(77, 115) Source(100, 62) + SourceIndex(0)
+16>Emitted(77, 118) Source(100, 65) + SourceIndex(0)
+17>Emitted(77, 119) Source(100, 66) + SourceIndex(0)
+18>Emitted(77, 121) Source(100, 68) + SourceIndex(0)
+19>Emitted(77, 122) Source(100, 69) + SourceIndex(0)
+20>Emitted(77, 125) Source(100, 72) + SourceIndex(0)
+21>Emitted(77, 126) Source(100, 73) + SourceIndex(0)
+22>Emitted(77, 128) Source(100, 75) + SourceIndex(0)
+23>Emitted(77, 129) Source(100, 76) + SourceIndex(0)
+24>Emitted(77, 131) Source(100, 78) + SourceIndex(0)
+25>Emitted(77, 133) Source(100, 80) + SourceIndex(0)
+26>Emitted(77, 134) Source(100, 81) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2808,99 +2676,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(79, 1) Source(102, 1) + SourceIndex(0)
 2 >Emitted(79, 2) Source(102, 2) + SourceIndex(0)
 ---
->>>for ((_0 = getMultiRobot(), name = _0.name, _1 = _0.skills, primary = _1.primary, secondary = _1.secondary, _0), i = 0; i < 1; i++) {
+>>>for (_0 = getMultiRobot(), name = _0.name, _1 = _0.skills, primary = _1.primary, secondary = _1.secondary, _0, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^
-9 >                                          ^^
-10>                                            ^^^^^^^^^^^^^^
-11>                                                          ^^
-12>                                                            ^^^^^^^^^^^^^^^^^^^^
-13>                                                                                ^^
-14>                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                          ^^^^^
-16>                                                                                                               ^^
-17>                                                                                                                 ^
-18>                                                                                                                  ^^^
-19>                                                                                                                     ^
-20>                                                                                                                      ^^
-21>                                                                                                                        ^
-22>                                                                                                                         ^^^
-23>                                                                                                                            ^
-24>                                                                                                                             ^^
-25>                                                                                                                               ^
-26>                                                                                                                                ^^
-27>                                                                                                                                  ^^
-28>                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^
+10>                                                         ^^
+11>                                                           ^^^^^^^^^^^^^^^^^^^^
+12>                                                                               ^^
+13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                         ^^^^^^
+15>                                                                                                               ^
+16>                                                                                                                ^^^
+17>                                                                                                                   ^
+18>                                                                                                                    ^^
+19>                                                                                                                      ^
+20>                                                                                                                       ^^^
+21>                                                                                                                          ^
+22>                                                                                                                           ^^
+23>                                                                                                                             ^
+24>                                                                                                                              ^^
+25>                                                                                                                                ^^
+26>                                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name, skills: { primary, secondary } } = getMultiRobot()
-7 >                          
-8 >                            name
-9 >                                          , 
-10>                                            skills: { primary, secondary }
-11>                                                          
-12>                                                            primary
-13>                                                                                , 
-14>                                                                                  secondary
-15>                                                                                                           } } = getMultiRobot()
-16>                                                                                                               , 
-17>                                                                                                                 i
-18>                                                                                                                   = 
-19>                                                                                                                     0
-20>                                                                                                                      ; 
-21>                                                                                                                        i
-22>                                                                                                                          < 
-23>                                                                                                                            1
-24>                                                                                                                             ; 
-25>                                                                                                                               i
-26>                                                                                                                                ++
-27>                                                                                                                                  ) 
-28>                                                                                                                                    {
+5 >     { name, skills: { primary, secondary } } = getMultiRobot()
+6 >                         
+7 >                           name
+8 >                                         , 
+9 >                                           skills: { primary, secondary }
+10>                                                         
+11>                                                           primary
+12>                                                                               , 
+13>                                                                                 secondary
+14>                                                                                                          } } = getMultiRobot(), 
+15>                                                                                                               i
+16>                                                                                                                 = 
+17>                                                                                                                   0
+18>                                                                                                                    ; 
+19>                                                                                                                      i
+20>                                                                                                                        < 
+21>                                                                                                                          1
+22>                                                                                                                           ; 
+23>                                                                                                                             i
+24>                                                                                                                              ++
+25>                                                                                                                                ) 
+26>                                                                                                                                  {
 1->Emitted(80, 1) Source(103, 1) + SourceIndex(0)
 2 >Emitted(80, 4) Source(103, 4) + SourceIndex(0)
 3 >Emitted(80, 5) Source(103, 5) + SourceIndex(0)
 4 >Emitted(80, 6) Source(103, 6) + SourceIndex(0)
-5 >Emitted(80, 7) Source(103, 6) + SourceIndex(0)
-6 >Emitted(80, 27) Source(103, 64) + SourceIndex(0)
-7 >Emitted(80, 29) Source(103, 8) + SourceIndex(0)
-8 >Emitted(80, 43) Source(103, 12) + SourceIndex(0)
-9 >Emitted(80, 45) Source(103, 14) + SourceIndex(0)
-10>Emitted(80, 59) Source(103, 44) + SourceIndex(0)
-11>Emitted(80, 61) Source(103, 24) + SourceIndex(0)
-12>Emitted(80, 81) Source(103, 31) + SourceIndex(0)
-13>Emitted(80, 83) Source(103, 33) + SourceIndex(0)
-14>Emitted(80, 107) Source(103, 42) + SourceIndex(0)
-15>Emitted(80, 112) Source(103, 64) + SourceIndex(0)
-16>Emitted(80, 114) Source(103, 66) + SourceIndex(0)
-17>Emitted(80, 115) Source(103, 67) + SourceIndex(0)
-18>Emitted(80, 118) Source(103, 70) + SourceIndex(0)
-19>Emitted(80, 119) Source(103, 71) + SourceIndex(0)
-20>Emitted(80, 121) Source(103, 73) + SourceIndex(0)
-21>Emitted(80, 122) Source(103, 74) + SourceIndex(0)
-22>Emitted(80, 125) Source(103, 77) + SourceIndex(0)
-23>Emitted(80, 126) Source(103, 78) + SourceIndex(0)
-24>Emitted(80, 128) Source(103, 80) + SourceIndex(0)
-25>Emitted(80, 129) Source(103, 81) + SourceIndex(0)
-26>Emitted(80, 131) Source(103, 83) + SourceIndex(0)
-27>Emitted(80, 133) Source(103, 85) + SourceIndex(0)
-28>Emitted(80, 134) Source(103, 86) + SourceIndex(0)
+5 >Emitted(80, 26) Source(103, 64) + SourceIndex(0)
+6 >Emitted(80, 28) Source(103, 8) + SourceIndex(0)
+7 >Emitted(80, 42) Source(103, 12) + SourceIndex(0)
+8 >Emitted(80, 44) Source(103, 14) + SourceIndex(0)
+9 >Emitted(80, 58) Source(103, 44) + SourceIndex(0)
+10>Emitted(80, 60) Source(103, 24) + SourceIndex(0)
+11>Emitted(80, 80) Source(103, 31) + SourceIndex(0)
+12>Emitted(80, 82) Source(103, 33) + SourceIndex(0)
+13>Emitted(80, 106) Source(103, 42) + SourceIndex(0)
+14>Emitted(80, 112) Source(103, 66) + SourceIndex(0)
+15>Emitted(80, 113) Source(103, 67) + SourceIndex(0)
+16>Emitted(80, 116) Source(103, 70) + SourceIndex(0)
+17>Emitted(80, 117) Source(103, 71) + SourceIndex(0)
+18>Emitted(80, 119) Source(103, 73) + SourceIndex(0)
+19>Emitted(80, 120) Source(103, 74) + SourceIndex(0)
+20>Emitted(80, 123) Source(103, 77) + SourceIndex(0)
+21>Emitted(80, 124) Source(103, 78) + SourceIndex(0)
+22>Emitted(80, 126) Source(103, 80) + SourceIndex(0)
+23>Emitted(80, 127) Source(103, 81) + SourceIndex(0)
+24>Emitted(80, 129) Source(103, 83) + SourceIndex(0)
+25>Emitted(80, 131) Source(103, 85) + SourceIndex(0)
+26>Emitted(80, 132) Source(103, 86) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2932,62 +2794,55 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(82, 1) Source(105, 1) + SourceIndex(0)
 2 >Emitted(82, 2) Source(105, 2) + SourceIndex(0)
 ---
->>>for ((_2 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, name = _2.name, _3 = _2.skills, primary = _3.primary, secondary = _3.secondary, _2),
+>>>for (_2 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, name = _2.name, _3 = _2.skills, primary = _3.primary, secondary = _3.secondary, _2,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^
-9 >                                                                                                    ^^
-10>                                                                                                      ^^^^^^^^^^^^^^
-11>                                                                                                                    ^^
-12>                                                                                                                      ^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                          ^^
-14>                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                    ^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^
+8 >                                                                                                   ^^
+9 >                                                                                                     ^^^^^^^^^^^^^^
+10>                                                                                                                   ^^
+11>                                                                                                                     ^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                         ^^
+13>                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name, skills: { primary, secondary } } =
-  >          <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                    
-8 >                                                                                      name
-9 >                                                                                                    , 
-10>                                                                                                      skills: { primary, secondary }
-11>                                                                                                                    
-12>                                                                                                                      primary
-13>                                                                                                                                          , 
-14>                                                                                                                                            secondary
-15>                                                                                                                                                                     } } =
-  >                                                                                                                                                                        <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     { name, skills: { primary, secondary } } =
+  >         <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                   
+7 >                                                                                     name
+8 >                                                                                                   , 
+9 >                                                                                                     skills: { primary, secondary }
+10>                                                                                                                   
+11>                                                                                                                     primary
+12>                                                                                                                                         , 
+13>                                                                                                                                           secondary
 1->Emitted(83, 1) Source(106, 1) + SourceIndex(0)
 2 >Emitted(83, 4) Source(106, 4) + SourceIndex(0)
 3 >Emitted(83, 5) Source(106, 5) + SourceIndex(0)
 4 >Emitted(83, 6) Source(106, 6) + SourceIndex(0)
-5 >Emitted(83, 7) Source(106, 6) + SourceIndex(0)
-6 >Emitted(83, 85) Source(107, 90) + SourceIndex(0)
-7 >Emitted(83, 87) Source(106, 8) + SourceIndex(0)
-8 >Emitted(83, 101) Source(106, 12) + SourceIndex(0)
-9 >Emitted(83, 103) Source(106, 14) + SourceIndex(0)
-10>Emitted(83, 117) Source(106, 44) + SourceIndex(0)
-11>Emitted(83, 119) Source(106, 24) + SourceIndex(0)
-12>Emitted(83, 139) Source(106, 31) + SourceIndex(0)
-13>Emitted(83, 141) Source(106, 33) + SourceIndex(0)
-14>Emitted(83, 165) Source(106, 42) + SourceIndex(0)
-15>Emitted(83, 170) Source(107, 90) + SourceIndex(0)
+5 >Emitted(83, 84) Source(107, 90) + SourceIndex(0)
+6 >Emitted(83, 86) Source(106, 8) + SourceIndex(0)
+7 >Emitted(83, 100) Source(106, 12) + SourceIndex(0)
+8 >Emitted(83, 102) Source(106, 14) + SourceIndex(0)
+9 >Emitted(83, 116) Source(106, 44) + SourceIndex(0)
+10>Emitted(83, 118) Source(106, 24) + SourceIndex(0)
+11>Emitted(83, 138) Source(106, 31) + SourceIndex(0)
+12>Emitted(83, 140) Source(106, 33) + SourceIndex(0)
+13>Emitted(83, 164) Source(106, 42) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -3004,7 +2859,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPattern2.ts
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 > } } =
+  >    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js.map
index b208c41c9a6..0e96b80e749 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,GAAG,CAAC,CAAM,mBAAqB,EAArB,qCAAqB,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,wBAAsB,EAAtB,qCAAsB,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,oDAAsB,EAAtB,qCAAsB,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,0BAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAE3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CACA,+BAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CACA,yFAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAM,mBAAsB,EAAtB,qCAAsB,EAAE,gBAAuB,EAAvB,qCAAuB,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,eAAmE,EAA9D,YAAsB,EAAtB,qCAAsB,EAAE,aAAuB,EAAvB,qCAAuB,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,2CAAsG,EAAjG,YAAsB,EAAtB,qCAAsB,EAAE,aAAuB,EAAvB,qCAAuB,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7H,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,wBAAsB,EAAtB,qCAAsB,EACtB,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAE3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,oBAMc,EALf,YAAsB,EAAtB,qCAAsB,EACtB,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,IAAA,+EAMoF,EALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,eAAqB,EAArB,qCAAqB,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,oBAAsB,EAAtB,qCAAsB,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAM,IAAA,gDAAsB,EAAtB,qCAAsB,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,IAAA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAE3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CACA,IAAA,2BAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CACA,IAAA,qFAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAM,IAAA,eAAsB,EAAtB,qCAAsB,EAAE,gBAAuB,EAAvB,qCAAuB,EAAY,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,eAA+D,EAA9D,YAAsB,EAAtB,qCAAsB,EAAE,aAAuB,EAAvB,qCAAuB,EAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,2CAAkG,EAAjG,YAAsB,EAAtB,qCAAsB,EAAE,aAAuB,EAAvB,qCAAuB,EAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7H,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,IAAA,oBAAsB,EAAtB,qCAAsB,EACtB,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAE3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,oBAMU,EALf,YAAsB,EAAtB,qCAAsB,EACtB,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAK,IAAA,+EAMgF,EALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.sourcemap.txt
index c8c63e66adf..ebe3dccdad7 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.sourcemap.txt
@@ -213,64 +213,67 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^
-6 >                        ^^
-7 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                               ^^
-9 >                                                                 ^
-10>                                                                  ^^^
-11>                                                                     ^
-12>                                                                      ^^
-13>                                                                        ^
-14>                                                                         ^^^
-15>                                                                            ^
-16>                                                                             ^^
-17>                                                                               ^
-18>                                                                                ^^
-19>                                                                                  ^^
-20>                                                                                    ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^
+7 >                        ^^
+8 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                               ^^
+10>                                                                 ^
+11>                                                                  ^^^
+12>                                                                     ^
+13>                                                                      ^^
+14>                                                                        ^
+15>                                                                         ^^^
+16>                                                                            ^
+17>                                                                             ^^
+18>                                                                               ^
+19>                                                                                ^^
+20>                                                                                  ^^
+21>                                                                                    ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA= "noName"
-6 >                        
-7 >                          name: nameA= "noName"
-8 >                                                                } = robot, 
-9 >                                                                 i
-10>                                                                   = 
-11>                                                                     0
-12>                                                                      ; 
-13>                                                                        i
-14>                                                                          < 
-15>                                                                            1
-16>                                                                             ; 
-17>                                                                               i
-18>                                                                                ++
-19>                                                                                  ) 
-20>                                                                                    {
+5 >     
+6 >         name: nameA= "noName"
+7 >                        
+8 >                          name: nameA= "noName"
+9 >                                                                } = robot, 
+10>                                                                 i
+11>                                                                   = 
+12>                                                                     0
+13>                                                                      ; 
+14>                                                                        i
+15>                                                                          < 
+16>                                                                            1
+17>                                                                             ; 
+18>                                                                               i
+19>                                                                                ++
+20>                                                                                  ) 
+21>                                                                                    {
 1->Emitted(9, 1) Source(26, 1) + SourceIndex(0)
 2 >Emitted(9, 4) Source(26, 4) + SourceIndex(0)
 3 >Emitted(9, 5) Source(26, 5) + SourceIndex(0)
 4 >Emitted(9, 6) Source(26, 11) + SourceIndex(0)
-5 >Emitted(9, 25) Source(26, 32) + SourceIndex(0)
-6 >Emitted(9, 27) Source(26, 11) + SourceIndex(0)
-7 >Emitted(9, 64) Source(26, 32) + SourceIndex(0)
-8 >Emitted(9, 66) Source(26, 44) + SourceIndex(0)
-9 >Emitted(9, 67) Source(26, 45) + SourceIndex(0)
-10>Emitted(9, 70) Source(26, 48) + SourceIndex(0)
-11>Emitted(9, 71) Source(26, 49) + SourceIndex(0)
-12>Emitted(9, 73) Source(26, 51) + SourceIndex(0)
-13>Emitted(9, 74) Source(26, 52) + SourceIndex(0)
-14>Emitted(9, 77) Source(26, 55) + SourceIndex(0)
-15>Emitted(9, 78) Source(26, 56) + SourceIndex(0)
-16>Emitted(9, 80) Source(26, 58) + SourceIndex(0)
-17>Emitted(9, 81) Source(26, 59) + SourceIndex(0)
-18>Emitted(9, 83) Source(26, 61) + SourceIndex(0)
-19>Emitted(9, 85) Source(26, 63) + SourceIndex(0)
-20>Emitted(9, 86) Source(26, 64) + SourceIndex(0)
+5 >Emitted(9, 10) Source(26, 11) + SourceIndex(0)
+6 >Emitted(9, 25) Source(26, 32) + SourceIndex(0)
+7 >Emitted(9, 27) Source(26, 11) + SourceIndex(0)
+8 >Emitted(9, 64) Source(26, 32) + SourceIndex(0)
+9 >Emitted(9, 66) Source(26, 44) + SourceIndex(0)
+10>Emitted(9, 67) Source(26, 45) + SourceIndex(0)
+11>Emitted(9, 70) Source(26, 48) + SourceIndex(0)
+12>Emitted(9, 71) Source(26, 49) + SourceIndex(0)
+13>Emitted(9, 73) Source(26, 51) + SourceIndex(0)
+14>Emitted(9, 74) Source(26, 52) + SourceIndex(0)
+15>Emitted(9, 77) Source(26, 55) + SourceIndex(0)
+16>Emitted(9, 78) Source(26, 56) + SourceIndex(0)
+17>Emitted(9, 80) Source(26, 58) + SourceIndex(0)
+18>Emitted(9, 81) Source(26, 59) + SourceIndex(0)
+19>Emitted(9, 83) Source(26, 61) + SourceIndex(0)
+20>Emitted(9, 85) Source(26, 63) + SourceIndex(0)
+21>Emitted(9, 86) Source(26, 64) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -314,63 +317,66 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                    ^^
-9 >                                                                      ^
-10>                                                                       ^^^
-11>                                                                          ^
-12>                                                                           ^^
-13>                                                                             ^
-14>                                                                              ^^^
-15>                                                                                 ^
-16>                                                                                  ^^
-17>                                                                                    ^
-18>                                                                                     ^^
-19>                                                                                       ^^
-20>                                                                                         ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^
+7 >                             ^^
+8 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                    ^^
+10>                                                                      ^
+11>                                                                       ^^^
+12>                                                                          ^
+13>                                                                           ^^
+14>                                                                             ^
+15>                                                                              ^^^
+16>                                                                                 ^
+17>                                                                                  ^^
+18>                                                                                    ^
+19>                                                                                     ^^
+20>                                                                                       ^^
+21>                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA = "noName"
-6 >                             
-7 >                               name: nameA = "noName"
-8 >                                                                     } = getRobot(), 
-9 >                                                                      i
-10>                                                                        = 
-11>                                                                          0
-12>                                                                           ; 
-13>                                                                             i
-14>                                                                               < 
-15>                                                                                 1
-16>                                                                                  ; 
-17>                                                                                    i
-18>                                                                                     ++
-19>                                                                                       ) 
-20>                                                                                         {
+5 >     
+6 >         name: nameA = "noName"
+7 >                             
+8 >                               name: nameA = "noName"
+9 >                                                                     } = getRobot(), 
+10>                                                                      i
+11>                                                                        = 
+12>                                                                          0
+13>                                                                           ; 
+14>                                                                             i
+15>                                                                               < 
+16>                                                                                 1
+17>                                                                                  ; 
+18>                                                                                    i
+19>                                                                                     ++
+20>                                                                                       ) 
+21>                                                                                         {
 1->Emitted(12, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(12, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(12, 5) Source(29, 5) + SourceIndex(0)
 4 >Emitted(12, 6) Source(29, 11) + SourceIndex(0)
-5 >Emitted(12, 30) Source(29, 33) + SourceIndex(0)
-6 >Emitted(12, 32) Source(29, 11) + SourceIndex(0)
-7 >Emitted(12, 69) Source(29, 33) + SourceIndex(0)
-8 >Emitted(12, 71) Source(29, 50) + SourceIndex(0)
-9 >Emitted(12, 72) Source(29, 51) + SourceIndex(0)
-10>Emitted(12, 75) Source(29, 54) + SourceIndex(0)
-11>Emitted(12, 76) Source(29, 55) + SourceIndex(0)
-12>Emitted(12, 78) Source(29, 57) + SourceIndex(0)
-13>Emitted(12, 79) Source(29, 58) + SourceIndex(0)
-14>Emitted(12, 82) Source(29, 61) + SourceIndex(0)
-15>Emitted(12, 83) Source(29, 62) + SourceIndex(0)
-16>Emitted(12, 85) Source(29, 64) + SourceIndex(0)
-17>Emitted(12, 86) Source(29, 65) + SourceIndex(0)
-18>Emitted(12, 88) Source(29, 67) + SourceIndex(0)
-19>Emitted(12, 90) Source(29, 69) + SourceIndex(0)
-20>Emitted(12, 91) Source(29, 70) + SourceIndex(0)
+5 >Emitted(12, 10) Source(29, 11) + SourceIndex(0)
+6 >Emitted(12, 30) Source(29, 33) + SourceIndex(0)
+7 >Emitted(12, 32) Source(29, 11) + SourceIndex(0)
+8 >Emitted(12, 69) Source(29, 33) + SourceIndex(0)
+9 >Emitted(12, 71) Source(29, 50) + SourceIndex(0)
+10>Emitted(12, 72) Source(29, 51) + SourceIndex(0)
+11>Emitted(12, 75) Source(29, 54) + SourceIndex(0)
+12>Emitted(12, 76) Source(29, 55) + SourceIndex(0)
+13>Emitted(12, 78) Source(29, 57) + SourceIndex(0)
+14>Emitted(12, 79) Source(29, 58) + SourceIndex(0)
+15>Emitted(12, 82) Source(29, 61) + SourceIndex(0)
+16>Emitted(12, 83) Source(29, 62) + SourceIndex(0)
+17>Emitted(12, 85) Source(29, 64) + SourceIndex(0)
+18>Emitted(12, 86) Source(29, 65) + SourceIndex(0)
+19>Emitted(12, 88) Source(29, 67) + SourceIndex(0)
+20>Emitted(12, 90) Source(29, 69) + SourceIndex(0)
+21>Emitted(12, 91) Source(29, 70) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -414,63 +420,66 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                         ^^
-7 >                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                                                ^^
-9 >                                                                                                  ^
-10>                                                                                                   ^^^
-11>                                                                                                      ^
-12>                                                                                                       ^^
-13>                                                                                                         ^
-14>                                                                                                          ^^^
-15>                                                                                                             ^
-16>                                                                                                              ^^
-17>                                                                                                                ^
-18>                                                                                                                 ^^
-19>                                                                                                                   ^^
-20>                                                                                                                     ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                         ^^
+8 >                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                ^^
+10>                                                                                                  ^
+11>                                                                                                   ^^^
+12>                                                                                                      ^
+13>                                                                                                       ^^
+14>                                                                                                         ^
+15>                                                                                                          ^^^
+16>                                                                                                             ^
+17>                                                                                                              ^^
+18>                                                                                                                ^
+19>                                                                                                                 ^^
+20>                                                                                                                   ^^
+21>                                                                                                                     ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA = "noName"
-6 >                                                         
-7 >                                                           name: nameA = "noName"
-8 >                                                                                                 } = <Robot>{ name: "trimmer", skill: "trimming" }, 
-9 >                                                                                                  i
-10>                                                                                                    = 
-11>                                                                                                      0
-12>                                                                                                       ; 
-13>                                                                                                         i
-14>                                                                                                           < 
-15>                                                                                                             1
-16>                                                                                                              ; 
-17>                                                                                                                i
-18>                                                                                                                 ++
-19>                                                                                                                   ) 
-20>                                                                                                                     {
+5 >     
+6 >         name: nameA = "noName"
+7 >                                                         
+8 >                                                           name: nameA = "noName"
+9 >                                                                                                 } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+10>                                                                                                  i
+11>                                                                                                    = 
+12>                                                                                                      0
+13>                                                                                                       ; 
+14>                                                                                                         i
+15>                                                                                                           < 
+16>                                                                                                             1
+17>                                                                                                              ; 
+18>                                                                                                                i
+19>                                                                                                                 ++
+20>                                                                                                                   ) 
+21>                                                                                                                     {
 1->Emitted(15, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(15, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(15, 5) Source(32, 5) + SourceIndex(0)
 4 >Emitted(15, 6) Source(32, 11) + SourceIndex(0)
-5 >Emitted(15, 58) Source(32, 33) + SourceIndex(0)
-6 >Emitted(15, 60) Source(32, 11) + SourceIndex(0)
-7 >Emitted(15, 97) Source(32, 33) + SourceIndex(0)
-8 >Emitted(15, 99) Source(32, 85) + SourceIndex(0)
-9 >Emitted(15, 100) Source(32, 86) + SourceIndex(0)
-10>Emitted(15, 103) Source(32, 89) + SourceIndex(0)
-11>Emitted(15, 104) Source(32, 90) + SourceIndex(0)
-12>Emitted(15, 106) Source(32, 92) + SourceIndex(0)
-13>Emitted(15, 107) Source(32, 93) + SourceIndex(0)
-14>Emitted(15, 110) Source(32, 96) + SourceIndex(0)
-15>Emitted(15, 111) Source(32, 97) + SourceIndex(0)
-16>Emitted(15, 113) Source(32, 99) + SourceIndex(0)
-17>Emitted(15, 114) Source(32, 100) + SourceIndex(0)
-18>Emitted(15, 116) Source(32, 102) + SourceIndex(0)
-19>Emitted(15, 118) Source(32, 104) + SourceIndex(0)
-20>Emitted(15, 119) Source(32, 105) + SourceIndex(0)
+5 >Emitted(15, 10) Source(32, 11) + SourceIndex(0)
+6 >Emitted(15, 58) Source(32, 33) + SourceIndex(0)
+7 >Emitted(15, 60) Source(32, 11) + SourceIndex(0)
+8 >Emitted(15, 97) Source(32, 33) + SourceIndex(0)
+9 >Emitted(15, 99) Source(32, 85) + SourceIndex(0)
+10>Emitted(15, 100) Source(32, 86) + SourceIndex(0)
+11>Emitted(15, 103) Source(32, 89) + SourceIndex(0)
+12>Emitted(15, 104) Source(32, 90) + SourceIndex(0)
+13>Emitted(15, 106) Source(32, 92) + SourceIndex(0)
+14>Emitted(15, 107) Source(32, 93) + SourceIndex(0)
+15>Emitted(15, 110) Source(32, 96) + SourceIndex(0)
+16>Emitted(15, 111) Source(32, 97) + SourceIndex(0)
+17>Emitted(15, 113) Source(32, 99) + SourceIndex(0)
+18>Emitted(15, 114) Source(32, 100) + SourceIndex(0)
+19>Emitted(15, 116) Source(32, 102) + SourceIndex(0)
+20>Emitted(15, 118) Source(32, 104) + SourceIndex(0)
+21>Emitted(15, 119) Source(32, 105) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -514,97 +523,100 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                               ^^
-7 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                                                 ^^
-9 >                                                                                                   ^^^^^^^^^^^^^^^
-10>                                                                                                                  ^^
-11>                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                                             ^^
-13>                                                                                                                                                               ^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                ^^
-15>                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                               ^^
-17>                                                                                                                                                                                                                                 ^
-18>                                                                                                                                                                                                                                  ^^^
-19>                                                                                                                                                                                                                                     ^
-20>                                                                                                                                                                                                                                      ^^
-21>                                                                                                                                                                                                                                        ^
-22>                                                                                                                                                                                                                                         ^^^
-23>                                                                                                                                                                                                                                            ^
-24>                                                                                                                                                                                                                                             ^^
-25>                                                                                                                                                                                                                                               ^
-26>                                                                                                                                                                                                                                                ^^
-27>                                                                                                                                                                                                                                                  ^^
-28>                                                                                                                                                                                                                                                    ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^
+7 >                               ^^
+8 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                 ^^
+10>                                                                                                   ^^^^^^^^^^^^^^^
+11>                                                                                                                  ^^
+12>                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                             ^^
+14>                                                                                                                                                               ^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                ^^
+16>                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                                               ^^
+18>                                                                                                                                                                                                                                 ^
+19>                                                                                                                                                                                                                                  ^^^
+20>                                                                                                                                                                                                                                     ^
+21>                                                                                                                                                                                                                                      ^^
+22>                                                                                                                                                                                                                                        ^
+23>                                                                                                                                                                                                                                         ^^^
+24>                                                                                                                                                                                                                                            ^
+25>                                                                                                                                                                                                                                             ^^
+26>                                                                                                                                                                                                                                               ^
+27>                                                                                                                                                                                                                                                ^^
+28>                                                                                                                                                                                                                                                  ^^
+29>                                                                                                                                                                                                                                                    ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
   >        
-5 >     skills: {
-  >             primary: primaryA = "primary",
-  >             secondary: secondaryA = "secondary"
-  >         } = { primary: "none", secondary: "none" }
-6 >                               
-7 >                                 skills: {
+5 >     
+6 >         skills: {
+  >                 primary: primaryA = "primary",
+  >                 secondary: secondaryA = "secondary"
+  >             } = { primary: "none", secondary: "none" }
+7 >                               
+8 >                                 skills: {
   >                                         primary: primaryA = "primary",
   >                                         secondary: secondaryA = "secondary"
   >                                     } = { primary: "none", secondary: "none" }
-8 >                                                                                                 
-9 >                                                                                                   primary: primaryA = "primary"
-10>                                                                                                                  
-11>                                                                                                                    primary: primaryA = "primary"
-12>                                                                                                                                                             ,
+9 >                                                                                                 
+10>                                                                                                   primary: primaryA = "primary"
+11>                                                                                                                  
+12>                                                                                                                    primary: primaryA = "primary"
+13>                                                                                                                                                             ,
   >                                                                                                                                                                     
-13>                                                                                                                                                               secondary: secondaryA = "secondary"
-14>                                                                                                                                                                                
-15>                                                                                                                                                                                  secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                                                               
+14>                                                                                                                                                               secondary: secondaryA = "secondary"
+15>                                                                                                                                                                                
+16>                                                                                                                                                                                  secondary: secondaryA = "secondary"
+17>                                                                                                                                                                                                                               
   >                                                                                                                                                                                                                                   } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                               } = multiRobot, 
-17>                                                                                                                                                                                                                                 i
-18>                                                                                                                                                                                                                                   = 
-19>                                                                                                                                                                                                                                     0
-20>                                                                                                                                                                                                                                      ; 
-21>                                                                                                                                                                                                                                        i
-22>                                                                                                                                                                                                                                          < 
-23>                                                                                                                                                                                                                                            1
-24>                                                                                                                                                                                                                                             ; 
-25>                                                                                                                                                                                                                                               i
-26>                                                                                                                                                                                                                                                ++
-27>                                                                                                                                                                                                                                                  ) 
-28>                                                                                                                                                                                                                                                    {
+18>                                                                                                                                                                                                                                 i
+19>                                                                                                                                                                                                                                   = 
+20>                                                                                                                                                                                                                                     0
+21>                                                                                                                                                                                                                                      ; 
+22>                                                                                                                                                                                                                                        i
+23>                                                                                                                                                                                                                                          < 
+24>                                                                                                                                                                                                                                            1
+25>                                                                                                                                                                                                                                             ; 
+26>                                                                                                                                                                                                                                               i
+27>                                                                                                                                                                                                                                                ++
+28>                                                                                                                                                                                                                                                  ) 
+29>                                                                                                                                                                                                                                                    {
 1->Emitted(18, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(18, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(18, 5) Source(35, 5) + SourceIndex(0)
 4 >Emitted(18, 6) Source(36, 5) + SourceIndex(0)
-5 >Emitted(18, 32) Source(39, 47) + SourceIndex(0)
-6 >Emitted(18, 34) Source(36, 5) + SourceIndex(0)
-7 >Emitted(18, 98) Source(39, 47) + SourceIndex(0)
-8 >Emitted(18, 100) Source(37, 9) + SourceIndex(0)
-9 >Emitted(18, 115) Source(37, 38) + SourceIndex(0)
-10>Emitted(18, 117) Source(37, 9) + SourceIndex(0)
-11>Emitted(18, 158) Source(37, 38) + SourceIndex(0)
-12>Emitted(18, 160) Source(38, 9) + SourceIndex(0)
-13>Emitted(18, 177) Source(38, 44) + SourceIndex(0)
-14>Emitted(18, 179) Source(38, 9) + SourceIndex(0)
-15>Emitted(18, 224) Source(38, 44) + SourceIndex(0)
-16>Emitted(18, 226) Source(40, 17) + SourceIndex(0)
-17>Emitted(18, 227) Source(40, 18) + SourceIndex(0)
-18>Emitted(18, 230) Source(40, 21) + SourceIndex(0)
-19>Emitted(18, 231) Source(40, 22) + SourceIndex(0)
-20>Emitted(18, 233) Source(40, 24) + SourceIndex(0)
-21>Emitted(18, 234) Source(40, 25) + SourceIndex(0)
-22>Emitted(18, 237) Source(40, 28) + SourceIndex(0)
-23>Emitted(18, 238) Source(40, 29) + SourceIndex(0)
-24>Emitted(18, 240) Source(40, 31) + SourceIndex(0)
-25>Emitted(18, 241) Source(40, 32) + SourceIndex(0)
-26>Emitted(18, 243) Source(40, 34) + SourceIndex(0)
-27>Emitted(18, 245) Source(40, 36) + SourceIndex(0)
-28>Emitted(18, 246) Source(40, 37) + SourceIndex(0)
+5 >Emitted(18, 10) Source(36, 5) + SourceIndex(0)
+6 >Emitted(18, 32) Source(39, 47) + SourceIndex(0)
+7 >Emitted(18, 34) Source(36, 5) + SourceIndex(0)
+8 >Emitted(18, 98) Source(39, 47) + SourceIndex(0)
+9 >Emitted(18, 100) Source(37, 9) + SourceIndex(0)
+10>Emitted(18, 115) Source(37, 38) + SourceIndex(0)
+11>Emitted(18, 117) Source(37, 9) + SourceIndex(0)
+12>Emitted(18, 158) Source(37, 38) + SourceIndex(0)
+13>Emitted(18, 160) Source(38, 9) + SourceIndex(0)
+14>Emitted(18, 177) Source(38, 44) + SourceIndex(0)
+15>Emitted(18, 179) Source(38, 9) + SourceIndex(0)
+16>Emitted(18, 224) Source(38, 44) + SourceIndex(0)
+17>Emitted(18, 226) Source(40, 17) + SourceIndex(0)
+18>Emitted(18, 227) Source(40, 18) + SourceIndex(0)
+19>Emitted(18, 230) Source(40, 21) + SourceIndex(0)
+20>Emitted(18, 231) Source(40, 22) + SourceIndex(0)
+21>Emitted(18, 233) Source(40, 24) + SourceIndex(0)
+22>Emitted(18, 234) Source(40, 25) + SourceIndex(0)
+23>Emitted(18, 237) Source(40, 28) + SourceIndex(0)
+24>Emitted(18, 238) Source(40, 29) + SourceIndex(0)
+25>Emitted(18, 240) Source(40, 31) + SourceIndex(0)
+26>Emitted(18, 241) Source(40, 32) + SourceIndex(0)
+27>Emitted(18, 243) Source(40, 34) + SourceIndex(0)
+28>Emitted(18, 245) Source(40, 36) + SourceIndex(0)
+29>Emitted(18, 246) Source(40, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -648,97 +660,100 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                    ^^
-7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                                                      ^^
-9 >                                                                                                        ^^^^^^^^^^^^^^^
-10>                                                                                                                       ^^
-11>                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                                                  ^^
-13>                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                     ^^
-15>                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                    ^^
-17>                                                                                                                                                                                                                                      ^
-18>                                                                                                                                                                                                                                       ^^^
-19>                                                                                                                                                                                                                                          ^
-20>                                                                                                                                                                                                                                           ^^
-21>                                                                                                                                                                                                                                             ^
-22>                                                                                                                                                                                                                                              ^^^
-23>                                                                                                                                                                                                                                                 ^
-24>                                                                                                                                                                                                                                                  ^^
-25>                                                                                                                                                                                                                                                    ^
-26>                                                                                                                                                                                                                                                     ^^
-27>                                                                                                                                                                                                                                                       ^^
-28>                                                                                                                                                                                                                                                         ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                    ^^
+8 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                      ^^
+10>                                                                                                        ^^^^^^^^^^^^^^^
+11>                                                                                                                       ^^
+12>                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                  ^^
+14>                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                     ^^
+16>                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                                                    ^^
+18>                                                                                                                                                                                                                                      ^
+19>                                                                                                                                                                                                                                       ^^^
+20>                                                                                                                                                                                                                                          ^
+21>                                                                                                                                                                                                                                           ^^
+22>                                                                                                                                                                                                                                             ^
+23>                                                                                                                                                                                                                                              ^^^
+24>                                                                                                                                                                                                                                                 ^
+25>                                                                                                                                                                                                                                                  ^^
+26>                                                                                                                                                                                                                                                    ^
+27>                                                                                                                                                                                                                                                     ^^
+28>                                                                                                                                                                                                                                                       ^^
+29>                                                                                                                                                                                                                                                         ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
   >        
-5 >     skills: {
-  >             primary: primaryA = "primary",
-  >             secondary: secondaryA = "secondary"
-  >         } = { primary: "none", secondary: "none" }
-6 >                                    
-7 >                                      skills: {
+5 >     
+6 >         skills: {
+  >                 primary: primaryA = "primary",
+  >                 secondary: secondaryA = "secondary"
+  >             } = { primary: "none", secondary: "none" }
+7 >                                    
+8 >                                      skills: {
   >                                              primary: primaryA = "primary",
   >                                              secondary: secondaryA = "secondary"
   >                                          } = { primary: "none", secondary: "none" }
-8 >                                                                                                      
-9 >                                                                                                        primary: primaryA = "primary"
-10>                                                                                                                       
-11>                                                                                                                         primary: primaryA = "primary"
-12>                                                                                                                                                                  ,
+9 >                                                                                                      
+10>                                                                                                        primary: primaryA = "primary"
+11>                                                                                                                       
+12>                                                                                                                         primary: primaryA = "primary"
+13>                                                                                                                                                                  ,
   >                                                                                                                                                                          
-13>                                                                                                                                                                    secondary: secondaryA = "secondary"
-14>                                                                                                                                                                                     
-15>                                                                                                                                                                                       secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                                                                    
+14>                                                                                                                                                                    secondary: secondaryA = "secondary"
+15>                                                                                                                                                                                     
+16>                                                                                                                                                                                       secondary: secondaryA = "secondary"
+17>                                                                                                                                                                                                                                    
   >                                                                                                                                                                                                                                        } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                    } = getMultiRobot(), 
-17>                                                                                                                                                                                                                                      i
-18>                                                                                                                                                                                                                                        = 
-19>                                                                                                                                                                                                                                          0
-20>                                                                                                                                                                                                                                           ; 
-21>                                                                                                                                                                                                                                             i
-22>                                                                                                                                                                                                                                               < 
-23>                                                                                                                                                                                                                                                 1
-24>                                                                                                                                                                                                                                                  ; 
-25>                                                                                                                                                                                                                                                    i
-26>                                                                                                                                                                                                                                                     ++
-27>                                                                                                                                                                                                                                                       ) 
-28>                                                                                                                                                                                                                                                         {
+18>                                                                                                                                                                                                                                      i
+19>                                                                                                                                                                                                                                        = 
+20>                                                                                                                                                                                                                                          0
+21>                                                                                                                                                                                                                                           ; 
+22>                                                                                                                                                                                                                                             i
+23>                                                                                                                                                                                                                                               < 
+24>                                                                                                                                                                                                                                                 1
+25>                                                                                                                                                                                                                                                  ; 
+26>                                                                                                                                                                                                                                                    i
+27>                                                                                                                                                                                                                                                     ++
+28>                                                                                                                                                                                                                                                       ) 
+29>                                                                                                                                                                                                                                                         {
 1->Emitted(21, 1) Source(43, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(43, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(43, 5) + SourceIndex(0)
 4 >Emitted(21, 6) Source(44, 5) + SourceIndex(0)
-5 >Emitted(21, 37) Source(47, 47) + SourceIndex(0)
-6 >Emitted(21, 39) Source(44, 5) + SourceIndex(0)
-7 >Emitted(21, 103) Source(47, 47) + SourceIndex(0)
-8 >Emitted(21, 105) Source(45, 9) + SourceIndex(0)
-9 >Emitted(21, 120) Source(45, 38) + SourceIndex(0)
-10>Emitted(21, 122) Source(45, 9) + SourceIndex(0)
-11>Emitted(21, 163) Source(45, 38) + SourceIndex(0)
-12>Emitted(21, 165) Source(46, 9) + SourceIndex(0)
-13>Emitted(21, 182) Source(46, 44) + SourceIndex(0)
-14>Emitted(21, 184) Source(46, 9) + SourceIndex(0)
-15>Emitted(21, 229) Source(46, 44) + SourceIndex(0)
-16>Emitted(21, 231) Source(48, 22) + SourceIndex(0)
-17>Emitted(21, 232) Source(48, 23) + SourceIndex(0)
-18>Emitted(21, 235) Source(48, 26) + SourceIndex(0)
-19>Emitted(21, 236) Source(48, 27) + SourceIndex(0)
-20>Emitted(21, 238) Source(48, 29) + SourceIndex(0)
-21>Emitted(21, 239) Source(48, 30) + SourceIndex(0)
-22>Emitted(21, 242) Source(48, 33) + SourceIndex(0)
-23>Emitted(21, 243) Source(48, 34) + SourceIndex(0)
-24>Emitted(21, 245) Source(48, 36) + SourceIndex(0)
-25>Emitted(21, 246) Source(48, 37) + SourceIndex(0)
-26>Emitted(21, 248) Source(48, 39) + SourceIndex(0)
-27>Emitted(21, 250) Source(48, 41) + SourceIndex(0)
-28>Emitted(21, 251) Source(48, 42) + SourceIndex(0)
+5 >Emitted(21, 10) Source(44, 5) + SourceIndex(0)
+6 >Emitted(21, 37) Source(47, 47) + SourceIndex(0)
+7 >Emitted(21, 39) Source(44, 5) + SourceIndex(0)
+8 >Emitted(21, 103) Source(47, 47) + SourceIndex(0)
+9 >Emitted(21, 105) Source(45, 9) + SourceIndex(0)
+10>Emitted(21, 120) Source(45, 38) + SourceIndex(0)
+11>Emitted(21, 122) Source(45, 9) + SourceIndex(0)
+12>Emitted(21, 163) Source(45, 38) + SourceIndex(0)
+13>Emitted(21, 165) Source(46, 9) + SourceIndex(0)
+14>Emitted(21, 182) Source(46, 44) + SourceIndex(0)
+15>Emitted(21, 184) Source(46, 9) + SourceIndex(0)
+16>Emitted(21, 229) Source(46, 44) + SourceIndex(0)
+17>Emitted(21, 231) Source(48, 22) + SourceIndex(0)
+18>Emitted(21, 232) Source(48, 23) + SourceIndex(0)
+19>Emitted(21, 235) Source(48, 26) + SourceIndex(0)
+20>Emitted(21, 236) Source(48, 27) + SourceIndex(0)
+21>Emitted(21, 238) Source(48, 29) + SourceIndex(0)
+22>Emitted(21, 239) Source(48, 30) + SourceIndex(0)
+23>Emitted(21, 242) Source(48, 33) + SourceIndex(0)
+24>Emitted(21, 243) Source(48, 34) + SourceIndex(0)
+25>Emitted(21, 245) Source(48, 36) + SourceIndex(0)
+26>Emitted(21, 246) Source(48, 37) + SourceIndex(0)
+27>Emitted(21, 248) Source(48, 39) + SourceIndex(0)
+28>Emitted(21, 250) Source(48, 41) + SourceIndex(0)
+29>Emitted(21, 251) Source(48, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -782,98 +797,101 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                              ^^
-7 >                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                                                                                                                ^^
-9 >                                                                                                                                                                  ^^^^^^^^^^^^^^^
-10>                                                                                                                                                                                 ^^
-11>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                                                                                                            ^^
-13>                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                               ^^
-15>                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                                                              ^^
-17>                                                                                                                                                                                                                                                                                                ^
-18>                                                                                                                                                                                                                                                                                                 ^^^
-19>                                                                                                                                                                                                                                                                                                    ^
-20>                                                                                                                                                                                                                                                                                                     ^^
-21>                                                                                                                                                                                                                                                                                                       ^
-22>                                                                                                                                                                                                                                                                                                        ^^^
-23>                                                                                                                                                                                                                                                                                                           ^
-24>                                                                                                                                                                                                                                                                                                            ^^
-25>                                                                                                                                                                                                                                                                                                              ^
-26>                                                                                                                                                                                                                                                                                                               ^^
-27>                                                                                                                                                                                                                                                                                                                 ^^
-28>                                                                                                                                                                                                                                                                                                                   ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                                              ^^
+8 >                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                ^^
+10>                                                                                                                                                                  ^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                 ^^
+12>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                            ^^
+14>                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                               ^^
+16>                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                                                                                                              ^^
+18>                                                                                                                                                                                                                                                                                                ^
+19>                                                                                                                                                                                                                                                                                                 ^^^
+20>                                                                                                                                                                                                                                                                                                    ^
+21>                                                                                                                                                                                                                                                                                                     ^^
+22>                                                                                                                                                                                                                                                                                                       ^
+23>                                                                                                                                                                                                                                                                                                        ^^^
+24>                                                                                                                                                                                                                                                                                                           ^
+25>                                                                                                                                                                                                                                                                                                            ^^
+26>                                                                                                                                                                                                                                                                                                              ^
+27>                                                                                                                                                                                                                                                                                                               ^^
+28>                                                                                                                                                                                                                                                                                                                 ^^
+29>                                                                                                                                                                                                                                                                                                                   ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
   >        
-5 >     skills: {
-  >             primary: primaryA = "primary",
-  >             secondary: secondaryA = "secondary"
-  >         } = { primary: "none", secondary: "none" }
-6 >                                                                                              
-7 >                                                                                                skills: {
+5 >     
+6 >         skills: {
+  >                 primary: primaryA = "primary",
+  >                 secondary: secondaryA = "secondary"
+  >             } = { primary: "none", secondary: "none" }
+7 >                                                                                              
+8 >                                                                                                skills: {
   >                                                                                                        primary: primaryA = "primary",
   >                                                                                                        secondary: secondaryA = "secondary"
   >                                                                                                    } = { primary: "none", secondary: "none" }
-8 >                                                                                                                                                                
-9 >                                                                                                                                                                  primary: primaryA = "primary"
-10>                                                                                                                                                                                 
-11>                                                                                                                                                                                   primary: primaryA = "primary"
-12>                                                                                                                                                                                                                            ,
+9 >                                                                                                                                                                
+10>                                                                                                                                                                  primary: primaryA = "primary"
+11>                                                                                                                                                                                 
+12>                                                                                                                                                                                   primary: primaryA = "primary"
+13>                                                                                                                                                                                                                            ,
   >                                                                                                                                                                                                                                    
-13>                                                                                                                                                                                                                              secondary: secondaryA = "secondary"
-14>                                                                                                                                                                                                                                               
-15>                                                                                                                                                                                                                                                 secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                                                                                                                              
+14>                                                                                                                                                                                                                              secondary: secondaryA = "secondary"
+15>                                                                                                                                                                                                                                               
+16>                                                                                                                                                                                                                                                 secondary: secondaryA = "secondary"
+17>                                                                                                                                                                                                                                                                                              
   >                                                                                                                                                                                                                                                                                                  } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                                                                              } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >                                                                                                                                                                                                                                                                                                  
-17>                                                                                                                                                                                                                                                                                                i
-18>                                                                                                                                                                                                                                                                                                  = 
-19>                                                                                                                                                                                                                                                                                                    0
-20>                                                                                                                                                                                                                                                                                                     ; 
-21>                                                                                                                                                                                                                                                                                                       i
-22>                                                                                                                                                                                                                                                                                                         < 
-23>                                                                                                                                                                                                                                                                                                           1
-24>                                                                                                                                                                                                                                                                                                            ; 
-25>                                                                                                                                                                                                                                                                                                              i
-26>                                                                                                                                                                                                                                                                                                               ++
-27>                                                                                                                                                                                                                                                                                                                 ) 
-28>                                                                                                                                                                                                                                                                                                                   {
+18>                                                                                                                                                                                                                                                                                                i
+19>                                                                                                                                                                                                                                                                                                  = 
+20>                                                                                                                                                                                                                                                                                                    0
+21>                                                                                                                                                                                                                                                                                                     ; 
+22>                                                                                                                                                                                                                                                                                                       i
+23>                                                                                                                                                                                                                                                                                                         < 
+24>                                                                                                                                                                                                                                                                                                           1
+25>                                                                                                                                                                                                                                                                                                            ; 
+26>                                                                                                                                                                                                                                                                                                              i
+27>                                                                                                                                                                                                                                                                                                               ++
+28>                                                                                                                                                                                                                                                                                                                 ) 
+29>                                                                                                                                                                                                                                                                                                                   {
 1->Emitted(24, 1) Source(51, 1) + SourceIndex(0)
 2 >Emitted(24, 4) Source(51, 4) + SourceIndex(0)
 3 >Emitted(24, 5) Source(51, 5) + SourceIndex(0)
 4 >Emitted(24, 6) Source(52, 5) + SourceIndex(0)
-5 >Emitted(24, 95) Source(55, 47) + SourceIndex(0)
-6 >Emitted(24, 97) Source(52, 5) + SourceIndex(0)
-7 >Emitted(24, 161) Source(55, 47) + SourceIndex(0)
-8 >Emitted(24, 163) Source(53, 9) + SourceIndex(0)
-9 >Emitted(24, 178) Source(53, 38) + SourceIndex(0)
-10>Emitted(24, 180) Source(53, 9) + SourceIndex(0)
-11>Emitted(24, 221) Source(53, 38) + SourceIndex(0)
-12>Emitted(24, 223) Source(54, 9) + SourceIndex(0)
-13>Emitted(24, 240) Source(54, 44) + SourceIndex(0)
-14>Emitted(24, 242) Source(54, 9) + SourceIndex(0)
-15>Emitted(24, 287) Source(54, 44) + SourceIndex(0)
-16>Emitted(24, 289) Source(57, 5) + SourceIndex(0)
-17>Emitted(24, 290) Source(57, 6) + SourceIndex(0)
-18>Emitted(24, 293) Source(57, 9) + SourceIndex(0)
-19>Emitted(24, 294) Source(57, 10) + SourceIndex(0)
-20>Emitted(24, 296) Source(57, 12) + SourceIndex(0)
-21>Emitted(24, 297) Source(57, 13) + SourceIndex(0)
-22>Emitted(24, 300) Source(57, 16) + SourceIndex(0)
-23>Emitted(24, 301) Source(57, 17) + SourceIndex(0)
-24>Emitted(24, 303) Source(57, 19) + SourceIndex(0)
-25>Emitted(24, 304) Source(57, 20) + SourceIndex(0)
-26>Emitted(24, 306) Source(57, 22) + SourceIndex(0)
-27>Emitted(24, 308) Source(57, 24) + SourceIndex(0)
-28>Emitted(24, 309) Source(57, 25) + SourceIndex(0)
+5 >Emitted(24, 10) Source(52, 5) + SourceIndex(0)
+6 >Emitted(24, 95) Source(55, 47) + SourceIndex(0)
+7 >Emitted(24, 97) Source(52, 5) + SourceIndex(0)
+8 >Emitted(24, 161) Source(55, 47) + SourceIndex(0)
+9 >Emitted(24, 163) Source(53, 9) + SourceIndex(0)
+10>Emitted(24, 178) Source(53, 38) + SourceIndex(0)
+11>Emitted(24, 180) Source(53, 9) + SourceIndex(0)
+12>Emitted(24, 221) Source(53, 38) + SourceIndex(0)
+13>Emitted(24, 223) Source(54, 9) + SourceIndex(0)
+14>Emitted(24, 240) Source(54, 44) + SourceIndex(0)
+15>Emitted(24, 242) Source(54, 9) + SourceIndex(0)
+16>Emitted(24, 287) Source(54, 44) + SourceIndex(0)
+17>Emitted(24, 289) Source(57, 5) + SourceIndex(0)
+18>Emitted(24, 290) Source(57, 6) + SourceIndex(0)
+19>Emitted(24, 293) Source(57, 9) + SourceIndex(0)
+20>Emitted(24, 294) Source(57, 10) + SourceIndex(0)
+21>Emitted(24, 296) Source(57, 12) + SourceIndex(0)
+22>Emitted(24, 297) Source(57, 13) + SourceIndex(0)
+23>Emitted(24, 300) Source(57, 16) + SourceIndex(0)
+24>Emitted(24, 301) Source(57, 17) + SourceIndex(0)
+25>Emitted(24, 303) Source(57, 19) + SourceIndex(0)
+26>Emitted(24, 304) Source(57, 20) + SourceIndex(0)
+27>Emitted(24, 306) Source(57, 22) + SourceIndex(0)
+28>Emitted(24, 308) Source(57, 24) + SourceIndex(0)
+29>Emitted(24, 309) Source(57, 25) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -917,76 +935,79 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^
-6 >                        ^^
-7 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                               ^^
-9 >                                                                 ^^^^^^^^^^^^^^^^
-10>                                                                                 ^^
-11>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                        ^^
-13>                                                                                                                          ^
-14>                                                                                                                           ^^^
-15>                                                                                                                              ^
-16>                                                                                                                               ^^
-17>                                                                                                                                 ^
-18>                                                                                                                                  ^^^
-19>                                                                                                                                     ^
-20>                                                                                                                                      ^^
-21>                                                                                                                                        ^
-22>                                                                                                                                         ^^
-23>                                                                                                                                           ^^
-24>                                                                                                                                             ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^
+7 >                        ^^
+8 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                               ^^
+10>                                                                 ^^^^^^^^^^^^^^^^
+11>                                                                                 ^^
+12>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                        ^^
+14>                                                                                                                          ^
+15>                                                                                                                           ^^^
+16>                                                                                                                              ^
+17>                                                                                                                               ^^
+18>                                                                                                                                 ^
+19>                                                                                                                                  ^^^
+20>                                                                                                                                     ^
+21>                                                                                                                                      ^^
+22>                                                                                                                                        ^
+23>                                                                                                                                         ^^
+24>                                                                                                                                           ^^
+25>                                                                                                                                             ^
 1->
   >
   >
 2 >for
 3 >    
 4 >    (let {
-5 >     name: nameA = "noName"
-6 >                        
-7 >                          name: nameA = "noName"
-8 >                                                               , 
-9 >                                                                 skill: skillA = "skill"
-10>                                                                                 
-11>                                                                                   skill: skillA = "skill"
-12>                                                                                                                         } = robot, 
-13>                                                                                                                          i
-14>                                                                                                                            = 
-15>                                                                                                                              0
-16>                                                                                                                               ; 
-17>                                                                                                                                 i
-18>                                                                                                                                   < 
-19>                                                                                                                                     1
-20>                                                                                                                                      ; 
-21>                                                                                                                                        i
-22>                                                                                                                                         ++
-23>                                                                                                                                           ) 
-24>                                                                                                                                             {
+5 >     
+6 >         name: nameA = "noName"
+7 >                        
+8 >                          name: nameA = "noName"
+9 >                                                               , 
+10>                                                                 skill: skillA = "skill"
+11>                                                                                 
+12>                                                                                   skill: skillA = "skill"
+13>                                                                                                                         } = robot, 
+14>                                                                                                                          i
+15>                                                                                                                            = 
+16>                                                                                                                              0
+17>                                                                                                                               ; 
+18>                                                                                                                                 i
+19>                                                                                                                                   < 
+20>                                                                                                                                     1
+21>                                                                                                                                      ; 
+22>                                                                                                                                        i
+23>                                                                                                                                         ++
+24>                                                                                                                                           ) 
+25>                                                                                                                                             {
 1->Emitted(27, 1) Source(61, 1) + SourceIndex(0)
 2 >Emitted(27, 4) Source(61, 4) + SourceIndex(0)
 3 >Emitted(27, 5) Source(61, 5) + SourceIndex(0)
 4 >Emitted(27, 6) Source(61, 11) + SourceIndex(0)
-5 >Emitted(27, 25) Source(61, 33) + SourceIndex(0)
-6 >Emitted(27, 27) Source(61, 11) + SourceIndex(0)
-7 >Emitted(27, 64) Source(61, 33) + SourceIndex(0)
-8 >Emitted(27, 66) Source(61, 35) + SourceIndex(0)
-9 >Emitted(27, 82) Source(61, 58) + SourceIndex(0)
-10>Emitted(27, 84) Source(61, 35) + SourceIndex(0)
-11>Emitted(27, 121) Source(61, 58) + SourceIndex(0)
-12>Emitted(27, 123) Source(61, 70) + SourceIndex(0)
-13>Emitted(27, 124) Source(61, 71) + SourceIndex(0)
-14>Emitted(27, 127) Source(61, 74) + SourceIndex(0)
-15>Emitted(27, 128) Source(61, 75) + SourceIndex(0)
-16>Emitted(27, 130) Source(61, 77) + SourceIndex(0)
-17>Emitted(27, 131) Source(61, 78) + SourceIndex(0)
-18>Emitted(27, 134) Source(61, 81) + SourceIndex(0)
-19>Emitted(27, 135) Source(61, 82) + SourceIndex(0)
-20>Emitted(27, 137) Source(61, 84) + SourceIndex(0)
-21>Emitted(27, 138) Source(61, 85) + SourceIndex(0)
-22>Emitted(27, 140) Source(61, 87) + SourceIndex(0)
-23>Emitted(27, 142) Source(61, 89) + SourceIndex(0)
-24>Emitted(27, 143) Source(61, 90) + SourceIndex(0)
+5 >Emitted(27, 10) Source(61, 11) + SourceIndex(0)
+6 >Emitted(27, 25) Source(61, 33) + SourceIndex(0)
+7 >Emitted(27, 27) Source(61, 11) + SourceIndex(0)
+8 >Emitted(27, 64) Source(61, 33) + SourceIndex(0)
+9 >Emitted(27, 66) Source(61, 35) + SourceIndex(0)
+10>Emitted(27, 82) Source(61, 58) + SourceIndex(0)
+11>Emitted(27, 84) Source(61, 35) + SourceIndex(0)
+12>Emitted(27, 121) Source(61, 58) + SourceIndex(0)
+13>Emitted(27, 123) Source(61, 70) + SourceIndex(0)
+14>Emitted(27, 124) Source(61, 71) + SourceIndex(0)
+15>Emitted(27, 127) Source(61, 74) + SourceIndex(0)
+16>Emitted(27, 128) Source(61, 75) + SourceIndex(0)
+17>Emitted(27, 130) Source(61, 77) + SourceIndex(0)
+18>Emitted(27, 131) Source(61, 78) + SourceIndex(0)
+19>Emitted(27, 134) Source(61, 81) + SourceIndex(0)
+20>Emitted(27, 135) Source(61, 82) + SourceIndex(0)
+21>Emitted(27, 137) Source(61, 84) + SourceIndex(0)
+22>Emitted(27, 138) Source(61, 85) + SourceIndex(0)
+23>Emitted(27, 140) Source(61, 87) + SourceIndex(0)
+24>Emitted(27, 142) Source(61, 89) + SourceIndex(0)
+25>Emitted(27, 143) Source(61, 90) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1057,9 +1078,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {name: nameA = "noName", skill: skillA = "skill" } = getRobot()
+6 >         {name: nameA = "noName", skill: skillA = "skill" } = getRobot()
 7 >                        
 8 >                          name: nameA = "noName"
 9 >                                      
@@ -1084,8 +1105,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 1->Emitted(30, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(30, 4) Source(64, 4) + SourceIndex(0)
 3 >Emitted(30, 5) Source(64, 5) + SourceIndex(0)
-4 >Emitted(30, 6) Source(64, 6) + SourceIndex(0)
-5 >Emitted(30, 10) Source(64, 6) + SourceIndex(0)
+4 >Emitted(30, 6) Source(64, 10) + SourceIndex(0)
+5 >Emitted(30, 10) Source(64, 10) + SourceIndex(0)
 6 >Emitted(30, 25) Source(64, 73) + SourceIndex(0)
 7 >Emitted(30, 27) Source(64, 11) + SourceIndex(0)
 8 >Emitted(30, 39) Source(64, 33) + SourceIndex(0)
@@ -1178,9 +1199,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >         {name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }
 7 >                                                    
 8 >                                                      name: nameA = "noName"
 9 >                                                                  
@@ -1205,8 +1226,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 1->Emitted(33, 1) Source(67, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(67, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(67, 5) + SourceIndex(0)
-4 >Emitted(33, 6) Source(67, 6) + SourceIndex(0)
-5 >Emitted(33, 10) Source(67, 6) + SourceIndex(0)
+4 >Emitted(33, 6) Source(67, 10) + SourceIndex(0)
+5 >Emitted(33, 10) Source(67, 10) + SourceIndex(0)
 6 >Emitted(33, 53) Source(67, 108) + SourceIndex(0)
 7 >Emitted(33, 55) Source(67, 11) + SourceIndex(0)
 8 >Emitted(33, 67) Source(67, 33) + SourceIndex(0)
@@ -1272,110 +1293,113 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                                    ^^
-9 >                                                                      ^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                            ^^
-11>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-12>                                                                                                                                                              ^^
-13>                                                                                                                                                                ^^^^^^^^^^^^^^^
-14>                                                                                                                                                                               ^^
-15>                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                          ^^
-17>                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                             ^^
-19>                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                            ^^
-21>                                                                                                                                                                                                                                                                                              ^
-22>                                                                                                                                                                                                                                                                                               ^^^
-23>                                                                                                                                                                                                                                                                                                  ^
-24>                                                                                                                                                                                                                                                                                                   ^^
-25>                                                                                                                                                                                                                                                                                                     ^
-26>                                                                                                                                                                                                                                                                                                      ^^^
-27>                                                                                                                                                                                                                                                                                                         ^
-28>                                                                                                                                                                                                                                                                                                          ^^
-29>                                                                                                                                                                                                                                                                                                            ^
-30>                                                                                                                                                                                                                                                                                                             ^^
-31>                                                                                                                                                                                                                                                                                                               ^^
-32>                                                                                                                                                                                                                                                                                                                 ^
+5 >     ^^^^
+6 >         ^^^^^^^^^^^^^^^^^^^^
+7 >                             ^^
+8 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                    ^^
+10>                                                                      ^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                            ^^
+12>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                              ^^
+14>                                                                                                                                                                ^^^^^^^^^^^^^^^
+15>                                                                                                                                                                               ^^
+16>                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+17>                                                                                                                                                                                                                          ^^
+18>                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
+19>                                                                                                                                                                                                                                             ^^
+20>                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+21>                                                                                                                                                                                                                                                                                            ^^
+22>                                                                                                                                                                                                                                                                                              ^
+23>                                                                                                                                                                                                                                                                                               ^^^
+24>                                                                                                                                                                                                                                                                                                  ^
+25>                                                                                                                                                                                                                                                                                                   ^^
+26>                                                                                                                                                                                                                                                                                                     ^
+27>                                                                                                                                                                                                                                                                                                      ^^^
+28>                                                                                                                                                                                                                                                                                                         ^
+29>                                                                                                                                                                                                                                                                                                          ^^
+30>                                                                                                                                                                                                                                                                                                            ^
+31>                                                                                                                                                                                                                                                                                                             ^^
+32>                                                                                                                                                                                                                                                                                                               ^^
+33>                                                                                                                                                                                                                                                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (let {
   >        
-5 >     name: nameA = "noName"
-6 >                             
-7 >                               name: nameA = "noName"
-8 >                                                                    ,
+5 >     
+6 >         name: nameA = "noName"
+7 >                             
+8 >                               name: nameA = "noName"
+9 >                                                                    ,
   >                                                                        
-9 >                                                                      skills: {
+10>                                                                      skills: {
   >                                                                              primary: primaryA = "primary",
   >                                                                              secondary: secondaryA = "secondary"
   >                                                                          } = { primary: "none", secondary: "none" }
-10>                                                                                            
-11>                                                                                              skills: {
+11>                                                                                            
+12>                                                                                              skills: {
   >                                                                                                      primary: primaryA = "primary",
   >                                                                                                      secondary: secondaryA = "secondary"
   >                                                                                                  } = { primary: "none", secondary: "none" }
-12>                                                                                                                                                              
-13>                                                                                                                                                                primary: primaryA = "primary"
-14>                                                                                                                                                                               
-15>                                                                                                                                                                                 primary: primaryA = "primary"
-16>                                                                                                                                                                                                                          ,
+13>                                                                                                                                                              
+14>                                                                                                                                                                primary: primaryA = "primary"
+15>                                                                                                                                                                               
+16>                                                                                                                                                                                 primary: primaryA = "primary"
+17>                                                                                                                                                                                                                          ,
   >                                                                                                                                                                                                                                  
-17>                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
-18>                                                                                                                                                                                                                                             
-19>                                                                                                                                                                                                                                               secondary: secondaryA = "secondary"
-20>                                                                                                                                                                                                                                                                                            
+18>                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
+19>                                                                                                                                                                                                                                             
+20>                                                                                                                                                                                                                                               secondary: secondaryA = "secondary"
+21>                                                                                                                                                                                                                                                                                            
   >                                                                                                                                                                                                                                                                                                } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                                                                            } = multiRobot, 
-21>                                                                                                                                                                                                                                                                                              i
-22>                                                                                                                                                                                                                                                                                                = 
-23>                                                                                                                                                                                                                                                                                                  0
-24>                                                                                                                                                                                                                                                                                                   ; 
-25>                                                                                                                                                                                                                                                                                                     i
-26>                                                                                                                                                                                                                                                                                                       < 
-27>                                                                                                                                                                                                                                                                                                         1
-28>                                                                                                                                                                                                                                                                                                          ; 
-29>                                                                                                                                                                                                                                                                                                            i
-30>                                                                                                                                                                                                                                                                                                             ++
-31>                                                                                                                                                                                                                                                                                                               ) 
-32>                                                                                                                                                                                                                                                                                                                 {
+22>                                                                                                                                                                                                                                                                                              i
+23>                                                                                                                                                                                                                                                                                                = 
+24>                                                                                                                                                                                                                                                                                                  0
+25>                                                                                                                                                                                                                                                                                                   ; 
+26>                                                                                                                                                                                                                                                                                                     i
+27>                                                                                                                                                                                                                                                                                                       < 
+28>                                                                                                                                                                                                                                                                                                         1
+29>                                                                                                                                                                                                                                                                                                          ; 
+30>                                                                                                                                                                                                                                                                                                            i
+31>                                                                                                                                                                                                                                                                                                             ++
+32>                                                                                                                                                                                                                                                                                                               ) 
+33>                                                                                                                                                                                                                                                                                                                 {
 1->Emitted(36, 1) Source(70, 1) + SourceIndex(0)
 2 >Emitted(36, 4) Source(70, 4) + SourceIndex(0)
 3 >Emitted(36, 5) Source(70, 5) + SourceIndex(0)
 4 >Emitted(36, 6) Source(71, 5) + SourceIndex(0)
-5 >Emitted(36, 30) Source(71, 27) + SourceIndex(0)
-6 >Emitted(36, 32) Source(71, 5) + SourceIndex(0)
-7 >Emitted(36, 69) Source(71, 27) + SourceIndex(0)
-8 >Emitted(36, 71) Source(72, 5) + SourceIndex(0)
-9 >Emitted(36, 93) Source(75, 47) + SourceIndex(0)
-10>Emitted(36, 95) Source(72, 5) + SourceIndex(0)
-11>Emitted(36, 159) Source(75, 47) + SourceIndex(0)
-12>Emitted(36, 161) Source(73, 9) + SourceIndex(0)
-13>Emitted(36, 176) Source(73, 38) + SourceIndex(0)
-14>Emitted(36, 178) Source(73, 9) + SourceIndex(0)
-15>Emitted(36, 219) Source(73, 38) + SourceIndex(0)
-16>Emitted(36, 221) Source(74, 9) + SourceIndex(0)
-17>Emitted(36, 238) Source(74, 44) + SourceIndex(0)
-18>Emitted(36, 240) Source(74, 9) + SourceIndex(0)
-19>Emitted(36, 285) Source(74, 44) + SourceIndex(0)
-20>Emitted(36, 287) Source(76, 17) + SourceIndex(0)
-21>Emitted(36, 288) Source(76, 18) + SourceIndex(0)
-22>Emitted(36, 291) Source(76, 21) + SourceIndex(0)
-23>Emitted(36, 292) Source(76, 22) + SourceIndex(0)
-24>Emitted(36, 294) Source(76, 24) + SourceIndex(0)
-25>Emitted(36, 295) Source(76, 25) + SourceIndex(0)
-26>Emitted(36, 298) Source(76, 28) + SourceIndex(0)
-27>Emitted(36, 299) Source(76, 29) + SourceIndex(0)
-28>Emitted(36, 301) Source(76, 31) + SourceIndex(0)
-29>Emitted(36, 302) Source(76, 32) + SourceIndex(0)
-30>Emitted(36, 304) Source(76, 34) + SourceIndex(0)
-31>Emitted(36, 306) Source(76, 36) + SourceIndex(0)
-32>Emitted(36, 307) Source(76, 37) + SourceIndex(0)
+5 >Emitted(36, 10) Source(71, 5) + SourceIndex(0)
+6 >Emitted(36, 30) Source(71, 27) + SourceIndex(0)
+7 >Emitted(36, 32) Source(71, 5) + SourceIndex(0)
+8 >Emitted(36, 69) Source(71, 27) + SourceIndex(0)
+9 >Emitted(36, 71) Source(72, 5) + SourceIndex(0)
+10>Emitted(36, 93) Source(75, 47) + SourceIndex(0)
+11>Emitted(36, 95) Source(72, 5) + SourceIndex(0)
+12>Emitted(36, 159) Source(75, 47) + SourceIndex(0)
+13>Emitted(36, 161) Source(73, 9) + SourceIndex(0)
+14>Emitted(36, 176) Source(73, 38) + SourceIndex(0)
+15>Emitted(36, 178) Source(73, 9) + SourceIndex(0)
+16>Emitted(36, 219) Source(73, 38) + SourceIndex(0)
+17>Emitted(36, 221) Source(74, 9) + SourceIndex(0)
+18>Emitted(36, 238) Source(74, 44) + SourceIndex(0)
+19>Emitted(36, 240) Source(74, 9) + SourceIndex(0)
+20>Emitted(36, 285) Source(74, 44) + SourceIndex(0)
+21>Emitted(36, 287) Source(76, 17) + SourceIndex(0)
+22>Emitted(36, 288) Source(76, 18) + SourceIndex(0)
+23>Emitted(36, 291) Source(76, 21) + SourceIndex(0)
+24>Emitted(36, 292) Source(76, 22) + SourceIndex(0)
+25>Emitted(36, 294) Source(76, 24) + SourceIndex(0)
+26>Emitted(36, 295) Source(76, 25) + SourceIndex(0)
+27>Emitted(36, 298) Source(76, 28) + SourceIndex(0)
+28>Emitted(36, 299) Source(76, 29) + SourceIndex(0)
+29>Emitted(36, 301) Source(76, 31) + SourceIndex(0)
+30>Emitted(36, 302) Source(76, 32) + SourceIndex(0)
+31>Emitted(36, 304) Source(76, 34) + SourceIndex(0)
+32>Emitted(36, 306) Source(76, 36) + SourceIndex(0)
+33>Emitted(36, 307) Source(76, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1454,9 +1478,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {
+6 >         {
   >             name: nameA = "noName",
   >             skills: {
   >                 primary: primaryA = "primary",
@@ -1505,8 +1529,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 1->Emitted(39, 1) Source(79, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(79, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(79, 5) + SourceIndex(0)
-4 >Emitted(39, 6) Source(79, 6) + SourceIndex(0)
-5 >Emitted(39, 10) Source(79, 6) + SourceIndex(0)
+4 >Emitted(39, 6) Source(79, 10) + SourceIndex(0)
+5 >Emitted(39, 10) Source(79, 10) + SourceIndex(0)
 6 >Emitted(39, 30) Source(85, 20) + SourceIndex(0)
 7 >Emitted(39, 32) Source(80, 5) + SourceIndex(0)
 8 >Emitted(39, 44) Source(80, 27) + SourceIndex(0)
@@ -1615,9 +1639,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
   >
 2 >for
 3 >    
-4 >    (
+4 >    (let 
 5 >     
-6 >         let {
+6 >         {
   >             name: nameA = "noName",
   >             skills: {
   >                 primary: primaryA = "primary",
@@ -1667,8 +1691,8 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.
 1->Emitted(42, 1) Source(88, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(88, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(88, 5) + SourceIndex(0)
-4 >Emitted(42, 6) Source(88, 6) + SourceIndex(0)
-5 >Emitted(42, 10) Source(88, 6) + SourceIndex(0)
+4 >Emitted(42, 6) Source(88, 10) + SourceIndex(0)
+5 >Emitted(42, 10) Source(88, 10) + SourceIndex(0)
 6 >Emitted(42, 89) Source(94, 90) + SourceIndex(0)
 7 >Emitted(42, 91) Source(89, 5) + SourceIndex(0)
 8 >Emitted(42, 105) Source(89, 27) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
index a360326c1ca..9f7a70699bd 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
@@ -185,79 +185,79 @@ function getMultiRobot() {
 }
 var nameA, primaryA, secondaryA, i, skillA;
 var name, primary, secondary, skill;
-for ((_a = robot.name, nameA = _a === void 0 ? "noName" : _a, robot), i = 0; i < 1; i++) {
+for (_a = robot.name, nameA = _a === void 0 ? "noName" : _a, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_b = getRobot(), _c = _b.name, nameA = _c === void 0 ? "noName" : _c, _b), i = 0; i < 1; i++) {
+for (_b = getRobot(), _c = _b.name, nameA = _c === void 0 ? "noName" : _c, _b, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_d = { name: "trimmer", skill: "trimming" }, _e = _d.name, nameA = _e === void 0 ? "noName" : _e, _d), i = 0; i < 1; i++) {
+for (_d = { name: "trimmer", skill: "trimming" }, _e = _d.name, nameA = _e === void 0 ? "noName" : _e, _d, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot), i = 0; i < 1; i++) {
+for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k), i = 0; i < 1; i++) {
+for (_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q),
+for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_v = robot.name, name = _v === void 0 ? "noName" : _v, robot), i = 0; i < 1; i++) {
+for (_v = robot.name, name = _v === void 0 ? "noName" : _v, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_w = getRobot(), _x = _w.name, name = _x === void 0 ? "noName" : _x, _w), i = 0; i < 1; i++) {
+for (_w = getRobot(), _x = _w.name, name = _x === void 0 ? "noName" : _x, _w, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_y = { name: "trimmer", skill: "trimming" }, _z = _y.name, name = _z === void 0 ? "noName" : _z, _y), i = 0; i < 1; i++) {
+for (_y = { name: "trimmer", skill: "trimming" }, _z = _y.name, name = _z === void 0 ? "noName" : _z, _y, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot), i = 0; i < 1; i++) {
+for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4), i = 0; i < 1; i++) {
+for (_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9),
+for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_14 = robot.name, nameA = _14 === void 0 ? "noName" : _14, _15 = robot.skill, skillA = _15 === void 0 ? "skill" : _15, robot), i = 0; i < 1; i++) {
+for (_14 = robot.name, nameA = _14 === void 0 ? "noName" : _14, _15 = robot.skill, skillA = _15 === void 0 ? "skill" : _15, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_16 = getRobot(), _17 = _16.name, nameA = _17 === void 0 ? "noName" : _17, _18 = _16.skill, skillA = _18 === void 0 ? "skill" : _18, _16), i = 0; i < 1; i++) {
+for (_16 = getRobot(), _17 = _16.name, nameA = _17 === void 0 ? "noName" : _17, _18 = _16.skill, skillA = _18 === void 0 ? "skill" : _18, _16, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_19 = { name: "trimmer", skill: "trimming" }, _20 = _19.name, nameA = _20 === void 0 ? "noName" : _20, _21 = _19.skill, skillA = _21 === void 0 ? "skill" : _21, _19), i = 0; i < 1; i++) {
+for (_19 = { name: "trimmer", skill: "trimming" }, _20 = _19.name, nameA = _20 === void 0 ? "noName" : _20, _21 = _19.skill, skillA = _21 === void 0 ? "skill" : _21, _19, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot), i = 0; i < 1; i++) {
+for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27), i = 0; i < 1; i++) {
+for (_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33),
+for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_39 = robot.name, name = _39 === void 0 ? "noName" : _39, _40 = robot.skill, skill = _40 === void 0 ? "skill" : _40, robot), i = 0; i < 1; i++) {
+for (_39 = robot.name, name = _39 === void 0 ? "noName" : _39, _40 = robot.skill, skill = _40 === void 0 ? "skill" : _40, robot, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_41 = getRobot(), _42 = _41.name, name = _42 === void 0 ? "noName" : _42, _43 = _41.skill, skill = _43 === void 0 ? "skill" : _43, _41), i = 0; i < 1; i++) {
+for (_41 = getRobot(), _42 = _41.name, name = _42 === void 0 ? "noName" : _42, _43 = _41.skill, skill = _43 === void 0 ? "skill" : _43, _41, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_44 = { name: "trimmer", skill: "trimming" }, _45 = _44.name, name = _45 === void 0 ? "noName" : _45, _46 = _44.skill, skill = _46 === void 0 ? "skill" : _46, _44), i = 0; i < 1; i++) {
+for (_44 = { name: "trimmer", skill: "trimming" }, _45 = _44.name, name = _45 === void 0 ? "noName" : _45, _46 = _44.skill, skill = _46 === void 0 ? "skill" : _46, _44, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for ((_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot), i = 0; i < 1; i++) {
+for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52), i = 0; i < 1; i++) {
+for (_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for ((_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58),
+for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
index 448921b9cdc..dd248e89944 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAC,CAAC,eAAsB,EAAtB,qCAAsB,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAsC,EAArC,YAAsB,EAAtB,qCAAsB,KAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,2CAAyE,EAAxE,YAAsB,EAAtB,qCAAsB,KAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CACD,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEvC,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,KAExB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,8EAKoF,EAJrF,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,KAE8C;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAC,CAAE,eAAe,EAAf,oCAAe,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,eAAgC,EAA9B,YAAe,EAAf,oCAAe,KAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,2CAAmE,EAAjE,YAAe,EAAf,oCAAe,KAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CACD,sBAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,EAE3B,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,KAEZ,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,8EAKoF,EAJrF,eAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,KAE0D;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAC,CAAC,gBAAsB,EAAtB,uCAAsB,EAAE,iBAAuB,EAAvB,uCAAuB,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,gBAA+D,EAA9D,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,MAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,4CAAkG,EAAjG,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,MAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CACD,qBAAsB,EAAtB,uCAAsB,EACtB,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAEvC,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,qBAMc,EALf,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,MAExB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+EAMoF,EALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,MAE8C;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAC,CAAE,gBAAe,EAAf,sCAAe,EAAE,iBAAe,EAAf,sCAAe,EAAK,KAAK,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,gBAAiD,EAA/C,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,MAAe,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,4CAAoF,EAAlF,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,MAAkD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,CACD,qBAAe,EAAf,sCAAe,EACf,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,EAE3B,UAAU,CAAA,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,qBAMc,EALf,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,MAEZ,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,CAAA,+EAMoF,EALrF,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,MAE0D;IACrF,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAE,eAAsB,EAAtB,qCAAsB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsC,EAArC,YAAsB,EAAtB,qCAAsB,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAyE,EAAxE,YAAsB,EAAtB,qCAAsB,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEvC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,MAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,EAJrF,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,eAAe,EAAf,oCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAgC,EAA9B,YAAe,EAAf,oCAAe,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAmE,EAAjE,YAAe,EAAf,oCAAe,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,EAE3B,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,MAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,EAJrF,eAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAE,gBAAsB,EAAtB,uCAAsB,EAAE,iBAAuB,EAAvB,uCAAuB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAA+D,EAA9D,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAkG,EAAjG,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAsB,EAAtB,uCAAsB,EACtB,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAEvC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,EALf,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,OAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,EALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,gBAAe,EAAf,sCAAe,EAAE,iBAAe,EAAf,sCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAAiD,EAA/C,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAoF,EAAlF,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAe,EAAf,sCAAe,EACf,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,EAE3B,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,EALf,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,OAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,EALrF,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
index 3e4d7a87855..97271e8f3d0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
@@ -259,7 +259,7 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 8 >                            ^^
 9 >                              ^^^^^
 10>                                   ^
-11>                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+11>                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >let 
@@ -282,81 +282,75 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 9 >Emitted(10, 36) Source(27, 68) + SourceIndex(0)
 10>Emitted(10, 37) Source(27, 69) + SourceIndex(0)
 ---
->>>for ((_a = robot.name, nameA = _a === void 0 ? "noName" : _a, robot), i = 0; i < 1; i++) {
+>>>for (_a = robot.name, nameA = _a === void 0 ? "noName" : _a, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                            ^^
-10>                                                              ^^^^^
-11>                                                                   ^
-12>                                                                    ^^
-13>                                                                      ^
-14>                                                                       ^^^
-15>                                                                          ^
-16>                                                                           ^^
-17>                                                                             ^
-18>                                                                              ^^^
-19>                                                                                 ^
-20>                                                                                  ^^
-21>                                                                                    ^
-22>                                                                                     ^^
-23>                                                                                       ^^
-24>                                                                                         ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                           ^^
+9 >                                                             ^^^^^
+10>                                                                  ^^
+11>                                                                    ^
+12>                                                                     ^^^
+13>                                                                        ^
+14>                                                                         ^^
+15>                                                                           ^
+16>                                                                            ^^^
+17>                                                                               ^
+18>                                                                                ^^
+19>                                                                                  ^
+20>                                                                                   ^^
+21>                                                                                     ^^
+22>                                                                                       ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     {
-6 >      name: nameA = "noName"
-7 >                     
-8 >                       name: nameA = "noName"
-9 >                                                             } = 
-10>                                                              robot
-11>                                                                   
-12>                                                                    , 
-13>                                                                      i
-14>                                                                        = 
-15>                                                                          0
-16>                                                                           ; 
-17>                                                                             i
-18>                                                                               < 
-19>                                                                                 1
-20>                                                                                  ; 
-21>                                                                                    i
-22>                                                                                     ++
-23>                                                                                       ) 
-24>                                                                                         {
+4 >    ({
+5 >     name: nameA = "noName"
+6 >                    
+7 >                      name: nameA = "noName"
+8 >                                                            } = 
+9 >                                                             robot
+10>                                                                  , 
+11>                                                                    i
+12>                                                                      = 
+13>                                                                        0
+14>                                                                         ; 
+15>                                                                           i
+16>                                                                             < 
+17>                                                                               1
+18>                                                                                ; 
+19>                                                                                  i
+20>                                                                                   ++
+21>                                                                                     ) 
+22>                                                                                       {
 1->Emitted(11, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(11, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(11, 5) Source(29, 5) + SourceIndex(0)
-4 >Emitted(11, 6) Source(29, 6) + SourceIndex(0)
-5 >Emitted(11, 7) Source(29, 7) + SourceIndex(0)
-6 >Emitted(11, 22) Source(29, 29) + SourceIndex(0)
-7 >Emitted(11, 24) Source(29, 7) + SourceIndex(0)
-8 >Emitted(11, 61) Source(29, 29) + SourceIndex(0)
-9 >Emitted(11, 63) Source(29, 34) + SourceIndex(0)
-10>Emitted(11, 68) Source(29, 39) + SourceIndex(0)
-11>Emitted(11, 69) Source(29, 39) + SourceIndex(0)
-12>Emitted(11, 71) Source(29, 41) + SourceIndex(0)
-13>Emitted(11, 72) Source(29, 42) + SourceIndex(0)
-14>Emitted(11, 75) Source(29, 45) + SourceIndex(0)
-15>Emitted(11, 76) Source(29, 46) + SourceIndex(0)
-16>Emitted(11, 78) Source(29, 48) + SourceIndex(0)
-17>Emitted(11, 79) Source(29, 49) + SourceIndex(0)
-18>Emitted(11, 82) Source(29, 52) + SourceIndex(0)
-19>Emitted(11, 83) Source(29, 53) + SourceIndex(0)
-20>Emitted(11, 85) Source(29, 55) + SourceIndex(0)
-21>Emitted(11, 86) Source(29, 56) + SourceIndex(0)
-22>Emitted(11, 88) Source(29, 58) + SourceIndex(0)
-23>Emitted(11, 90) Source(29, 60) + SourceIndex(0)
-24>Emitted(11, 91) Source(29, 61) + SourceIndex(0)
+4 >Emitted(11, 6) Source(29, 7) + SourceIndex(0)
+5 >Emitted(11, 21) Source(29, 29) + SourceIndex(0)
+6 >Emitted(11, 23) Source(29, 7) + SourceIndex(0)
+7 >Emitted(11, 60) Source(29, 29) + SourceIndex(0)
+8 >Emitted(11, 62) Source(29, 34) + SourceIndex(0)
+9 >Emitted(11, 67) Source(29, 39) + SourceIndex(0)
+10>Emitted(11, 69) Source(29, 41) + SourceIndex(0)
+11>Emitted(11, 70) Source(29, 42) + SourceIndex(0)
+12>Emitted(11, 73) Source(29, 45) + SourceIndex(0)
+13>Emitted(11, 74) Source(29, 46) + SourceIndex(0)
+14>Emitted(11, 76) Source(29, 48) + SourceIndex(0)
+15>Emitted(11, 77) Source(29, 49) + SourceIndex(0)
+16>Emitted(11, 80) Source(29, 52) + SourceIndex(0)
+17>Emitted(11, 81) Source(29, 53) + SourceIndex(0)
+18>Emitted(11, 83) Source(29, 55) + SourceIndex(0)
+19>Emitted(11, 84) Source(29, 56) + SourceIndex(0)
+20>Emitted(11, 86) Source(29, 58) + SourceIndex(0)
+21>Emitted(11, 88) Source(29, 60) + SourceIndex(0)
+22>Emitted(11, 89) Source(29, 61) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -388,87 +382,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(13, 1) Source(31, 1) + SourceIndex(0)
 2 >Emitted(13, 2) Source(31, 2) + SourceIndex(0)
 ---
->>>for ((_b = getRobot(), _c = _b.name, nameA = _c === void 0 ? "noName" : _c, _b), i = 0; i < 1; i++) {
+>>>for (_b = getRobot(), _c = _b.name, nameA = _c === void 0 ? "noName" : _c, _b, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^
-9 >                                   ^^
-10>                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                          ^^^^^
-12>                                                                               ^^
-13>                                                                                 ^
-14>                                                                                  ^^^
-15>                                                                                     ^
-16>                                                                                      ^^
-17>                                                                                        ^
-18>                                                                                         ^^^
-19>                                                                                            ^
-20>                                                                                             ^^
-21>                                                                                               ^
-22>                                                                                                ^^
-23>                                                                                                  ^^
-24>                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^
+8 >                                  ^^
+9 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                         ^^^^^^
+11>                                                                               ^
+12>                                                                                ^^^
+13>                                                                                   ^
+14>                                                                                    ^^
+15>                                                                                      ^
+16>                                                                                       ^^^
+17>                                                                                          ^
+18>                                                                                           ^^
+19>                                                                                             ^
+20>                                                                                              ^^
+21>                                                                                                ^^
+22>                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {name: nameA = "noName" } = getRobot()
-7 >                     
-8 >                       name: nameA = "noName"
-9 >                                   
-10>                                     name: nameA = "noName"
-11>                                                                           } = getRobot()
-12>                                                                               , 
-13>                                                                                 i
-14>                                                                                   = 
-15>                                                                                     0
-16>                                                                                      ; 
-17>                                                                                        i
-18>                                                                                          < 
-19>                                                                                            1
-20>                                                                                             ; 
-21>                                                                                               i
-22>                                                                                                ++
-23>                                                                                                  ) 
-24>                                                                                                    {
+5 >     {name: nameA = "noName" } = getRobot()
+6 >                    
+7 >                      name: nameA = "noName"
+8 >                                  
+9 >                                    name: nameA = "noName"
+10>                                                                          } = getRobot(), 
+11>                                                                               i
+12>                                                                                 = 
+13>                                                                                   0
+14>                                                                                    ; 
+15>                                                                                      i
+16>                                                                                        < 
+17>                                                                                          1
+18>                                                                                           ; 
+19>                                                                                             i
+20>                                                                                              ++
+21>                                                                                                ) 
+22>                                                                                                  {
 1->Emitted(14, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(14, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(14, 5) Source(32, 5) + SourceIndex(0)
 4 >Emitted(14, 6) Source(32, 6) + SourceIndex(0)
-5 >Emitted(14, 7) Source(32, 6) + SourceIndex(0)
-6 >Emitted(14, 22) Source(32, 44) + SourceIndex(0)
-7 >Emitted(14, 24) Source(32, 7) + SourceIndex(0)
-8 >Emitted(14, 36) Source(32, 29) + SourceIndex(0)
-9 >Emitted(14, 38) Source(32, 7) + SourceIndex(0)
-10>Emitted(14, 75) Source(32, 29) + SourceIndex(0)
-11>Emitted(14, 80) Source(32, 44) + SourceIndex(0)
-12>Emitted(14, 82) Source(32, 46) + SourceIndex(0)
-13>Emitted(14, 83) Source(32, 47) + SourceIndex(0)
-14>Emitted(14, 86) Source(32, 50) + SourceIndex(0)
-15>Emitted(14, 87) Source(32, 51) + SourceIndex(0)
-16>Emitted(14, 89) Source(32, 53) + SourceIndex(0)
-17>Emitted(14, 90) Source(32, 54) + SourceIndex(0)
-18>Emitted(14, 93) Source(32, 57) + SourceIndex(0)
-19>Emitted(14, 94) Source(32, 58) + SourceIndex(0)
-20>Emitted(14, 96) Source(32, 60) + SourceIndex(0)
-21>Emitted(14, 97) Source(32, 61) + SourceIndex(0)
-22>Emitted(14, 99) Source(32, 63) + SourceIndex(0)
-23>Emitted(14, 101) Source(32, 65) + SourceIndex(0)
-24>Emitted(14, 102) Source(32, 66) + SourceIndex(0)
+5 >Emitted(14, 21) Source(32, 44) + SourceIndex(0)
+6 >Emitted(14, 23) Source(32, 7) + SourceIndex(0)
+7 >Emitted(14, 35) Source(32, 29) + SourceIndex(0)
+8 >Emitted(14, 37) Source(32, 7) + SourceIndex(0)
+9 >Emitted(14, 74) Source(32, 29) + SourceIndex(0)
+10>Emitted(14, 80) Source(32, 46) + SourceIndex(0)
+11>Emitted(14, 81) Source(32, 47) + SourceIndex(0)
+12>Emitted(14, 84) Source(32, 50) + SourceIndex(0)
+13>Emitted(14, 85) Source(32, 51) + SourceIndex(0)
+14>Emitted(14, 87) Source(32, 53) + SourceIndex(0)
+15>Emitted(14, 88) Source(32, 54) + SourceIndex(0)
+16>Emitted(14, 91) Source(32, 57) + SourceIndex(0)
+17>Emitted(14, 92) Source(32, 58) + SourceIndex(0)
+18>Emitted(14, 94) Source(32, 60) + SourceIndex(0)
+19>Emitted(14, 95) Source(32, 61) + SourceIndex(0)
+20>Emitted(14, 97) Source(32, 63) + SourceIndex(0)
+21>Emitted(14, 99) Source(32, 65) + SourceIndex(0)
+22>Emitted(14, 100) Source(32, 66) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -500,87 +488,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(16, 1) Source(34, 1) + SourceIndex(0)
 2 >Emitted(16, 2) Source(34, 2) + SourceIndex(0)
 ---
->>>for ((_d = { name: "trimmer", skill: "trimming" }, _e = _d.name, nameA = _e === void 0 ? "noName" : _e, _d), i = 0; i < 1; i++) {
+>>>for (_d = { name: "trimmer", skill: "trimming" }, _e = _d.name, nameA = _e === void 0 ? "noName" : _e, _d, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^
-9 >                                                               ^^
-10>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                      ^^^^^
-12>                                                                                                           ^^
-13>                                                                                                             ^
-14>                                                                                                              ^^^
-15>                                                                                                                 ^
-16>                                                                                                                  ^^
-17>                                                                                                                    ^
-18>                                                                                                                     ^^^
-19>                                                                                                                        ^
-20>                                                                                                                         ^^
-21>                                                                                                                           ^
-22>                                                                                                                            ^^
-23>                                                                                                                              ^^
-24>                                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^
+8 >                                                              ^^
+9 >                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                     ^^^^^^
+11>                                                                                                           ^
+12>                                                                                                            ^^^
+13>                                                                                                               ^
+14>                                                                                                                ^^
+15>                                                                                                                  ^
+16>                                                                                                                   ^^^
+17>                                                                                                                      ^
+18>                                                                                                                       ^^
+19>                                                                                                                         ^
+20>                                                                                                                          ^^
+21>                                                                                                                            ^^
+22>                                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                 
-8 >                                                   name: nameA = "noName"
-9 >                                                               
-10>                                                                 name: nameA = "noName"
-11>                                                                                                       } = <Robot>{ name: "trimmer", skill: "trimming" }
-12>                                                                                                           , 
-13>                                                                                                             i
-14>                                                                                                               = 
-15>                                                                                                                 0
-16>                                                                                                                  ; 
-17>                                                                                                                    i
-18>                                                                                                                      < 
-19>                                                                                                                        1
-20>                                                                                                                         ; 
-21>                                                                                                                           i
-22>                                                                                                                            ++
-23>                                                                                                                              ) 
-24>                                                                                                                                {
+5 >     {name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                
+7 >                                                  name: nameA = "noName"
+8 >                                                              
+9 >                                                                name: nameA = "noName"
+10>                                                                                                      } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+11>                                                                                                           i
+12>                                                                                                             = 
+13>                                                                                                               0
+14>                                                                                                                ; 
+15>                                                                                                                  i
+16>                                                                                                                    < 
+17>                                                                                                                      1
+18>                                                                                                                       ; 
+19>                                                                                                                         i
+20>                                                                                                                          ++
+21>                                                                                                                            ) 
+22>                                                                                                                              {
 1->Emitted(17, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(17, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(17, 5) Source(35, 5) + SourceIndex(0)
 4 >Emitted(17, 6) Source(35, 6) + SourceIndex(0)
-5 >Emitted(17, 7) Source(35, 6) + SourceIndex(0)
-6 >Emitted(17, 50) Source(35, 79) + SourceIndex(0)
-7 >Emitted(17, 52) Source(35, 7) + SourceIndex(0)
-8 >Emitted(17, 64) Source(35, 29) + SourceIndex(0)
-9 >Emitted(17, 66) Source(35, 7) + SourceIndex(0)
-10>Emitted(17, 103) Source(35, 29) + SourceIndex(0)
-11>Emitted(17, 108) Source(35, 79) + SourceIndex(0)
-12>Emitted(17, 110) Source(35, 81) + SourceIndex(0)
-13>Emitted(17, 111) Source(35, 82) + SourceIndex(0)
-14>Emitted(17, 114) Source(35, 85) + SourceIndex(0)
-15>Emitted(17, 115) Source(35, 86) + SourceIndex(0)
-16>Emitted(17, 117) Source(35, 88) + SourceIndex(0)
-17>Emitted(17, 118) Source(35, 89) + SourceIndex(0)
-18>Emitted(17, 121) Source(35, 92) + SourceIndex(0)
-19>Emitted(17, 122) Source(35, 93) + SourceIndex(0)
-20>Emitted(17, 124) Source(35, 95) + SourceIndex(0)
-21>Emitted(17, 125) Source(35, 96) + SourceIndex(0)
-22>Emitted(17, 127) Source(35, 98) + SourceIndex(0)
-23>Emitted(17, 129) Source(35, 100) + SourceIndex(0)
-24>Emitted(17, 130) Source(35, 101) + SourceIndex(0)
+5 >Emitted(17, 49) Source(35, 79) + SourceIndex(0)
+6 >Emitted(17, 51) Source(35, 7) + SourceIndex(0)
+7 >Emitted(17, 63) Source(35, 29) + SourceIndex(0)
+8 >Emitted(17, 65) Source(35, 7) + SourceIndex(0)
+9 >Emitted(17, 102) Source(35, 29) + SourceIndex(0)
+10>Emitted(17, 108) Source(35, 81) + SourceIndex(0)
+11>Emitted(17, 109) Source(35, 82) + SourceIndex(0)
+12>Emitted(17, 112) Source(35, 85) + SourceIndex(0)
+13>Emitted(17, 113) Source(35, 86) + SourceIndex(0)
+14>Emitted(17, 115) Source(35, 88) + SourceIndex(0)
+15>Emitted(17, 116) Source(35, 89) + SourceIndex(0)
+16>Emitted(17, 119) Source(35, 92) + SourceIndex(0)
+17>Emitted(17, 120) Source(35, 93) + SourceIndex(0)
+18>Emitted(17, 122) Source(35, 95) + SourceIndex(0)
+19>Emitted(17, 123) Source(35, 96) + SourceIndex(0)
+20>Emitted(17, 125) Source(35, 98) + SourceIndex(0)
+21>Emitted(17, 127) Source(35, 100) + SourceIndex(0)
+22>Emitted(17, 128) Source(35, 101) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -612,121 +594,115 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(19, 1) Source(37, 1) + SourceIndex(0)
 2 >Emitted(19, 2) Source(37, 2) + SourceIndex(0)
 ---
->>>for ((_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot), i = 0; i < 1; i++) {
+>>>for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^
-7 >                            ^^
-8 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                              ^^
-10>                                                                                                ^^^^^^^^^^^^^^^
-11>                                                                                                               ^^
-12>                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                          ^^
-14>                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                             ^^
-16>                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                            ^^
-18>                                                                                                                                                                                                                              ^^^^^^^^^^
-19>                                                                                                                                                                                                                                        ^
-20>                                                                                                                                                                                                                                         ^^
-21>                                                                                                                                                                                                                                           ^
-22>                                                                                                                                                                                                                                            ^^^
-23>                                                                                                                                                                                                                                               ^
-24>                                                                                                                                                                                                                                                ^^
-25>                                                                                                                                                                                                                                                  ^
-26>                                                                                                                                                                                                                                                   ^^^
-27>                                                                                                                                                                                                                                                      ^
-28>                                                                                                                                                                                                                                                       ^^
-29>                                                                                                                                                                                                                                                         ^
-30>                                                                                                                                                                                                                                                          ^^
-31>                                                                                                                                                                                                                                                            ^^
-32>                                                                                                                                                                                                                                                              ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^
+6 >                           ^^
+7 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                                             ^^
+9 >                                                                                               ^^^^^^^^^^^^^^^
+10>                                                                                                              ^^
+11>                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                         ^^
+13>                                                                                                                                                           ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                            ^^
+15>                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                           ^^
+17>                                                                                                                                                                                                                             ^^^^^^^^^^
+18>                                                                                                                                                                                                                                       ^^
+19>                                                                                                                                                                                                                                         ^
+20>                                                                                                                                                                                                                                          ^^^
+21>                                                                                                                                                                                                                                             ^
+22>                                                                                                                                                                                                                                              ^^
+23>                                                                                                                                                                                                                                                ^
+24>                                                                                                                                                                                                                                                 ^^^
+25>                                                                                                                                                                                                                                                    ^
+26>                                                                                                                                                                                                                                                     ^^
+27>                                                                                                                                                                                                                                                       ^
+28>                                                                                                                                                                                                                                                        ^^
+29>                                                                                                                                                                                                                                                          ^^
+30>                                                                                                                                                                                                                                                            ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     {
-  >         
-6 >      skills: {
-  >              primary: primaryA = "primary",
-  >              secondary: secondaryA = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-7 >                            
-8 >                              skills: {
-  >                                      primary: primaryA = "primary",
-  >                                      secondary: secondaryA = "secondary"
-  >                                  } = { primary: "none", secondary: "none" }
-9 >                                                                                              
-10>                                                                                                primary: primaryA = "primary"
-11>                                                                                                               
-12>                                                                                                                 primary: primaryA = "primary"
-13>                                                                                                                                                          ,
-  >                                                                                                                                                                  
-14>                                                                                                                                                            secondary: secondaryA = "secondary"
-15>                                                                                                                                                                             
-16>                                                                                                                                                                               secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                            
-  >                                                                                                                                                                                                                                } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                            } = 
-18>                                                                                                                                                                                                                              multiRobot
-19>                                                                                                                                                                                                                                        
-20>                                                                                                                                                                                                                                         , 
-21>                                                                                                                                                                                                                                           i
-22>                                                                                                                                                                                                                                             = 
-23>                                                                                                                                                                                                                                               0
-24>                                                                                                                                                                                                                                                ; 
-25>                                                                                                                                                                                                                                                  i
-26>                                                                                                                                                                                                                                                    < 
-27>                                                                                                                                                                                                                                                      1
-28>                                                                                                                                                                                                                                                       ; 
-29>                                                                                                                                                                                                                                                         i
-30>                                                                                                                                                                                                                                                          ++
-31>                                                                                                                                                                                                                                                            ) 
-32>                                                                                                                                                                                                                                                              {
+4 >    ({
+  >        
+5 >     skills: {
+  >             primary: primaryA = "primary",
+  >             secondary: secondaryA = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+6 >                           
+7 >                             skills: {
+  >                                     primary: primaryA = "primary",
+  >                                     secondary: secondaryA = "secondary"
+  >                                 } = { primary: "none", secondary: "none" }
+8 >                                                                                             
+9 >                                                                                               primary: primaryA = "primary"
+10>                                                                                                              
+11>                                                                                                                primary: primaryA = "primary"
+12>                                                                                                                                                         ,
+  >                                                                                                                                                                 
+13>                                                                                                                                                           secondary: secondaryA = "secondary"
+14>                                                                                                                                                                            
+15>                                                                                                                                                                              secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                                                           
+  >                                                                                                                                                                                                                               } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                           } = 
+17>                                                                                                                                                                                                                             multiRobot
+18>                                                                                                                                                                                                                                       , 
+19>                                                                                                                                                                                                                                         i
+20>                                                                                                                                                                                                                                           = 
+21>                                                                                                                                                                                                                                             0
+22>                                                                                                                                                                                                                                              ; 
+23>                                                                                                                                                                                                                                                i
+24>                                                                                                                                                                                                                                                  < 
+25>                                                                                                                                                                                                                                                    1
+26>                                                                                                                                                                                                                                                     ; 
+27>                                                                                                                                                                                                                                                       i
+28>                                                                                                                                                                                                                                                        ++
+29>                                                                                                                                                                                                                                                          ) 
+30>                                                                                                                                                                                                                                                            {
 1->Emitted(20, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(20, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(20, 5) Source(38, 5) + SourceIndex(0)
-4 >Emitted(20, 6) Source(38, 6) + SourceIndex(0)
-5 >Emitted(20, 7) Source(39, 5) + SourceIndex(0)
-6 >Emitted(20, 29) Source(42, 47) + SourceIndex(0)
-7 >Emitted(20, 31) Source(39, 5) + SourceIndex(0)
-8 >Emitted(20, 95) Source(42, 47) + SourceIndex(0)
-9 >Emitted(20, 97) Source(40, 9) + SourceIndex(0)
-10>Emitted(20, 112) Source(40, 38) + SourceIndex(0)
-11>Emitted(20, 114) Source(40, 9) + SourceIndex(0)
-12>Emitted(20, 155) Source(40, 38) + SourceIndex(0)
-13>Emitted(20, 157) Source(41, 9) + SourceIndex(0)
-14>Emitted(20, 174) Source(41, 44) + SourceIndex(0)
-15>Emitted(20, 176) Source(41, 9) + SourceIndex(0)
-16>Emitted(20, 221) Source(41, 44) + SourceIndex(0)
-17>Emitted(20, 223) Source(43, 5) + SourceIndex(0)
-18>Emitted(20, 233) Source(43, 15) + SourceIndex(0)
-19>Emitted(20, 234) Source(43, 15) + SourceIndex(0)
-20>Emitted(20, 236) Source(43, 17) + SourceIndex(0)
-21>Emitted(20, 237) Source(43, 18) + SourceIndex(0)
-22>Emitted(20, 240) Source(43, 21) + SourceIndex(0)
-23>Emitted(20, 241) Source(43, 22) + SourceIndex(0)
-24>Emitted(20, 243) Source(43, 24) + SourceIndex(0)
-25>Emitted(20, 244) Source(43, 25) + SourceIndex(0)
-26>Emitted(20, 247) Source(43, 28) + SourceIndex(0)
-27>Emitted(20, 248) Source(43, 29) + SourceIndex(0)
-28>Emitted(20, 250) Source(43, 31) + SourceIndex(0)
-29>Emitted(20, 251) Source(43, 32) + SourceIndex(0)
-30>Emitted(20, 253) Source(43, 34) + SourceIndex(0)
-31>Emitted(20, 255) Source(43, 36) + SourceIndex(0)
-32>Emitted(20, 256) Source(43, 37) + SourceIndex(0)
+4 >Emitted(20, 6) Source(39, 5) + SourceIndex(0)
+5 >Emitted(20, 28) Source(42, 47) + SourceIndex(0)
+6 >Emitted(20, 30) Source(39, 5) + SourceIndex(0)
+7 >Emitted(20, 94) Source(42, 47) + SourceIndex(0)
+8 >Emitted(20, 96) Source(40, 9) + SourceIndex(0)
+9 >Emitted(20, 111) Source(40, 38) + SourceIndex(0)
+10>Emitted(20, 113) Source(40, 9) + SourceIndex(0)
+11>Emitted(20, 154) Source(40, 38) + SourceIndex(0)
+12>Emitted(20, 156) Source(41, 9) + SourceIndex(0)
+13>Emitted(20, 173) Source(41, 44) + SourceIndex(0)
+14>Emitted(20, 175) Source(41, 9) + SourceIndex(0)
+15>Emitted(20, 220) Source(41, 44) + SourceIndex(0)
+16>Emitted(20, 222) Source(43, 5) + SourceIndex(0)
+17>Emitted(20, 232) Source(43, 15) + SourceIndex(0)
+18>Emitted(20, 234) Source(43, 17) + SourceIndex(0)
+19>Emitted(20, 235) Source(43, 18) + SourceIndex(0)
+20>Emitted(20, 238) Source(43, 21) + SourceIndex(0)
+21>Emitted(20, 239) Source(43, 22) + SourceIndex(0)
+22>Emitted(20, 241) Source(43, 24) + SourceIndex(0)
+23>Emitted(20, 242) Source(43, 25) + SourceIndex(0)
+24>Emitted(20, 245) Source(43, 28) + SourceIndex(0)
+25>Emitted(20, 246) Source(43, 29) + SourceIndex(0)
+26>Emitted(20, 248) Source(43, 31) + SourceIndex(0)
+27>Emitted(20, 249) Source(43, 32) + SourceIndex(0)
+28>Emitted(20, 251) Source(43, 34) + SourceIndex(0)
+29>Emitted(20, 253) Source(43, 36) + SourceIndex(0)
+30>Emitted(20, 254) Source(43, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -758,125 +734,119 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(22, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(22, 2) Source(45, 2) + SourceIndex(0)
 ---
->>>for ((_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k), i = 0; i < 1; i++) {
+>>>for (_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^
-9 >                                          ^^
-10>                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                            ^^
-12>                                                                                                              ^^^^^^^^^^^^^^^
-13>                                                                                                                             ^^
-14>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                        ^^
-16>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                           ^^
-18>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                          ^^^^^
-20>                                                                                                                                                                                                                                               ^^
-21>                                                                                                                                                                                                                                                 ^
-22>                                                                                                                                                                                                                                                  ^^^
-23>                                                                                                                                                                                                                                                     ^
-24>                                                                                                                                                                                                                                                      ^^
-25>                                                                                                                                                                                                                                                        ^
-26>                                                                                                                                                                                                                                                         ^^^
-27>                                                                                                                                                                                                                                                            ^
-28>                                                                                                                                                                                                                                                             ^^
-29>                                                                                                                                                                                                                                                               ^
-30>                                                                                                                                                                                                                                                                ^^
-31>                                                                                                                                                                                                                                                                  ^^
-32>                                                                                                                                                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                           ^^
+11>                                                                                                             ^^^^^^^^^^^^^^^
+12>                                                                                                                            ^^
+13>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                       ^^
+15>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                          ^^
+17>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                         ^^^^^^
+19>                                                                                                                                                                                                                                               ^
+20>                                                                                                                                                                                                                                                ^^^
+21>                                                                                                                                                                                                                                                   ^
+22>                                                                                                                                                                                                                                                    ^^
+23>                                                                                                                                                                                                                                                      ^
+24>                                                                                                                                                                                                                                                       ^^^
+25>                                                                                                                                                                                                                                                          ^
+26>                                                                                                                                                                                                                                                           ^^
+27>                                                                                                                                                                                                                                                             ^
+28>                                                                                                                                                                                                                                                              ^^
+29>                                                                                                                                                                                                                                                                ^^
+30>                                                                                                                                                                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          skills: {
-  >              primary: primaryA = "primary",
-  >              secondary: secondaryA = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = getMultiRobot()
-7 >                          
-8 >                            skills: {
-  >                                    primary: primaryA = "primary",
-  >                                    secondary: secondaryA = "secondary"
-  >                                } = { primary: "none", secondary: "none" }
-9 >                                          
-10>                                            skills: {
-  >                                                    primary: primaryA = "primary",
-  >                                                    secondary: secondaryA = "secondary"
-  >                                                } = { primary: "none", secondary: "none" }
-11>                                                                                                            
-12>                                                                                                              primary: primaryA = "primary"
-13>                                                                                                                             
-14>                                                                                                                               primary: primaryA = "primary"
-15>                                                                                                                                                                        ,
-  >                                                                                                                                                                                
-16>                                                                                                                                                                          secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                           
-18>                                                                                                                                                                                             secondary: secondaryA = "secondary"
-19>                                                                                                                                                                                                                                          
-  >                                                                                                                                                                                                                                              } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                          } = getMultiRobot()
-20>                                                                                                                                                                                                                                               , 
-21>                                                                                                                                                                                                                                                 i
-22>                                                                                                                                                                                                                                                   = 
-23>                                                                                                                                                                                                                                                     0
-24>                                                                                                                                                                                                                                                      ; 
-25>                                                                                                                                                                                                                                                        i
-26>                                                                                                                                                                                                                                                          < 
-27>                                                                                                                                                                                                                                                            1
-28>                                                                                                                                                                                                                                                             ; 
-29>                                                                                                                                                                                                                                                               i
-30>                                                                                                                                                                                                                                                                ++
-31>                                                                                                                                                                                                                                                                  ) 
-32>                                                                                                                                                                                                                                                                    {
+5 >     {
+  >         skills: {
+  >             primary: primaryA = "primary",
+  >             secondary: secondaryA = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = getMultiRobot()
+6 >                         
+7 >                           skills: {
+  >                                   primary: primaryA = "primary",
+  >                                   secondary: secondaryA = "secondary"
+  >                               } = { primary: "none", secondary: "none" }
+8 >                                         
+9 >                                           skills: {
+  >                                                   primary: primaryA = "primary",
+  >                                                   secondary: secondaryA = "secondary"
+  >                                               } = { primary: "none", secondary: "none" }
+10>                                                                                                           
+11>                                                                                                             primary: primaryA = "primary"
+12>                                                                                                                            
+13>                                                                                                                              primary: primaryA = "primary"
+14>                                                                                                                                                                       ,
+  >                                                                                                                                                                               
+15>                                                                                                                                                                         secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                          
+17>                                                                                                                                                                                            secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                         
+  >                                                                                                                                                                                                                                             } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                         } = getMultiRobot(), 
+19>                                                                                                                                                                                                                                               i
+20>                                                                                                                                                                                                                                                 = 
+21>                                                                                                                                                                                                                                                   0
+22>                                                                                                                                                                                                                                                    ; 
+23>                                                                                                                                                                                                                                                      i
+24>                                                                                                                                                                                                                                                        < 
+25>                                                                                                                                                                                                                                                          1
+26>                                                                                                                                                                                                                                                           ; 
+27>                                                                                                                                                                                                                                                             i
+28>                                                                                                                                                                                                                                                              ++
+29>                                                                                                                                                                                                                                                                ) 
+30>                                                                                                                                                                                                                                                                  {
 1->Emitted(23, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(23, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(23, 5) Source(46, 5) + SourceIndex(0)
 4 >Emitted(23, 6) Source(46, 6) + SourceIndex(0)
-5 >Emitted(23, 7) Source(46, 6) + SourceIndex(0)
-6 >Emitted(23, 27) Source(51, 20) + SourceIndex(0)
-7 >Emitted(23, 29) Source(47, 5) + SourceIndex(0)
-8 >Emitted(23, 43) Source(50, 47) + SourceIndex(0)
-9 >Emitted(23, 45) Source(47, 5) + SourceIndex(0)
-10>Emitted(23, 109) Source(50, 47) + SourceIndex(0)
-11>Emitted(23, 111) Source(48, 9) + SourceIndex(0)
-12>Emitted(23, 126) Source(48, 38) + SourceIndex(0)
-13>Emitted(23, 128) Source(48, 9) + SourceIndex(0)
-14>Emitted(23, 169) Source(48, 38) + SourceIndex(0)
-15>Emitted(23, 171) Source(49, 9) + SourceIndex(0)
-16>Emitted(23, 188) Source(49, 44) + SourceIndex(0)
-17>Emitted(23, 190) Source(49, 9) + SourceIndex(0)
-18>Emitted(23, 235) Source(49, 44) + SourceIndex(0)
-19>Emitted(23, 240) Source(51, 20) + SourceIndex(0)
-20>Emitted(23, 242) Source(51, 22) + SourceIndex(0)
-21>Emitted(23, 243) Source(51, 23) + SourceIndex(0)
-22>Emitted(23, 246) Source(51, 26) + SourceIndex(0)
-23>Emitted(23, 247) Source(51, 27) + SourceIndex(0)
-24>Emitted(23, 249) Source(51, 29) + SourceIndex(0)
-25>Emitted(23, 250) Source(51, 30) + SourceIndex(0)
-26>Emitted(23, 253) Source(51, 33) + SourceIndex(0)
-27>Emitted(23, 254) Source(51, 34) + SourceIndex(0)
-28>Emitted(23, 256) Source(51, 36) + SourceIndex(0)
-29>Emitted(23, 257) Source(51, 37) + SourceIndex(0)
-30>Emitted(23, 259) Source(51, 39) + SourceIndex(0)
-31>Emitted(23, 261) Source(51, 41) + SourceIndex(0)
-32>Emitted(23, 262) Source(51, 42) + SourceIndex(0)
+5 >Emitted(23, 26) Source(51, 20) + SourceIndex(0)
+6 >Emitted(23, 28) Source(47, 5) + SourceIndex(0)
+7 >Emitted(23, 42) Source(50, 47) + SourceIndex(0)
+8 >Emitted(23, 44) Source(47, 5) + SourceIndex(0)
+9 >Emitted(23, 108) Source(50, 47) + SourceIndex(0)
+10>Emitted(23, 110) Source(48, 9) + SourceIndex(0)
+11>Emitted(23, 125) Source(48, 38) + SourceIndex(0)
+12>Emitted(23, 127) Source(48, 9) + SourceIndex(0)
+13>Emitted(23, 168) Source(48, 38) + SourceIndex(0)
+14>Emitted(23, 170) Source(49, 9) + SourceIndex(0)
+15>Emitted(23, 187) Source(49, 44) + SourceIndex(0)
+16>Emitted(23, 189) Source(49, 9) + SourceIndex(0)
+17>Emitted(23, 234) Source(49, 44) + SourceIndex(0)
+18>Emitted(23, 240) Source(51, 22) + SourceIndex(0)
+19>Emitted(23, 241) Source(51, 23) + SourceIndex(0)
+20>Emitted(23, 244) Source(51, 26) + SourceIndex(0)
+21>Emitted(23, 245) Source(51, 27) + SourceIndex(0)
+22>Emitted(23, 247) Source(51, 29) + SourceIndex(0)
+23>Emitted(23, 248) Source(51, 30) + SourceIndex(0)
+24>Emitted(23, 251) Source(51, 33) + SourceIndex(0)
+25>Emitted(23, 252) Source(51, 34) + SourceIndex(0)
+26>Emitted(23, 254) Source(51, 36) + SourceIndex(0)
+27>Emitted(23, 255) Source(51, 37) + SourceIndex(0)
+28>Emitted(23, 257) Source(51, 39) + SourceIndex(0)
+29>Emitted(23, 259) Source(51, 41) + SourceIndex(0)
+30>Emitted(23, 260) Source(51, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -908,86 +878,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(25, 1) Source(53, 1) + SourceIndex(0)
 2 >Emitted(25, 2) Source(53, 2) + SourceIndex(0)
 ---
->>>for ((_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q),
+>>>for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^
-9 >                                                                                                    ^^
-10>                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                      ^^
-12>                                                                                                                                                                        ^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                       ^^
-14>                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                  ^^
-16>                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                     ^^
-18>                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                                                                    ^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^
+8 >                                                                                                   ^^
+9 >                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                     ^^
+11>                                                                                                                                                                       ^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                      ^^
+13>                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                 ^^
+15>                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                    ^^
+17>                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          skills: {
-  >              primary: primaryA = "primary",
-  >              secondary: secondaryA = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                    
-8 >                                                                                      skills: {
-  >                                                                                              primary: primaryA = "primary",
-  >                                                                                              secondary: secondaryA = "secondary"
-  >                                                                                          } = { primary: "none", secondary: "none" }
-9 >                                                                                                    
-10>                                                                                                      skills: {
-  >                                                                                                              primary: primaryA = "primary",
-  >                                                                                                              secondary: secondaryA = "secondary"
-  >                                                                                                          } = { primary: "none", secondary: "none" }
-11>                                                                                                                                                                      
-12>                                                                                                                                                                        primary: primaryA = "primary"
-13>                                                                                                                                                                                       
-14>                                                                                                                                                                                         primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                  ,
-  >                                                                                                                                                                                                                                          
-16>                                                                                                                                                                                                                                    secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                     
-18>                                                                                                                                                                                                                                                       secondary: secondaryA = "secondary"
-19>                                                                                                                                                                                                                                                                                                    
-  >                                                                                                                                                                                                                                                                                                        } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                    } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     {
+  >         skills: {
+  >             primary: primaryA = "primary",
+  >             secondary: secondaryA = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                   
+7 >                                                                                     skills: {
+  >                                                                                             primary: primaryA = "primary",
+  >                                                                                             secondary: secondaryA = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+8 >                                                                                                   
+9 >                                                                                                     skills: {
+  >                                                                                                             primary: primaryA = "primary",
+  >                                                                                                             secondary: secondaryA = "secondary"
+  >                                                                                                         } = { primary: "none", secondary: "none" }
+10>                                                                                                                                                                     
+11>                                                                                                                                                                       primary: primaryA = "primary"
+12>                                                                                                                                                                                      
+13>                                                                                                                                                                                        primary: primaryA = "primary"
+14>                                                                                                                                                                                                                                 ,
+  >                                                                                                                                                                                                                                         
+15>                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                                                                                    
+17>                                                                                                                                                                                                                                                      secondary: secondaryA = "secondary"
 1->Emitted(26, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(26, 4) Source(54, 4) + SourceIndex(0)
 3 >Emitted(26, 5) Source(54, 5) + SourceIndex(0)
 4 >Emitted(26, 6) Source(54, 6) + SourceIndex(0)
-5 >Emitted(26, 7) Source(54, 6) + SourceIndex(0)
-6 >Emitted(26, 85) Source(59, 90) + SourceIndex(0)
-7 >Emitted(26, 87) Source(55, 5) + SourceIndex(0)
-8 >Emitted(26, 101) Source(58, 47) + SourceIndex(0)
-9 >Emitted(26, 103) Source(55, 5) + SourceIndex(0)
-10>Emitted(26, 167) Source(58, 47) + SourceIndex(0)
-11>Emitted(26, 169) Source(56, 9) + SourceIndex(0)
-12>Emitted(26, 184) Source(56, 38) + SourceIndex(0)
-13>Emitted(26, 186) Source(56, 9) + SourceIndex(0)
-14>Emitted(26, 227) Source(56, 38) + SourceIndex(0)
-15>Emitted(26, 229) Source(57, 9) + SourceIndex(0)
-16>Emitted(26, 246) Source(57, 44) + SourceIndex(0)
-17>Emitted(26, 248) Source(57, 9) + SourceIndex(0)
-18>Emitted(26, 293) Source(57, 44) + SourceIndex(0)
-19>Emitted(26, 298) Source(59, 90) + SourceIndex(0)
+5 >Emitted(26, 84) Source(59, 90) + SourceIndex(0)
+6 >Emitted(26, 86) Source(55, 5) + SourceIndex(0)
+7 >Emitted(26, 100) Source(58, 47) + SourceIndex(0)
+8 >Emitted(26, 102) Source(55, 5) + SourceIndex(0)
+9 >Emitted(26, 166) Source(58, 47) + SourceIndex(0)
+10>Emitted(26, 168) Source(56, 9) + SourceIndex(0)
+11>Emitted(26, 183) Source(56, 38) + SourceIndex(0)
+12>Emitted(26, 185) Source(56, 9) + SourceIndex(0)
+13>Emitted(26, 226) Source(56, 38) + SourceIndex(0)
+14>Emitted(26, 228) Source(57, 9) + SourceIndex(0)
+15>Emitted(26, 245) Source(57, 44) + SourceIndex(0)
+16>Emitted(26, 247) Source(57, 9) + SourceIndex(0)
+17>Emitted(26, 292) Source(57, 44) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -1004,7 +966,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 >
+  >    } = { primary: "none", secondary: "none" }
+  >} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
@@ -1062,88 +1026,82 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(29, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(29, 2) Source(62, 2) + SourceIndex(0)
 ---
->>>for ((_v = robot.name, name = _v === void 0 ? "noName" : _v, robot), i = 0; i < 1; i++) {
+>>>for (_v = robot.name, name = _v === void 0 ? "noName" : _v, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                           ^^
-10>                                                             ^^^^^
-11>                                                                  ^
-12>                                                                   ^^
-13>                                                                     ^
-14>                                                                      ^^^
-15>                                                                         ^
-16>                                                                          ^^
-17>                                                                            ^
-18>                                                                             ^^^
-19>                                                                                ^
-20>                                                                                 ^^
-21>                                                                                   ^
-22>                                                                                    ^^
-23>                                                                                      ^^
-24>                                                                                        ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                          ^^
+9 >                                                            ^^^^^
+10>                                                                 ^^
+11>                                                                   ^
+12>                                                                    ^^^
+13>                                                                       ^
+14>                                                                        ^^
+15>                                                                          ^
+16>                                                                           ^^^
+17>                                                                              ^
+18>                                                                               ^^
+19>                                                                                 ^
+20>                                                                                  ^^
+21>                                                                                    ^^
+22>                                                                                      ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name = "noName"
-7 >                     
-8 >                       name = "noName"
-9 >                                                            } = 
-10>                                                             robot
-11>                                                                  
-12>                                                                   , 
-13>                                                                     i
-14>                                                                       = 
-15>                                                                         0
-16>                                                                          ; 
-17>                                                                            i
-18>                                                                              < 
-19>                                                                                1
-20>                                                                                 ; 
-21>                                                                                   i
-22>                                                                                    ++
-23>                                                                                      ) 
-24>                                                                                        {
+4 >    ({ 
+5 >     name = "noName"
+6 >                    
+7 >                      name = "noName"
+8 >                                                           } = 
+9 >                                                            robot
+10>                                                                 , 
+11>                                                                   i
+12>                                                                     = 
+13>                                                                       0
+14>                                                                        ; 
+15>                                                                          i
+16>                                                                            < 
+17>                                                                              1
+18>                                                                               ; 
+19>                                                                                 i
+20>                                                                                  ++
+21>                                                                                    ) 
+22>                                                                                      {
 1->Emitted(30, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(30, 4) Source(64, 4) + SourceIndex(0)
 3 >Emitted(30, 5) Source(64, 5) + SourceIndex(0)
-4 >Emitted(30, 6) Source(64, 6) + SourceIndex(0)
-5 >Emitted(30, 7) Source(64, 8) + SourceIndex(0)
-6 >Emitted(30, 22) Source(64, 23) + SourceIndex(0)
-7 >Emitted(30, 24) Source(64, 8) + SourceIndex(0)
-8 >Emitted(30, 60) Source(64, 23) + SourceIndex(0)
-9 >Emitted(30, 62) Source(64, 28) + SourceIndex(0)
-10>Emitted(30, 67) Source(64, 33) + SourceIndex(0)
-11>Emitted(30, 68) Source(64, 33) + SourceIndex(0)
-12>Emitted(30, 70) Source(64, 35) + SourceIndex(0)
-13>Emitted(30, 71) Source(64, 36) + SourceIndex(0)
-14>Emitted(30, 74) Source(64, 39) + SourceIndex(0)
-15>Emitted(30, 75) Source(64, 40) + SourceIndex(0)
-16>Emitted(30, 77) Source(64, 42) + SourceIndex(0)
-17>Emitted(30, 78) Source(64, 43) + SourceIndex(0)
-18>Emitted(30, 81) Source(64, 46) + SourceIndex(0)
-19>Emitted(30, 82) Source(64, 47) + SourceIndex(0)
-20>Emitted(30, 84) Source(64, 49) + SourceIndex(0)
-21>Emitted(30, 85) Source(64, 50) + SourceIndex(0)
-22>Emitted(30, 87) Source(64, 52) + SourceIndex(0)
-23>Emitted(30, 89) Source(64, 54) + SourceIndex(0)
-24>Emitted(30, 90) Source(64, 55) + SourceIndex(0)
+4 >Emitted(30, 6) Source(64, 8) + SourceIndex(0)
+5 >Emitted(30, 21) Source(64, 23) + SourceIndex(0)
+6 >Emitted(30, 23) Source(64, 8) + SourceIndex(0)
+7 >Emitted(30, 59) Source(64, 23) + SourceIndex(0)
+8 >Emitted(30, 61) Source(64, 28) + SourceIndex(0)
+9 >Emitted(30, 66) Source(64, 33) + SourceIndex(0)
+10>Emitted(30, 68) Source(64, 35) + SourceIndex(0)
+11>Emitted(30, 69) Source(64, 36) + SourceIndex(0)
+12>Emitted(30, 72) Source(64, 39) + SourceIndex(0)
+13>Emitted(30, 73) Source(64, 40) + SourceIndex(0)
+14>Emitted(30, 75) Source(64, 42) + SourceIndex(0)
+15>Emitted(30, 76) Source(64, 43) + SourceIndex(0)
+16>Emitted(30, 79) Source(64, 46) + SourceIndex(0)
+17>Emitted(30, 80) Source(64, 47) + SourceIndex(0)
+18>Emitted(30, 82) Source(64, 49) + SourceIndex(0)
+19>Emitted(30, 83) Source(64, 50) + SourceIndex(0)
+20>Emitted(30, 85) Source(64, 52) + SourceIndex(0)
+21>Emitted(30, 87) Source(64, 54) + SourceIndex(0)
+22>Emitted(30, 88) Source(64, 55) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1175,87 +1133,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(32, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(32, 2) Source(66, 2) + SourceIndex(0)
 ---
->>>for ((_w = getRobot(), _x = _w.name, name = _x === void 0 ? "noName" : _x, _w), i = 0; i < 1; i++) {
+>>>for (_w = getRobot(), _x = _w.name, name = _x === void 0 ? "noName" : _x, _w, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^
-7 >                     ^^
-8 >                       ^^^^^^^^^^^^
-9 >                                   ^^
-10>                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                         ^^^^^
-12>                                                                              ^^
-13>                                                                                ^
-14>                                                                                 ^^^
-15>                                                                                    ^
-16>                                                                                     ^^
-17>                                                                                       ^
-18>                                                                                        ^^^
-19>                                                                                           ^
-20>                                                                                            ^^
-21>                                                                                              ^
-22>                                                                                               ^^
-23>                                                                                                 ^^
-24>                                                                                                   ^
+5 >     ^^^^^^^^^^^^^^^
+6 >                    ^^
+7 >                      ^^^^^^^^^^^^
+8 >                                  ^^
+9 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                        ^^^^^^
+11>                                                                              ^
+12>                                                                               ^^^
+13>                                                                                  ^
+14>                                                                                   ^^
+15>                                                                                     ^
+16>                                                                                      ^^^
+17>                                                                                         ^
+18>                                                                                          ^^
+19>                                                                                            ^
+20>                                                                                             ^^
+21>                                                                                               ^^
+22>                                                                                                 ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name = "noName" } = getRobot()
-7 >                     
-8 >                       name = "noName"
-9 >                                   
-10>                                     name = "noName"
-11>                                                                          } = getRobot()
-12>                                                                              , 
-13>                                                                                i
-14>                                                                                  = 
-15>                                                                                    0
-16>                                                                                     ; 
-17>                                                                                       i
-18>                                                                                         < 
-19>                                                                                           1
-20>                                                                                            ; 
-21>                                                                                              i
-22>                                                                                               ++
-23>                                                                                                 ) 
-24>                                                                                                   {
+5 >     { name = "noName" } = getRobot()
+6 >                    
+7 >                      name = "noName"
+8 >                                  
+9 >                                    name = "noName"
+10>                                                                         } = getRobot(), 
+11>                                                                              i
+12>                                                                                = 
+13>                                                                                  0
+14>                                                                                   ; 
+15>                                                                                     i
+16>                                                                                       < 
+17>                                                                                         1
+18>                                                                                          ; 
+19>                                                                                            i
+20>                                                                                             ++
+21>                                                                                               ) 
+22>                                                                                                 {
 1->Emitted(33, 1) Source(67, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(67, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(67, 5) + SourceIndex(0)
 4 >Emitted(33, 6) Source(67, 6) + SourceIndex(0)
-5 >Emitted(33, 7) Source(67, 6) + SourceIndex(0)
-6 >Emitted(33, 22) Source(67, 38) + SourceIndex(0)
-7 >Emitted(33, 24) Source(67, 8) + SourceIndex(0)
-8 >Emitted(33, 36) Source(67, 23) + SourceIndex(0)
-9 >Emitted(33, 38) Source(67, 8) + SourceIndex(0)
-10>Emitted(33, 74) Source(67, 23) + SourceIndex(0)
-11>Emitted(33, 79) Source(67, 38) + SourceIndex(0)
-12>Emitted(33, 81) Source(67, 40) + SourceIndex(0)
-13>Emitted(33, 82) Source(67, 41) + SourceIndex(0)
-14>Emitted(33, 85) Source(67, 44) + SourceIndex(0)
-15>Emitted(33, 86) Source(67, 45) + SourceIndex(0)
-16>Emitted(33, 88) Source(67, 47) + SourceIndex(0)
-17>Emitted(33, 89) Source(67, 48) + SourceIndex(0)
-18>Emitted(33, 92) Source(67, 51) + SourceIndex(0)
-19>Emitted(33, 93) Source(67, 52) + SourceIndex(0)
-20>Emitted(33, 95) Source(67, 54) + SourceIndex(0)
-21>Emitted(33, 96) Source(67, 55) + SourceIndex(0)
-22>Emitted(33, 98) Source(67, 57) + SourceIndex(0)
-23>Emitted(33, 100) Source(67, 59) + SourceIndex(0)
-24>Emitted(33, 101) Source(67, 60) + SourceIndex(0)
+5 >Emitted(33, 21) Source(67, 38) + SourceIndex(0)
+6 >Emitted(33, 23) Source(67, 8) + SourceIndex(0)
+7 >Emitted(33, 35) Source(67, 23) + SourceIndex(0)
+8 >Emitted(33, 37) Source(67, 8) + SourceIndex(0)
+9 >Emitted(33, 73) Source(67, 23) + SourceIndex(0)
+10>Emitted(33, 79) Source(67, 40) + SourceIndex(0)
+11>Emitted(33, 80) Source(67, 41) + SourceIndex(0)
+12>Emitted(33, 83) Source(67, 44) + SourceIndex(0)
+13>Emitted(33, 84) Source(67, 45) + SourceIndex(0)
+14>Emitted(33, 86) Source(67, 47) + SourceIndex(0)
+15>Emitted(33, 87) Source(67, 48) + SourceIndex(0)
+16>Emitted(33, 90) Source(67, 51) + SourceIndex(0)
+17>Emitted(33, 91) Source(67, 52) + SourceIndex(0)
+18>Emitted(33, 93) Source(67, 54) + SourceIndex(0)
+19>Emitted(33, 94) Source(67, 55) + SourceIndex(0)
+20>Emitted(33, 96) Source(67, 57) + SourceIndex(0)
+21>Emitted(33, 98) Source(67, 59) + SourceIndex(0)
+22>Emitted(33, 99) Source(67, 60) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1287,87 +1239,81 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(35, 1) Source(69, 1) + SourceIndex(0)
 2 >Emitted(35, 2) Source(69, 2) + SourceIndex(0)
 ---
->>>for ((_y = { name: "trimmer", skill: "trimming" }, _z = _y.name, name = _z === void 0 ? "noName" : _z, _y), i = 0; i < 1; i++) {
+>>>for (_y = { name: "trimmer", skill: "trimming" }, _z = _y.name, name = _z === void 0 ? "noName" : _z, _y, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^
-9 >                                                               ^^
-10>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                     ^^^^^
-12>                                                                                                          ^^
-13>                                                                                                            ^
-14>                                                                                                             ^^^
-15>                                                                                                                ^
-16>                                                                                                                 ^^
-17>                                                                                                                   ^
-18>                                                                                                                    ^^^
-19>                                                                                                                       ^
-20>                                                                                                                        ^^
-21>                                                                                                                          ^
-22>                                                                                                                           ^^
-23>                                                                                                                             ^^
-24>                                                                                                                               ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^
+8 >                                                              ^^
+9 >                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                    ^^^^^^
+11>                                                                                                          ^
+12>                                                                                                           ^^^
+13>                                                                                                              ^
+14>                                                                                                               ^^
+15>                                                                                                                 ^
+16>                                                                                                                  ^^^
+17>                                                                                                                     ^
+18>                                                                                                                      ^^
+19>                                                                                                                        ^
+20>                                                                                                                         ^^
+21>                                                                                                                           ^^
+22>                                                                                                                             ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                 
-8 >                                                   name = "noName"
-9 >                                                               
-10>                                                                 name = "noName"
-11>                                                                                                      } = <Robot>{ name: "trimmer", skill: "trimming" }
-12>                                                                                                          , 
-13>                                                                                                            i
-14>                                                                                                              = 
-15>                                                                                                                0
-16>                                                                                                                 ; 
-17>                                                                                                                   i
-18>                                                                                                                     < 
-19>                                                                                                                       1
-20>                                                                                                                        ; 
-21>                                                                                                                          i
-22>                                                                                                                           ++
-23>                                                                                                                             ) 
-24>                                                                                                                               {
+5 >     { name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                
+7 >                                                  name = "noName"
+8 >                                                              
+9 >                                                                name = "noName"
+10>                                                                                                     } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+11>                                                                                                          i
+12>                                                                                                            = 
+13>                                                                                                              0
+14>                                                                                                               ; 
+15>                                                                                                                 i
+16>                                                                                                                   < 
+17>                                                                                                                     1
+18>                                                                                                                      ; 
+19>                                                                                                                        i
+20>                                                                                                                         ++
+21>                                                                                                                           ) 
+22>                                                                                                                             {
 1->Emitted(36, 1) Source(70, 1) + SourceIndex(0)
 2 >Emitted(36, 4) Source(70, 4) + SourceIndex(0)
 3 >Emitted(36, 5) Source(70, 5) + SourceIndex(0)
 4 >Emitted(36, 6) Source(70, 6) + SourceIndex(0)
-5 >Emitted(36, 7) Source(70, 6) + SourceIndex(0)
-6 >Emitted(36, 50) Source(70, 73) + SourceIndex(0)
-7 >Emitted(36, 52) Source(70, 8) + SourceIndex(0)
-8 >Emitted(36, 64) Source(70, 23) + SourceIndex(0)
-9 >Emitted(36, 66) Source(70, 8) + SourceIndex(0)
-10>Emitted(36, 102) Source(70, 23) + SourceIndex(0)
-11>Emitted(36, 107) Source(70, 73) + SourceIndex(0)
-12>Emitted(36, 109) Source(70, 75) + SourceIndex(0)
-13>Emitted(36, 110) Source(70, 76) + SourceIndex(0)
-14>Emitted(36, 113) Source(70, 79) + SourceIndex(0)
-15>Emitted(36, 114) Source(70, 80) + SourceIndex(0)
-16>Emitted(36, 116) Source(70, 82) + SourceIndex(0)
-17>Emitted(36, 117) Source(70, 83) + SourceIndex(0)
-18>Emitted(36, 120) Source(70, 86) + SourceIndex(0)
-19>Emitted(36, 121) Source(70, 87) + SourceIndex(0)
-20>Emitted(36, 123) Source(70, 89) + SourceIndex(0)
-21>Emitted(36, 124) Source(70, 90) + SourceIndex(0)
-22>Emitted(36, 126) Source(70, 92) + SourceIndex(0)
-23>Emitted(36, 128) Source(70, 94) + SourceIndex(0)
-24>Emitted(36, 129) Source(70, 95) + SourceIndex(0)
+5 >Emitted(36, 49) Source(70, 73) + SourceIndex(0)
+6 >Emitted(36, 51) Source(70, 8) + SourceIndex(0)
+7 >Emitted(36, 63) Source(70, 23) + SourceIndex(0)
+8 >Emitted(36, 65) Source(70, 8) + SourceIndex(0)
+9 >Emitted(36, 101) Source(70, 23) + SourceIndex(0)
+10>Emitted(36, 107) Source(70, 75) + SourceIndex(0)
+11>Emitted(36, 108) Source(70, 76) + SourceIndex(0)
+12>Emitted(36, 111) Source(70, 79) + SourceIndex(0)
+13>Emitted(36, 112) Source(70, 80) + SourceIndex(0)
+14>Emitted(36, 114) Source(70, 82) + SourceIndex(0)
+15>Emitted(36, 115) Source(70, 83) + SourceIndex(0)
+16>Emitted(36, 118) Source(70, 86) + SourceIndex(0)
+17>Emitted(36, 119) Source(70, 87) + SourceIndex(0)
+18>Emitted(36, 121) Source(70, 89) + SourceIndex(0)
+19>Emitted(36, 122) Source(70, 90) + SourceIndex(0)
+20>Emitted(36, 124) Source(70, 92) + SourceIndex(0)
+21>Emitted(36, 126) Source(70, 94) + SourceIndex(0)
+22>Emitted(36, 127) Source(70, 95) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1399,121 +1345,115 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(38, 1) Source(72, 1) + SourceIndex(0)
 2 >Emitted(38, 2) Source(72, 2) + SourceIndex(0)
 ---
->>>for ((_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot), i = 0; i < 1; i++) {
+>>>for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^
-7 >                            ^^
-8 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                              ^^
-10>                                                                                                ^^^^^^^^^^^^^^^
-11>                                                                                                               ^^
-12>                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                         ^^
-14>                                                                                                                                                           ^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                            ^^
-16>                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                          ^^
-18>                                                                                                                                                                                                                            ^^^^^^^^^^
-19>                                                                                                                                                                                                                                      ^
-20>                                                                                                                                                                                                                                       ^^
-21>                                                                                                                                                                                                                                         ^
-22>                                                                                                                                                                                                                                          ^^^
-23>                                                                                                                                                                                                                                             ^
-24>                                                                                                                                                                                                                                              ^^
-25>                                                                                                                                                                                                                                                ^
-26>                                                                                                                                                                                                                                                 ^^^
-27>                                                                                                                                                                                                                                                    ^
-28>                                                                                                                                                                                                                                                     ^^
-29>                                                                                                                                                                                                                                                       ^
-30>                                                                                                                                                                                                                                                        ^^
-31>                                                                                                                                                                                                                                                          ^^
-32>                                                                                                                                                                                                                                                            ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^
+6 >                           ^^
+7 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                                             ^^
+9 >                                                                                               ^^^^^^^^^^^^^^^
+10>                                                                                                              ^^
+11>                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                        ^^
+13>                                                                                                                                                          ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                           ^^
+15>                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                         ^^
+17>                                                                                                                                                                                                                           ^^^^^^^^^^
+18>                                                                                                                                                                                                                                     ^^
+19>                                                                                                                                                                                                                                       ^
+20>                                                                                                                                                                                                                                        ^^^
+21>                                                                                                                                                                                                                                           ^
+22>                                                                                                                                                                                                                                            ^^
+23>                                                                                                                                                                                                                                              ^
+24>                                                                                                                                                                                                                                               ^^^
+25>                                                                                                                                                                                                                                                  ^
+26>                                                                                                                                                                                                                                                   ^^
+27>                                                                                                                                                                                                                                                     ^
+28>                                                                                                                                                                                                                                                      ^^
+29>                                                                                                                                                                                                                                                        ^^
+30>                                                                                                                                                                                                                                                          ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     {
-  >         
-6 >      skills: {
-  >              primary = "primary",
-  >              secondary = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-7 >                            
-8 >                              skills: {
-  >                                      primary = "primary",
-  >                                      secondary = "secondary"
-  >                                  } = { primary: "none", secondary: "none" }
-9 >                                                                                              
-10>                                                                                                primary = "primary"
-11>                                                                                                               
-12>                                                                                                                 primary = "primary"
-13>                                                                                                                                                         ,
-  >                                                                                                                                                                 
-14>                                                                                                                                                           secondary = "secondary"
-15>                                                                                                                                                                            
-16>                                                                                                                                                                              secondary = "secondary"
-17>                                                                                                                                                                                                                          
-  >                                                                                                                                                                                                                              } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                          } = 
-18>                                                                                                                                                                                                                            multiRobot
-19>                                                                                                                                                                                                                                      
-20>                                                                                                                                                                                                                                       , 
-21>                                                                                                                                                                                                                                         i
-22>                                                                                                                                                                                                                                           = 
-23>                                                                                                                                                                                                                                             0
-24>                                                                                                                                                                                                                                              ; 
-25>                                                                                                                                                                                                                                                i
-26>                                                                                                                                                                                                                                                  < 
-27>                                                                                                                                                                                                                                                    1
-28>                                                                                                                                                                                                                                                     ; 
-29>                                                                                                                                                                                                                                                       i
-30>                                                                                                                                                                                                                                                        ++
-31>                                                                                                                                                                                                                                                          ) 
-32>                                                                                                                                                                                                                                                            {
+4 >    ({
+  >        
+5 >     skills: {
+  >             primary = "primary",
+  >             secondary = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+6 >                           
+7 >                             skills: {
+  >                                     primary = "primary",
+  >                                     secondary = "secondary"
+  >                                 } = { primary: "none", secondary: "none" }
+8 >                                                                                             
+9 >                                                                                               primary = "primary"
+10>                                                                                                              
+11>                                                                                                                primary = "primary"
+12>                                                                                                                                                        ,
+  >                                                                                                                                                                
+13>                                                                                                                                                          secondary = "secondary"
+14>                                                                                                                                                                           
+15>                                                                                                                                                                             secondary = "secondary"
+16>                                                                                                                                                                                                                         
+  >                                                                                                                                                                                                                             } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                         } = 
+17>                                                                                                                                                                                                                           multiRobot
+18>                                                                                                                                                                                                                                     , 
+19>                                                                                                                                                                                                                                       i
+20>                                                                                                                                                                                                                                         = 
+21>                                                                                                                                                                                                                                           0
+22>                                                                                                                                                                                                                                            ; 
+23>                                                                                                                                                                                                                                              i
+24>                                                                                                                                                                                                                                                < 
+25>                                                                                                                                                                                                                                                  1
+26>                                                                                                                                                                                                                                                   ; 
+27>                                                                                                                                                                                                                                                     i
+28>                                                                                                                                                                                                                                                      ++
+29>                                                                                                                                                                                                                                                        ) 
+30>                                                                                                                                                                                                                                                          {
 1->Emitted(39, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(73, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(73, 5) + SourceIndex(0)
-4 >Emitted(39, 6) Source(73, 6) + SourceIndex(0)
-5 >Emitted(39, 7) Source(74, 5) + SourceIndex(0)
-6 >Emitted(39, 29) Source(77, 47) + SourceIndex(0)
-7 >Emitted(39, 31) Source(74, 5) + SourceIndex(0)
-8 >Emitted(39, 95) Source(77, 47) + SourceIndex(0)
-9 >Emitted(39, 97) Source(75, 9) + SourceIndex(0)
-10>Emitted(39, 112) Source(75, 28) + SourceIndex(0)
-11>Emitted(39, 114) Source(75, 9) + SourceIndex(0)
-12>Emitted(39, 154) Source(75, 28) + SourceIndex(0)
-13>Emitted(39, 156) Source(76, 9) + SourceIndex(0)
-14>Emitted(39, 173) Source(76, 32) + SourceIndex(0)
-15>Emitted(39, 175) Source(76, 9) + SourceIndex(0)
-16>Emitted(39, 219) Source(76, 32) + SourceIndex(0)
-17>Emitted(39, 221) Source(78, 5) + SourceIndex(0)
-18>Emitted(39, 231) Source(78, 15) + SourceIndex(0)
-19>Emitted(39, 232) Source(78, 15) + SourceIndex(0)
-20>Emitted(39, 234) Source(78, 17) + SourceIndex(0)
-21>Emitted(39, 235) Source(78, 18) + SourceIndex(0)
-22>Emitted(39, 238) Source(78, 21) + SourceIndex(0)
-23>Emitted(39, 239) Source(78, 22) + SourceIndex(0)
-24>Emitted(39, 241) Source(78, 24) + SourceIndex(0)
-25>Emitted(39, 242) Source(78, 25) + SourceIndex(0)
-26>Emitted(39, 245) Source(78, 28) + SourceIndex(0)
-27>Emitted(39, 246) Source(78, 29) + SourceIndex(0)
-28>Emitted(39, 248) Source(78, 31) + SourceIndex(0)
-29>Emitted(39, 249) Source(78, 32) + SourceIndex(0)
-30>Emitted(39, 251) Source(78, 34) + SourceIndex(0)
-31>Emitted(39, 253) Source(78, 36) + SourceIndex(0)
-32>Emitted(39, 254) Source(78, 37) + SourceIndex(0)
+4 >Emitted(39, 6) Source(74, 5) + SourceIndex(0)
+5 >Emitted(39, 28) Source(77, 47) + SourceIndex(0)
+6 >Emitted(39, 30) Source(74, 5) + SourceIndex(0)
+7 >Emitted(39, 94) Source(77, 47) + SourceIndex(0)
+8 >Emitted(39, 96) Source(75, 9) + SourceIndex(0)
+9 >Emitted(39, 111) Source(75, 28) + SourceIndex(0)
+10>Emitted(39, 113) Source(75, 9) + SourceIndex(0)
+11>Emitted(39, 153) Source(75, 28) + SourceIndex(0)
+12>Emitted(39, 155) Source(76, 9) + SourceIndex(0)
+13>Emitted(39, 172) Source(76, 32) + SourceIndex(0)
+14>Emitted(39, 174) Source(76, 9) + SourceIndex(0)
+15>Emitted(39, 218) Source(76, 32) + SourceIndex(0)
+16>Emitted(39, 220) Source(78, 5) + SourceIndex(0)
+17>Emitted(39, 230) Source(78, 15) + SourceIndex(0)
+18>Emitted(39, 232) Source(78, 17) + SourceIndex(0)
+19>Emitted(39, 233) Source(78, 18) + SourceIndex(0)
+20>Emitted(39, 236) Source(78, 21) + SourceIndex(0)
+21>Emitted(39, 237) Source(78, 22) + SourceIndex(0)
+22>Emitted(39, 239) Source(78, 24) + SourceIndex(0)
+23>Emitted(39, 240) Source(78, 25) + SourceIndex(0)
+24>Emitted(39, 243) Source(78, 28) + SourceIndex(0)
+25>Emitted(39, 244) Source(78, 29) + SourceIndex(0)
+26>Emitted(39, 246) Source(78, 31) + SourceIndex(0)
+27>Emitted(39, 247) Source(78, 32) + SourceIndex(0)
+28>Emitted(39, 249) Source(78, 34) + SourceIndex(0)
+29>Emitted(39, 251) Source(78, 36) + SourceIndex(0)
+30>Emitted(39, 252) Source(78, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1545,125 +1485,119 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(41, 1) Source(80, 1) + SourceIndex(0)
 2 >Emitted(41, 2) Source(80, 2) + SourceIndex(0)
 ---
->>>for ((_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4), i = 0; i < 1; i++) {
+>>>for (_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^
-7 >                          ^^
-8 >                            ^^^^^^^^^^^^^^
-9 >                                          ^^
-10>                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                            ^^
-12>                                                                                                              ^^^^^^^^^^^^^^^
-13>                                                                                                                             ^^
-14>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                       ^^
-16>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                          ^^
-18>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                        ^^^^^
-20>                                                                                                                                                                                                                                             ^^
-21>                                                                                                                                                                                                                                               ^
-22>                                                                                                                                                                                                                                                ^^^
-23>                                                                                                                                                                                                                                                   ^
-24>                                                                                                                                                                                                                                                    ^^
-25>                                                                                                                                                                                                                                                      ^
-26>                                                                                                                                                                                                                                                       ^^^
-27>                                                                                                                                                                                                                                                          ^
-28>                                                                                                                                                                                                                                                           ^^
-29>                                                                                                                                                                                                                                                             ^
-30>                                                                                                                                                                                                                                                              ^^
-31>                                                                                                                                                                                                                                                                ^^
-32>                                                                                                                                                                                                                                                                  ^
+5 >     ^^^^^^^^^^^^^^^^^^^^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                           ^^
+11>                                                                                                             ^^^^^^^^^^^^^^^
+12>                                                                                                                            ^^
+13>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                      ^^
+15>                                                                                                                                                                        ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                         ^^
+17>                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                       ^^^^^^
+19>                                                                                                                                                                                                                                             ^
+20>                                                                                                                                                                                                                                              ^^^
+21>                                                                                                                                                                                                                                                 ^
+22>                                                                                                                                                                                                                                                  ^^
+23>                                                                                                                                                                                                                                                    ^
+24>                                                                                                                                                                                                                                                     ^^^
+25>                                                                                                                                                                                                                                                        ^
+26>                                                                                                                                                                                                                                                         ^^
+27>                                                                                                                                                                                                                                                           ^
+28>                                                                                                                                                                                                                                                            ^^
+29>                                                                                                                                                                                                                                                              ^^
+30>                                                                                                                                                                                                                                                                ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          skills: {
-  >              primary = "primary",
-  >              secondary = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = getMultiRobot()
-7 >                          
-8 >                            skills: {
-  >                                    primary = "primary",
-  >                                    secondary = "secondary"
-  >                                } = { primary: "none", secondary: "none" }
-9 >                                          
-10>                                            skills: {
-  >                                                    primary = "primary",
-  >                                                    secondary = "secondary"
-  >                                                } = { primary: "none", secondary: "none" }
-11>                                                                                                            
-12>                                                                                                              primary = "primary"
-13>                                                                                                                             
-14>                                                                                                                               primary = "primary"
-15>                                                                                                                                                                       ,
-  >                                                                                                                                                                               
-16>                                                                                                                                                                         secondary = "secondary"
-17>                                                                                                                                                                                          
-18>                                                                                                                                                                                            secondary = "secondary"
-19>                                                                                                                                                                                                                                        
-  >                                                                                                                                                                                                                                            } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                        } = getMultiRobot()
-20>                                                                                                                                                                                                                                             , 
-21>                                                                                                                                                                                                                                               i
-22>                                                                                                                                                                                                                                                 = 
-23>                                                                                                                                                                                                                                                   0
-24>                                                                                                                                                                                                                                                    ; 
-25>                                                                                                                                                                                                                                                      i
-26>                                                                                                                                                                                                                                                        < 
-27>                                                                                                                                                                                                                                                          1
-28>                                                                                                                                                                                                                                                           ; 
-29>                                                                                                                                                                                                                                                             i
-30>                                                                                                                                                                                                                                                              ++
-31>                                                                                                                                                                                                                                                                ) 
-32>                                                                                                                                                                                                                                                                  {
+5 >     {
+  >         skills: {
+  >             primary = "primary",
+  >             secondary = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = getMultiRobot()
+6 >                         
+7 >                           skills: {
+  >                                   primary = "primary",
+  >                                   secondary = "secondary"
+  >                               } = { primary: "none", secondary: "none" }
+8 >                                         
+9 >                                           skills: {
+  >                                                   primary = "primary",
+  >                                                   secondary = "secondary"
+  >                                               } = { primary: "none", secondary: "none" }
+10>                                                                                                           
+11>                                                                                                             primary = "primary"
+12>                                                                                                                            
+13>                                                                                                                              primary = "primary"
+14>                                                                                                                                                                      ,
+  >                                                                                                                                                                              
+15>                                                                                                                                                                        secondary = "secondary"
+16>                                                                                                                                                                                         
+17>                                                                                                                                                                                           secondary = "secondary"
+18>                                                                                                                                                                                                                                       
+  >                                                                                                                                                                                                                                           } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                       } = getMultiRobot(), 
+19>                                                                                                                                                                                                                                             i
+20>                                                                                                                                                                                                                                               = 
+21>                                                                                                                                                                                                                                                 0
+22>                                                                                                                                                                                                                                                  ; 
+23>                                                                                                                                                                                                                                                    i
+24>                                                                                                                                                                                                                                                      < 
+25>                                                                                                                                                                                                                                                        1
+26>                                                                                                                                                                                                                                                         ; 
+27>                                                                                                                                                                                                                                                           i
+28>                                                                                                                                                                                                                                                            ++
+29>                                                                                                                                                                                                                                                              ) 
+30>                                                                                                                                                                                                                                                                {
 1->Emitted(42, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(81, 5) + SourceIndex(0)
 4 >Emitted(42, 6) Source(81, 6) + SourceIndex(0)
-5 >Emitted(42, 7) Source(81, 6) + SourceIndex(0)
-6 >Emitted(42, 27) Source(86, 20) + SourceIndex(0)
-7 >Emitted(42, 29) Source(82, 5) + SourceIndex(0)
-8 >Emitted(42, 43) Source(85, 47) + SourceIndex(0)
-9 >Emitted(42, 45) Source(82, 5) + SourceIndex(0)
-10>Emitted(42, 109) Source(85, 47) + SourceIndex(0)
-11>Emitted(42, 111) Source(83, 9) + SourceIndex(0)
-12>Emitted(42, 126) Source(83, 28) + SourceIndex(0)
-13>Emitted(42, 128) Source(83, 9) + SourceIndex(0)
-14>Emitted(42, 168) Source(83, 28) + SourceIndex(0)
-15>Emitted(42, 170) Source(84, 9) + SourceIndex(0)
-16>Emitted(42, 187) Source(84, 32) + SourceIndex(0)
-17>Emitted(42, 189) Source(84, 9) + SourceIndex(0)
-18>Emitted(42, 233) Source(84, 32) + SourceIndex(0)
-19>Emitted(42, 238) Source(86, 20) + SourceIndex(0)
-20>Emitted(42, 240) Source(86, 22) + SourceIndex(0)
-21>Emitted(42, 241) Source(86, 23) + SourceIndex(0)
-22>Emitted(42, 244) Source(86, 26) + SourceIndex(0)
-23>Emitted(42, 245) Source(86, 27) + SourceIndex(0)
-24>Emitted(42, 247) Source(86, 29) + SourceIndex(0)
-25>Emitted(42, 248) Source(86, 30) + SourceIndex(0)
-26>Emitted(42, 251) Source(86, 33) + SourceIndex(0)
-27>Emitted(42, 252) Source(86, 34) + SourceIndex(0)
-28>Emitted(42, 254) Source(86, 36) + SourceIndex(0)
-29>Emitted(42, 255) Source(86, 37) + SourceIndex(0)
-30>Emitted(42, 257) Source(86, 39) + SourceIndex(0)
-31>Emitted(42, 259) Source(86, 41) + SourceIndex(0)
-32>Emitted(42, 260) Source(86, 42) + SourceIndex(0)
+5 >Emitted(42, 26) Source(86, 20) + SourceIndex(0)
+6 >Emitted(42, 28) Source(82, 5) + SourceIndex(0)
+7 >Emitted(42, 42) Source(85, 47) + SourceIndex(0)
+8 >Emitted(42, 44) Source(82, 5) + SourceIndex(0)
+9 >Emitted(42, 108) Source(85, 47) + SourceIndex(0)
+10>Emitted(42, 110) Source(83, 9) + SourceIndex(0)
+11>Emitted(42, 125) Source(83, 28) + SourceIndex(0)
+12>Emitted(42, 127) Source(83, 9) + SourceIndex(0)
+13>Emitted(42, 167) Source(83, 28) + SourceIndex(0)
+14>Emitted(42, 169) Source(84, 9) + SourceIndex(0)
+15>Emitted(42, 186) Source(84, 32) + SourceIndex(0)
+16>Emitted(42, 188) Source(84, 9) + SourceIndex(0)
+17>Emitted(42, 232) Source(84, 32) + SourceIndex(0)
+18>Emitted(42, 238) Source(86, 22) + SourceIndex(0)
+19>Emitted(42, 239) Source(86, 23) + SourceIndex(0)
+20>Emitted(42, 242) Source(86, 26) + SourceIndex(0)
+21>Emitted(42, 243) Source(86, 27) + SourceIndex(0)
+22>Emitted(42, 245) Source(86, 29) + SourceIndex(0)
+23>Emitted(42, 246) Source(86, 30) + SourceIndex(0)
+24>Emitted(42, 249) Source(86, 33) + SourceIndex(0)
+25>Emitted(42, 250) Source(86, 34) + SourceIndex(0)
+26>Emitted(42, 252) Source(86, 36) + SourceIndex(0)
+27>Emitted(42, 253) Source(86, 37) + SourceIndex(0)
+28>Emitted(42, 255) Source(86, 39) + SourceIndex(0)
+29>Emitted(42, 257) Source(86, 41) + SourceIndex(0)
+30>Emitted(42, 258) Source(86, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1695,86 +1629,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(44, 1) Source(88, 1) + SourceIndex(0)
 2 >Emitted(44, 2) Source(88, 2) + SourceIndex(0)
 ---
->>>for ((_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9),
+>>>for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^^
-9 >                                                                                                     ^^
-10>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                          ^^
-12>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                             ^^
-14>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                         ^^
-16>                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                              ^^
-18>                                                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                                                                              ^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                         ^^
+11>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                            ^^
+13>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                        ^^
+15>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                             ^^
+17>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          skills: {
-  >              primary = "primary",
-  >              secondary = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                    
-8 >                                                                                      skills: {
-  >                                                                                              primary = "primary",
-  >                                                                                              secondary = "secondary"
-  >                                                                                          } = { primary: "none", secondary: "none" }
-9 >                                                                                                     
-10>                                                                                                       skills: {
-  >                                                                                                               primary = "primary",
-  >                                                                                                               secondary = "secondary"
-  >                                                                                                           } = { primary: "none", secondary: "none" }
-11>                                                                                                                                                                          
-12>                                                                                                                                                                            primary = "primary"
-13>                                                                                                                                                                                             
-14>                                                                                                                                                                                               primary = "primary"
-15>                                                                                                                                                                                                                                         ,
-  >                                                                                                                                                                                                                                                 
-16>                                                                                                                                                                                                                                           secondary = "secondary"
-17>                                                                                                                                                                                                                                                              
-18>                                                                                                                                                                                                                                                                secondary = "secondary"
-19>                                                                                                                                                                                                                                                                                                              
-  >                                                                                                                                                                                                                                                                                                                  } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                              } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     {
+  >         skills: {
+  >             primary = "primary",
+  >             secondary = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                   
+7 >                                                                                     skills: {
+  >                                                                                             primary = "primary",
+  >                                                                                             secondary = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+8 >                                                                                                    
+9 >                                                                                                      skills: {
+  >                                                                                                              primary = "primary",
+  >                                                                                                              secondary = "secondary"
+  >                                                                                                          } = { primary: "none", secondary: "none" }
+10>                                                                                                                                                                         
+11>                                                                                                                                                                           primary = "primary"
+12>                                                                                                                                                                                            
+13>                                                                                                                                                                                              primary = "primary"
+14>                                                                                                                                                                                                                                        ,
+  >                                                                                                                                                                                                                                                
+15>                                                                                                                                                                                                                                          secondary = "secondary"
+16>                                                                                                                                                                                                                                                             
+17>                                                                                                                                                                                                                                                               secondary = "secondary"
 1->Emitted(45, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(89, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(89, 5) + SourceIndex(0)
 4 >Emitted(45, 6) Source(89, 6) + SourceIndex(0)
-5 >Emitted(45, 7) Source(89, 6) + SourceIndex(0)
-6 >Emitted(45, 85) Source(94, 90) + SourceIndex(0)
-7 >Emitted(45, 87) Source(90, 5) + SourceIndex(0)
-8 >Emitted(45, 102) Source(93, 47) + SourceIndex(0)
-9 >Emitted(45, 104) Source(90, 5) + SourceIndex(0)
-10>Emitted(45, 171) Source(93, 47) + SourceIndex(0)
-11>Emitted(45, 173) Source(91, 9) + SourceIndex(0)
-12>Emitted(45, 190) Source(91, 28) + SourceIndex(0)
-13>Emitted(45, 192) Source(91, 9) + SourceIndex(0)
-14>Emitted(45, 234) Source(91, 28) + SourceIndex(0)
-15>Emitted(45, 236) Source(92, 9) + SourceIndex(0)
-16>Emitted(45, 255) Source(92, 32) + SourceIndex(0)
-17>Emitted(45, 257) Source(92, 9) + SourceIndex(0)
-18>Emitted(45, 303) Source(92, 32) + SourceIndex(0)
-19>Emitted(45, 308) Source(94, 90) + SourceIndex(0)
+5 >Emitted(45, 84) Source(94, 90) + SourceIndex(0)
+6 >Emitted(45, 86) Source(90, 5) + SourceIndex(0)
+7 >Emitted(45, 101) Source(93, 47) + SourceIndex(0)
+8 >Emitted(45, 103) Source(90, 5) + SourceIndex(0)
+9 >Emitted(45, 170) Source(93, 47) + SourceIndex(0)
+10>Emitted(45, 172) Source(91, 9) + SourceIndex(0)
+11>Emitted(45, 189) Source(91, 28) + SourceIndex(0)
+12>Emitted(45, 191) Source(91, 9) + SourceIndex(0)
+13>Emitted(45, 233) Source(91, 28) + SourceIndex(0)
+14>Emitted(45, 235) Source(92, 9) + SourceIndex(0)
+15>Emitted(45, 254) Source(92, 32) + SourceIndex(0)
+16>Emitted(45, 256) Source(92, 9) + SourceIndex(0)
+17>Emitted(45, 302) Source(92, 32) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -1791,7 +1717,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 >
+  >    } = { primary: "none", secondary: "none" }
+  >} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
@@ -1849,101 +1777,95 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(48, 1) Source(97, 1) + SourceIndex(0)
 2 >Emitted(48, 2) Source(97, 2) + SourceIndex(0)
 ---
->>>for ((_14 = robot.name, nameA = _14 === void 0 ? "noName" : _14, _15 = robot.skill, skillA = _15 === void 0 ? "skill" : _15, robot), i = 0; i < 1; i++) {
+>>>for (_14 = robot.name, nameA = _14 === void 0 ? "noName" : _14, _15 = robot.skill, skillA = _15 === void 0 ? "skill" : _15, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^
-7 >                      ^^
-8 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                               ^^
-10>                                                                 ^^^^^^^^^^^^^^^^^
-11>                                                                                  ^^
-12>                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                           ^^
-14>                                                                                                                             ^^^^^
-15>                                                                                                                                  ^
-16>                                                                                                                                   ^^
-17>                                                                                                                                     ^
-18>                                                                                                                                      ^^^
-19>                                                                                                                                         ^
-20>                                                                                                                                          ^^
-21>                                                                                                                                            ^
-22>                                                                                                                                             ^^^
-23>                                                                                                                                                ^
-24>                                                                                                                                                 ^^
-25>                                                                                                                                                   ^
-26>                                                                                                                                                    ^^
-27>                                                                                                                                                      ^^
-28>                                                                                                                                                        ^
+5 >     ^^^^^^^^^^^^^^^^
+6 >                     ^^
+7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                              ^^
+9 >                                                                ^^^^^^^^^^^^^^^^^
+10>                                                                                 ^^
+11>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                          ^^
+13>                                                                                                                            ^^^^^
+14>                                                                                                                                 ^^
+15>                                                                                                                                   ^
+16>                                                                                                                                    ^^^
+17>                                                                                                                                       ^
+18>                                                                                                                                        ^^
+19>                                                                                                                                          ^
+20>                                                                                                                                           ^^^
+21>                                                                                                                                              ^
+22>                                                                                                                                               ^^
+23>                                                                                                                                                 ^
+24>                                                                                                                                                  ^^
+25>                                                                                                                                                    ^^
+26>                                                                                                                                                      ^
 1->
   >
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     {
-6 >      name: nameA = "noName"
-7 >                      
-8 >                        name: nameA = "noName"
-9 >                                                               , 
-10>                                                                 skill: skillA = "skill"
-11>                                                                                  
-12>                                                                                    skill: skillA = "skill"
-13>                                                                                                                            } = 
-14>                                                                                                                             robot
-15>                                                                                                                                  
-16>                                                                                                                                   , 
-17>                                                                                                                                     i
-18>                                                                                                                                       = 
-19>                                                                                                                                         0
-20>                                                                                                                                          ; 
-21>                                                                                                                                            i
-22>                                                                                                                                              < 
-23>                                                                                                                                                1
-24>                                                                                                                                                 ; 
-25>                                                                                                                                                   i
-26>                                                                                                                                                    ++
-27>                                                                                                                                                      ) 
-28>                                                                                                                                                        {
+4 >    ({
+5 >     name: nameA = "noName"
+6 >                     
+7 >                       name: nameA = "noName"
+8 >                                                              , 
+9 >                                                                skill: skillA = "skill"
+10>                                                                                 
+11>                                                                                   skill: skillA = "skill"
+12>                                                                                                                           } = 
+13>                                                                                                                            robot
+14>                                                                                                                                 , 
+15>                                                                                                                                   i
+16>                                                                                                                                     = 
+17>                                                                                                                                       0
+18>                                                                                                                                        ; 
+19>                                                                                                                                          i
+20>                                                                                                                                            < 
+21>                                                                                                                                              1
+22>                                                                                                                                               ; 
+23>                                                                                                                                                 i
+24>                                                                                                                                                  ++
+25>                                                                                                                                                    ) 
+26>                                                                                                                                                      {
 1->Emitted(49, 1) Source(100, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(100, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(100, 5) + SourceIndex(0)
-4 >Emitted(49, 6) Source(100, 6) + SourceIndex(0)
-5 >Emitted(49, 7) Source(100, 7) + SourceIndex(0)
-6 >Emitted(49, 23) Source(100, 29) + SourceIndex(0)
-7 >Emitted(49, 25) Source(100, 7) + SourceIndex(0)
-8 >Emitted(49, 64) Source(100, 29) + SourceIndex(0)
-9 >Emitted(49, 66) Source(100, 31) + SourceIndex(0)
-10>Emitted(49, 83) Source(100, 54) + SourceIndex(0)
-11>Emitted(49, 85) Source(100, 31) + SourceIndex(0)
-12>Emitted(49, 124) Source(100, 54) + SourceIndex(0)
-13>Emitted(49, 126) Source(100, 59) + SourceIndex(0)
-14>Emitted(49, 131) Source(100, 64) + SourceIndex(0)
-15>Emitted(49, 132) Source(100, 64) + SourceIndex(0)
-16>Emitted(49, 134) Source(100, 66) + SourceIndex(0)
-17>Emitted(49, 135) Source(100, 67) + SourceIndex(0)
-18>Emitted(49, 138) Source(100, 70) + SourceIndex(0)
-19>Emitted(49, 139) Source(100, 71) + SourceIndex(0)
-20>Emitted(49, 141) Source(100, 73) + SourceIndex(0)
-21>Emitted(49, 142) Source(100, 74) + SourceIndex(0)
-22>Emitted(49, 145) Source(100, 77) + SourceIndex(0)
-23>Emitted(49, 146) Source(100, 78) + SourceIndex(0)
-24>Emitted(49, 148) Source(100, 80) + SourceIndex(0)
-25>Emitted(49, 149) Source(100, 81) + SourceIndex(0)
-26>Emitted(49, 151) Source(100, 83) + SourceIndex(0)
-27>Emitted(49, 153) Source(100, 85) + SourceIndex(0)
-28>Emitted(49, 154) Source(100, 86) + SourceIndex(0)
+4 >Emitted(49, 6) Source(100, 7) + SourceIndex(0)
+5 >Emitted(49, 22) Source(100, 29) + SourceIndex(0)
+6 >Emitted(49, 24) Source(100, 7) + SourceIndex(0)
+7 >Emitted(49, 63) Source(100, 29) + SourceIndex(0)
+8 >Emitted(49, 65) Source(100, 31) + SourceIndex(0)
+9 >Emitted(49, 82) Source(100, 54) + SourceIndex(0)
+10>Emitted(49, 84) Source(100, 31) + SourceIndex(0)
+11>Emitted(49, 123) Source(100, 54) + SourceIndex(0)
+12>Emitted(49, 125) Source(100, 59) + SourceIndex(0)
+13>Emitted(49, 130) Source(100, 64) + SourceIndex(0)
+14>Emitted(49, 132) Source(100, 66) + SourceIndex(0)
+15>Emitted(49, 133) Source(100, 67) + SourceIndex(0)
+16>Emitted(49, 136) Source(100, 70) + SourceIndex(0)
+17>Emitted(49, 137) Source(100, 71) + SourceIndex(0)
+18>Emitted(49, 139) Source(100, 73) + SourceIndex(0)
+19>Emitted(49, 140) Source(100, 74) + SourceIndex(0)
+20>Emitted(49, 143) Source(100, 77) + SourceIndex(0)
+21>Emitted(49, 144) Source(100, 78) + SourceIndex(0)
+22>Emitted(49, 146) Source(100, 80) + SourceIndex(0)
+23>Emitted(49, 147) Source(100, 81) + SourceIndex(0)
+24>Emitted(49, 149) Source(100, 83) + SourceIndex(0)
+25>Emitted(49, 151) Source(100, 85) + SourceIndex(0)
+26>Emitted(49, 152) Source(100, 86) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1975,99 +1897,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(51, 1) Source(102, 1) + SourceIndex(0)
 2 >Emitted(51, 2) Source(102, 2) + SourceIndex(0)
 ---
->>>for ((_16 = getRobot(), _17 = _16.name, nameA = _17 === void 0 ? "noName" : _17, _18 = _16.skill, skillA = _18 === void 0 ? "skill" : _18, _16), i = 0; i < 1; i++) {
+>>>for (_16 = getRobot(), _17 = _16.name, nameA = _17 === void 0 ? "noName" : _17, _18 = _16.skill, skillA = _18 === void 0 ? "skill" : _18, _16, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^
-7 >                      ^^
-8 >                        ^^^^^^^^^^^^^^
-9 >                                      ^^
-10>                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                               ^^
-12>                                                                                 ^^^^^^^^^^^^^^^
-13>                                                                                                ^^
-14>                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                         ^^^^^^
-16>                                                                                                                                               ^^
-17>                                                                                                                                                 ^
-18>                                                                                                                                                  ^^^
-19>                                                                                                                                                     ^
-20>                                                                                                                                                      ^^
-21>                                                                                                                                                        ^
-22>                                                                                                                                                         ^^^
-23>                                                                                                                                                            ^
-24>                                                                                                                                                             ^^
-25>                                                                                                                                                               ^
-26>                                                                                                                                                                ^^
-27>                                                                                                                                                                  ^^
-28>                                                                                                                                                                    ^
+5 >     ^^^^^^^^^^^^^^^^
+6 >                     ^^
+7 >                       ^^^^^^^^^^^^^^
+8 >                                     ^^
+9 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                              ^^
+11>                                                                                ^^^^^^^^^^^^^^^
+12>                                                                                               ^^
+13>                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                        ^^^^^^^
+15>                                                                                                                                               ^
+16>                                                                                                                                                ^^^
+17>                                                                                                                                                   ^
+18>                                                                                                                                                    ^^
+19>                                                                                                                                                      ^
+20>                                                                                                                                                       ^^^
+21>                                                                                                                                                          ^
+22>                                                                                                                                                           ^^
+23>                                                                                                                                                             ^
+24>                                                                                                                                                              ^^
+25>                                                                                                                                                                ^^
+26>                                                                                                                                                                  ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {name: nameA = "noName", skill: skillA = "skill" } = getRobot()
-7 >                      
-8 >                        name: nameA = "noName"
-9 >                                      
-10>                                        name: nameA = "noName"
-11>                                                                               , 
-12>                                                                                 skill: skillA = "skill"
-13>                                                                                                
-14>                                                                                                  skill: skillA = "skill"
-15>                                                                                                                                          } = getRobot()
-16>                                                                                                                                               , 
-17>                                                                                                                                                 i
-18>                                                                                                                                                   = 
-19>                                                                                                                                                     0
-20>                                                                                                                                                      ; 
-21>                                                                                                                                                        i
-22>                                                                                                                                                          < 
-23>                                                                                                                                                            1
-24>                                                                                                                                                             ; 
-25>                                                                                                                                                               i
-26>                                                                                                                                                                ++
-27>                                                                                                                                                                  ) 
-28>                                                                                                                                                                    {
+5 >     {name: nameA = "noName", skill: skillA = "skill" } = getRobot()
+6 >                     
+7 >                       name: nameA = "noName"
+8 >                                     
+9 >                                       name: nameA = "noName"
+10>                                                                              , 
+11>                                                                                skill: skillA = "skill"
+12>                                                                                               
+13>                                                                                                 skill: skillA = "skill"
+14>                                                                                                                                         } = getRobot(), 
+15>                                                                                                                                               i
+16>                                                                                                                                                 = 
+17>                                                                                                                                                   0
+18>                                                                                                                                                    ; 
+19>                                                                                                                                                      i
+20>                                                                                                                                                        < 
+21>                                                                                                                                                          1
+22>                                                                                                                                                           ; 
+23>                                                                                                                                                             i
+24>                                                                                                                                                              ++
+25>                                                                                                                                                                ) 
+26>                                                                                                                                                                  {
 1->Emitted(52, 1) Source(103, 1) + SourceIndex(0)
 2 >Emitted(52, 4) Source(103, 4) + SourceIndex(0)
 3 >Emitted(52, 5) Source(103, 5) + SourceIndex(0)
 4 >Emitted(52, 6) Source(103, 6) + SourceIndex(0)
-5 >Emitted(52, 7) Source(103, 6) + SourceIndex(0)
-6 >Emitted(52, 23) Source(103, 69) + SourceIndex(0)
-7 >Emitted(52, 25) Source(103, 7) + SourceIndex(0)
-8 >Emitted(52, 39) Source(103, 29) + SourceIndex(0)
-9 >Emitted(52, 41) Source(103, 7) + SourceIndex(0)
-10>Emitted(52, 80) Source(103, 29) + SourceIndex(0)
-11>Emitted(52, 82) Source(103, 31) + SourceIndex(0)
-12>Emitted(52, 97) Source(103, 54) + SourceIndex(0)
-13>Emitted(52, 99) Source(103, 31) + SourceIndex(0)
-14>Emitted(52, 138) Source(103, 54) + SourceIndex(0)
-15>Emitted(52, 144) Source(103, 69) + SourceIndex(0)
-16>Emitted(52, 146) Source(103, 71) + SourceIndex(0)
-17>Emitted(52, 147) Source(103, 72) + SourceIndex(0)
-18>Emitted(52, 150) Source(103, 75) + SourceIndex(0)
-19>Emitted(52, 151) Source(103, 76) + SourceIndex(0)
-20>Emitted(52, 153) Source(103, 78) + SourceIndex(0)
-21>Emitted(52, 154) Source(103, 79) + SourceIndex(0)
-22>Emitted(52, 157) Source(103, 82) + SourceIndex(0)
-23>Emitted(52, 158) Source(103, 83) + SourceIndex(0)
-24>Emitted(52, 160) Source(103, 85) + SourceIndex(0)
-25>Emitted(52, 161) Source(103, 86) + SourceIndex(0)
-26>Emitted(52, 163) Source(103, 88) + SourceIndex(0)
-27>Emitted(52, 165) Source(103, 90) + SourceIndex(0)
-28>Emitted(52, 166) Source(103, 91) + SourceIndex(0)
+5 >Emitted(52, 22) Source(103, 69) + SourceIndex(0)
+6 >Emitted(52, 24) Source(103, 7) + SourceIndex(0)
+7 >Emitted(52, 38) Source(103, 29) + SourceIndex(0)
+8 >Emitted(52, 40) Source(103, 7) + SourceIndex(0)
+9 >Emitted(52, 79) Source(103, 29) + SourceIndex(0)
+10>Emitted(52, 81) Source(103, 31) + SourceIndex(0)
+11>Emitted(52, 96) Source(103, 54) + SourceIndex(0)
+12>Emitted(52, 98) Source(103, 31) + SourceIndex(0)
+13>Emitted(52, 137) Source(103, 54) + SourceIndex(0)
+14>Emitted(52, 144) Source(103, 71) + SourceIndex(0)
+15>Emitted(52, 145) Source(103, 72) + SourceIndex(0)
+16>Emitted(52, 148) Source(103, 75) + SourceIndex(0)
+17>Emitted(52, 149) Source(103, 76) + SourceIndex(0)
+18>Emitted(52, 151) Source(103, 78) + SourceIndex(0)
+19>Emitted(52, 152) Source(103, 79) + SourceIndex(0)
+20>Emitted(52, 155) Source(103, 82) + SourceIndex(0)
+21>Emitted(52, 156) Source(103, 83) + SourceIndex(0)
+22>Emitted(52, 158) Source(103, 85) + SourceIndex(0)
+23>Emitted(52, 159) Source(103, 86) + SourceIndex(0)
+24>Emitted(52, 161) Source(103, 88) + SourceIndex(0)
+25>Emitted(52, 163) Source(103, 90) + SourceIndex(0)
+26>Emitted(52, 164) Source(103, 91) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2099,99 +2015,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(54, 1) Source(105, 1) + SourceIndex(0)
 2 >Emitted(54, 2) Source(105, 2) + SourceIndex(0)
 ---
->>>for ((_19 = { name: "trimmer", skill: "trimming" }, _20 = _19.name, nameA = _20 === void 0 ? "noName" : _20, _21 = _19.skill, skillA = _21 === void 0 ? "skill" : _21, _19), i = 0; i < 1; i++) {
+>>>for (_19 = { name: "trimmer", skill: "trimming" }, _20 = _19.name, nameA = _20 === void 0 ? "noName" : _20, _21 = _19.skill, skillA = _21 === void 0 ? "skill" : _21, _19, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                  ^^
-8 >                                                    ^^^^^^^^^^^^^^
-9 >                                                                  ^^
-10>                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                           ^^
-12>                                                                                                             ^^^^^^^^^^^^^^^
-13>                                                                                                                            ^^
-14>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                     ^^^^^^
-16>                                                                                                                                                                           ^^
-17>                                                                                                                                                                             ^
-18>                                                                                                                                                                              ^^^
-19>                                                                                                                                                                                 ^
-20>                                                                                                                                                                                  ^^
-21>                                                                                                                                                                                    ^
-22>                                                                                                                                                                                     ^^^
-23>                                                                                                                                                                                        ^
-24>                                                                                                                                                                                         ^^
-25>                                                                                                                                                                                           ^
-26>                                                                                                                                                                                            ^^
-27>                                                                                                                                                                                              ^^
-28>                                                                                                                                                                                                ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                 ^^
+7 >                                                   ^^^^^^^^^^^^^^
+8 >                                                                 ^^
+9 >                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                          ^^
+11>                                                                                                            ^^^^^^^^^^^^^^^
+12>                                                                                                                           ^^
+13>                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                    ^^^^^^^
+15>                                                                                                                                                                           ^
+16>                                                                                                                                                                            ^^^
+17>                                                                                                                                                                               ^
+18>                                                                                                                                                                                ^^
+19>                                                                                                                                                                                  ^
+20>                                                                                                                                                                                   ^^^
+21>                                                                                                                                                                                      ^
+22>                                                                                                                                                                                       ^^
+23>                                                                                                                                                                                         ^
+24>                                                                                                                                                                                          ^^
+25>                                                                                                                                                                                            ^^
+26>                                                                                                                                                                                              ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                  
-8 >                                                    name: nameA = "noName"
-9 >                                                                  
-10>                                                                    name: nameA = "noName"
-11>                                                                                                           , 
-12>                                                                                                             skill: skillA = "skill"
-13>                                                                                                                            
-14>                                                                                                                              skill: skillA = "skill"
-15>                                                                                                                                                                      } = <Robot>{ name: "trimmer", skill: "trimming" }
-16>                                                                                                                                                                           , 
-17>                                                                                                                                                                             i
-18>                                                                                                                                                                               = 
-19>                                                                                                                                                                                 0
-20>                                                                                                                                                                                  ; 
-21>                                                                                                                                                                                    i
-22>                                                                                                                                                                                      < 
-23>                                                                                                                                                                                        1
-24>                                                                                                                                                                                         ; 
-25>                                                                                                                                                                                           i
-26>                                                                                                                                                                                            ++
-27>                                                                                                                                                                                              ) 
-28>                                                                                                                                                                                                {
+5 >     {name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                 
+7 >                                                   name: nameA = "noName"
+8 >                                                                 
+9 >                                                                   name: nameA = "noName"
+10>                                                                                                          , 
+11>                                                                                                            skill: skillA = "skill"
+12>                                                                                                                           
+13>                                                                                                                             skill: skillA = "skill"
+14>                                                                                                                                                                     } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+15>                                                                                                                                                                           i
+16>                                                                                                                                                                             = 
+17>                                                                                                                                                                               0
+18>                                                                                                                                                                                ; 
+19>                                                                                                                                                                                  i
+20>                                                                                                                                                                                    < 
+21>                                                                                                                                                                                      1
+22>                                                                                                                                                                                       ; 
+23>                                                                                                                                                                                         i
+24>                                                                                                                                                                                          ++
+25>                                                                                                                                                                                            ) 
+26>                                                                                                                                                                                              {
 1->Emitted(55, 1) Source(106, 1) + SourceIndex(0)
 2 >Emitted(55, 4) Source(106, 4) + SourceIndex(0)
 3 >Emitted(55, 5) Source(106, 5) + SourceIndex(0)
 4 >Emitted(55, 6) Source(106, 6) + SourceIndex(0)
-5 >Emitted(55, 7) Source(106, 6) + SourceIndex(0)
-6 >Emitted(55, 51) Source(106, 104) + SourceIndex(0)
-7 >Emitted(55, 53) Source(106, 7) + SourceIndex(0)
-8 >Emitted(55, 67) Source(106, 29) + SourceIndex(0)
-9 >Emitted(55, 69) Source(106, 7) + SourceIndex(0)
-10>Emitted(55, 108) Source(106, 29) + SourceIndex(0)
-11>Emitted(55, 110) Source(106, 31) + SourceIndex(0)
-12>Emitted(55, 125) Source(106, 54) + SourceIndex(0)
-13>Emitted(55, 127) Source(106, 31) + SourceIndex(0)
-14>Emitted(55, 166) Source(106, 54) + SourceIndex(0)
-15>Emitted(55, 172) Source(106, 104) + SourceIndex(0)
-16>Emitted(55, 174) Source(106, 106) + SourceIndex(0)
-17>Emitted(55, 175) Source(106, 107) + SourceIndex(0)
-18>Emitted(55, 178) Source(106, 110) + SourceIndex(0)
-19>Emitted(55, 179) Source(106, 111) + SourceIndex(0)
-20>Emitted(55, 181) Source(106, 113) + SourceIndex(0)
-21>Emitted(55, 182) Source(106, 114) + SourceIndex(0)
-22>Emitted(55, 185) Source(106, 117) + SourceIndex(0)
-23>Emitted(55, 186) Source(106, 118) + SourceIndex(0)
-24>Emitted(55, 188) Source(106, 120) + SourceIndex(0)
-25>Emitted(55, 189) Source(106, 121) + SourceIndex(0)
-26>Emitted(55, 191) Source(106, 123) + SourceIndex(0)
-27>Emitted(55, 193) Source(106, 125) + SourceIndex(0)
-28>Emitted(55, 194) Source(106, 126) + SourceIndex(0)
+5 >Emitted(55, 50) Source(106, 104) + SourceIndex(0)
+6 >Emitted(55, 52) Source(106, 7) + SourceIndex(0)
+7 >Emitted(55, 66) Source(106, 29) + SourceIndex(0)
+8 >Emitted(55, 68) Source(106, 7) + SourceIndex(0)
+9 >Emitted(55, 107) Source(106, 29) + SourceIndex(0)
+10>Emitted(55, 109) Source(106, 31) + SourceIndex(0)
+11>Emitted(55, 124) Source(106, 54) + SourceIndex(0)
+12>Emitted(55, 126) Source(106, 31) + SourceIndex(0)
+13>Emitted(55, 165) Source(106, 54) + SourceIndex(0)
+14>Emitted(55, 172) Source(106, 106) + SourceIndex(0)
+15>Emitted(55, 173) Source(106, 107) + SourceIndex(0)
+16>Emitted(55, 176) Source(106, 110) + SourceIndex(0)
+17>Emitted(55, 177) Source(106, 111) + SourceIndex(0)
+18>Emitted(55, 179) Source(106, 113) + SourceIndex(0)
+19>Emitted(55, 180) Source(106, 114) + SourceIndex(0)
+20>Emitted(55, 183) Source(106, 117) + SourceIndex(0)
+21>Emitted(55, 184) Source(106, 118) + SourceIndex(0)
+22>Emitted(55, 186) Source(106, 120) + SourceIndex(0)
+23>Emitted(55, 187) Source(106, 121) + SourceIndex(0)
+24>Emitted(55, 189) Source(106, 123) + SourceIndex(0)
+25>Emitted(55, 191) Source(106, 125) + SourceIndex(0)
+26>Emitted(55, 192) Source(106, 126) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2223,134 +2133,128 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(57, 1) Source(108, 1) + SourceIndex(0)
 2 >Emitted(57, 2) Source(108, 2) + SourceIndex(0)
 ---
->>>for ((_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot), i = 0; i < 1; i++) {
+>>>for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^
-7 >                           ^^
-8 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                    ^^
-10>                                                                      ^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                             ^^
-12>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                  ^^
-14>                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                     ^^
-16>                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                  ^^
-18>                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                       ^^
-20>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                                                                        ^^
-22>                                                                                                                                                                                                                                                                                                          ^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                    ^
-24>                                                                                                                                                                                                                                                                                                                     ^^
-25>                                                                                                                                                                                                                                                                                                                       ^
-26>                                                                                                                                                                                                                                                                                                                        ^^^
-27>                                                                                                                                                                                                                                                                                                                           ^
-28>                                                                                                                                                                                                                                                                                                                            ^^
-29>                                                                                                                                                                                                                                                                                                                              ^
-30>                                                                                                                                                                                                                                                                                                                               ^^^
-31>                                                                                                                                                                                                                                                                                                                                  ^
-32>                                                                                                                                                                                                                                                                                                                                   ^^
-33>                                                                                                                                                                                                                                                                                                                                     ^
-34>                                                                                                                                                                                                                                                                                                                                      ^^
-35>                                                                                                                                                                                                                                                                                                                                        ^^
-36>                                                                                                                                                                                                                                                                                                                                          ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                   ^^
+9 >                                                                     ^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                            ^^
+11>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                 ^^
+13>                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                    ^^
+15>                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                 ^^
+17>                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                      ^^
+19>                                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                       ^^
+21>                                                                                                                                                                                                                                                                                                         ^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                                   ^^
+23>                                                                                                                                                                                                                                                                                                                     ^
+24>                                                                                                                                                                                                                                                                                                                      ^^^
+25>                                                                                                                                                                                                                                                                                                                         ^
+26>                                                                                                                                                                                                                                                                                                                          ^^
+27>                                                                                                                                                                                                                                                                                                                            ^
+28>                                                                                                                                                                                                                                                                                                                             ^^^
+29>                                                                                                                                                                                                                                                                                                                                ^
+30>                                                                                                                                                                                                                                                                                                                                 ^^
+31>                                                                                                                                                                                                                                                                                                                                   ^
+32>                                                                                                                                                                                                                                                                                                                                    ^^
+33>                                                                                                                                                                                                                                                                                                                                      ^^
+34>                                                                                                                                                                                                                                                                                                                                        ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     {
-  >         
-6 >      name: nameA = "noName"
-7 >                           
-8 >                             name: nameA = "noName"
-9 >                                                                    ,
-  >                                                                        
-10>                                                                      skills: {
-  >                                                                              primary: primaryA = "primary",
-  >                                                                              secondary: secondaryA = "secondary"
-  >                                                                          } = { primary: "none", secondary: "none" }
-11>                                                                                             
-12>                                                                                               skills: {
-  >                                                                                                       primary: primaryA = "primary",
-  >                                                                                                       secondary: secondaryA = "secondary"
-  >                                                                                                   } = { primary: "none", secondary: "none" }
-13>                                                                                                                                                                  
-14>                                                                                                                                                                    primary: primaryA = "primary"
-15>                                                                                                                                                                                     
-16>                                                                                                                                                                                       primary: primaryA = "primary"
-17>                                                                                                                                                                                                                                  ,
-  >                                                                                                                                                                                                                                          
-18>                                                                                                                                                                                                                                    secondary: secondaryA = "secondary"
-19>                                                                                                                                                                                                                                                       
-20>                                                                                                                                                                                                                                                         secondary: secondaryA = "secondary"
-21>                                                                                                                                                                                                                                                                                                        
-  >                                                                                                                                                                                                                                                                                                            } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                        } = 
-22>                                                                                                                                                                                                                                                                                                          multiRobot
-23>                                                                                                                                                                                                                                                                                                                    
-24>                                                                                                                                                                                                                                                                                                                     , 
-25>                                                                                                                                                                                                                                                                                                                       i
-26>                                                                                                                                                                                                                                                                                                                         = 
-27>                                                                                                                                                                                                                                                                                                                           0
-28>                                                                                                                                                                                                                                                                                                                            ; 
-29>                                                                                                                                                                                                                                                                                                                              i
-30>                                                                                                                                                                                                                                                                                                                                < 
-31>                                                                                                                                                                                                                                                                                                                                  1
-32>                                                                                                                                                                                                                                                                                                                                   ; 
-33>                                                                                                                                                                                                                                                                                                                                     i
-34>                                                                                                                                                                                                                                                                                                                                      ++
-35>                                                                                                                                                                                                                                                                                                                                        ) 
-36>                                                                                                                                                                                                                                                                                                                                          {
+4 >    ({
+  >        
+5 >     name: nameA = "noName"
+6 >                          
+7 >                            name: nameA = "noName"
+8 >                                                                   ,
+  >                                                                       
+9 >                                                                     skills: {
+  >                                                                             primary: primaryA = "primary",
+  >                                                                             secondary: secondaryA = "secondary"
+  >                                                                         } = { primary: "none", secondary: "none" }
+10>                                                                                            
+11>                                                                                              skills: {
+  >                                                                                                      primary: primaryA = "primary",
+  >                                                                                                      secondary: secondaryA = "secondary"
+  >                                                                                                  } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                                 
+13>                                                                                                                                                                   primary: primaryA = "primary"
+14>                                                                                                                                                                                    
+15>                                                                                                                                                                                      primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                 ,
+  >                                                                                                                                                                                                                                         
+17>                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                                      
+19>                                                                                                                                                                                                                                                        secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                                                                       
+  >                                                                                                                                                                                                                                                                                                           } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                       } = 
+21>                                                                                                                                                                                                                                                                                                         multiRobot
+22>                                                                                                                                                                                                                                                                                                                   , 
+23>                                                                                                                                                                                                                                                                                                                     i
+24>                                                                                                                                                                                                                                                                                                                       = 
+25>                                                                                                                                                                                                                                                                                                                         0
+26>                                                                                                                                                                                                                                                                                                                          ; 
+27>                                                                                                                                                                                                                                                                                                                            i
+28>                                                                                                                                                                                                                                                                                                                              < 
+29>                                                                                                                                                                                                                                                                                                                                1
+30>                                                                                                                                                                                                                                                                                                                                 ; 
+31>                                                                                                                                                                                                                                                                                                                                   i
+32>                                                                                                                                                                                                                                                                                                                                    ++
+33>                                                                                                                                                                                                                                                                                                                                      ) 
+34>                                                                                                                                                                                                                                                                                                                                        {
 1->Emitted(58, 1) Source(109, 1) + SourceIndex(0)
 2 >Emitted(58, 4) Source(109, 4) + SourceIndex(0)
 3 >Emitted(58, 5) Source(109, 5) + SourceIndex(0)
-4 >Emitted(58, 6) Source(109, 6) + SourceIndex(0)
-5 >Emitted(58, 7) Source(110, 5) + SourceIndex(0)
-6 >Emitted(58, 28) Source(110, 27) + SourceIndex(0)
-7 >Emitted(58, 30) Source(110, 5) + SourceIndex(0)
-8 >Emitted(58, 69) Source(110, 27) + SourceIndex(0)
-9 >Emitted(58, 71) Source(111, 5) + SourceIndex(0)
-10>Emitted(58, 94) Source(114, 47) + SourceIndex(0)
-11>Emitted(58, 96) Source(111, 5) + SourceIndex(0)
-12>Emitted(58, 163) Source(114, 47) + SourceIndex(0)
-13>Emitted(58, 165) Source(112, 9) + SourceIndex(0)
-14>Emitted(58, 182) Source(112, 38) + SourceIndex(0)
-15>Emitted(58, 184) Source(112, 9) + SourceIndex(0)
-16>Emitted(58, 227) Source(112, 38) + SourceIndex(0)
-17>Emitted(58, 229) Source(113, 9) + SourceIndex(0)
-18>Emitted(58, 248) Source(113, 44) + SourceIndex(0)
-19>Emitted(58, 250) Source(113, 9) + SourceIndex(0)
-20>Emitted(58, 297) Source(113, 44) + SourceIndex(0)
-21>Emitted(58, 299) Source(115, 5) + SourceIndex(0)
-22>Emitted(58, 309) Source(115, 15) + SourceIndex(0)
-23>Emitted(58, 310) Source(115, 15) + SourceIndex(0)
-24>Emitted(58, 312) Source(115, 17) + SourceIndex(0)
-25>Emitted(58, 313) Source(115, 18) + SourceIndex(0)
-26>Emitted(58, 316) Source(115, 21) + SourceIndex(0)
-27>Emitted(58, 317) Source(115, 22) + SourceIndex(0)
-28>Emitted(58, 319) Source(115, 24) + SourceIndex(0)
-29>Emitted(58, 320) Source(115, 25) + SourceIndex(0)
-30>Emitted(58, 323) Source(115, 28) + SourceIndex(0)
-31>Emitted(58, 324) Source(115, 29) + SourceIndex(0)
-32>Emitted(58, 326) Source(115, 31) + SourceIndex(0)
-33>Emitted(58, 327) Source(115, 32) + SourceIndex(0)
-34>Emitted(58, 329) Source(115, 34) + SourceIndex(0)
-35>Emitted(58, 331) Source(115, 36) + SourceIndex(0)
-36>Emitted(58, 332) Source(115, 37) + SourceIndex(0)
+4 >Emitted(58, 6) Source(110, 5) + SourceIndex(0)
+5 >Emitted(58, 27) Source(110, 27) + SourceIndex(0)
+6 >Emitted(58, 29) Source(110, 5) + SourceIndex(0)
+7 >Emitted(58, 68) Source(110, 27) + SourceIndex(0)
+8 >Emitted(58, 70) Source(111, 5) + SourceIndex(0)
+9 >Emitted(58, 93) Source(114, 47) + SourceIndex(0)
+10>Emitted(58, 95) Source(111, 5) + SourceIndex(0)
+11>Emitted(58, 162) Source(114, 47) + SourceIndex(0)
+12>Emitted(58, 164) Source(112, 9) + SourceIndex(0)
+13>Emitted(58, 181) Source(112, 38) + SourceIndex(0)
+14>Emitted(58, 183) Source(112, 9) + SourceIndex(0)
+15>Emitted(58, 226) Source(112, 38) + SourceIndex(0)
+16>Emitted(58, 228) Source(113, 9) + SourceIndex(0)
+17>Emitted(58, 247) Source(113, 44) + SourceIndex(0)
+18>Emitted(58, 249) Source(113, 9) + SourceIndex(0)
+19>Emitted(58, 296) Source(113, 44) + SourceIndex(0)
+20>Emitted(58, 298) Source(115, 5) + SourceIndex(0)
+21>Emitted(58, 308) Source(115, 15) + SourceIndex(0)
+22>Emitted(58, 310) Source(115, 17) + SourceIndex(0)
+23>Emitted(58, 311) Source(115, 18) + SourceIndex(0)
+24>Emitted(58, 314) Source(115, 21) + SourceIndex(0)
+25>Emitted(58, 315) Source(115, 22) + SourceIndex(0)
+26>Emitted(58, 317) Source(115, 24) + SourceIndex(0)
+27>Emitted(58, 318) Source(115, 25) + SourceIndex(0)
+28>Emitted(58, 321) Source(115, 28) + SourceIndex(0)
+29>Emitted(58, 322) Source(115, 29) + SourceIndex(0)
+30>Emitted(58, 324) Source(115, 31) + SourceIndex(0)
+31>Emitted(58, 325) Source(115, 32) + SourceIndex(0)
+32>Emitted(58, 327) Source(115, 34) + SourceIndex(0)
+33>Emitted(58, 329) Source(115, 36) + SourceIndex(0)
+34>Emitted(58, 330) Source(115, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2382,139 +2286,133 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(60, 1) Source(117, 1) + SourceIndex(0)
 2 >Emitted(60, 2) Source(117, 2) + SourceIndex(0)
 ---
->>>for ((_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27), i = 0; i < 1; i++) {
+>>>for (_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^
-7 >                           ^^
-8 >                             ^^^^^^^^^^^^^^
-9 >                                           ^^
-10>                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                    ^^
-12>                                                                                      ^^^^^^^^^^^^^^^^
-13>                                                                                                      ^^
-14>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                           ^^
-16>                                                                                                                                                                             ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                              ^^
-18>                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                           ^^
-20>                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                                ^^
-22>                                                                                                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                 ^^^^^^
-24>                                                                                                                                                                                                                                                                                                                       ^^
-25>                                                                                                                                                                                                                                                                                                                         ^
-26>                                                                                                                                                                                                                                                                                                                          ^^^
-27>                                                                                                                                                                                                                                                                                                                             ^
-28>                                                                                                                                                                                                                                                                                                                              ^^
-29>                                                                                                                                                                                                                                                                                                                                ^
-30>                                                                                                                                                                                                                                                                                                                                 ^^^
-31>                                                                                                                                                                                                                                                                                                                                    ^
-32>                                                                                                                                                                                                                                                                                                                                     ^^
-33>                                                                                                                                                                                                                                                                                                                                       ^
-34>                                                                                                                                                                                                                                                                                                                                        ^^
-35>                                                                                                                                                                                                                                                                                                                                          ^^
-36>                                                                                                                                                                                                                                                                                                                                            ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                   ^^
+11>                                                                                     ^^^^^^^^^^^^^^^^
+12>                                                                                                     ^^
+13>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                          ^^
+15>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                             ^^
+17>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                          ^^
+19>                                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                               ^^
+21>                                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                                ^^^^^^^
+23>                                                                                                                                                                                                                                                                                                                       ^
+24>                                                                                                                                                                                                                                                                                                                        ^^^
+25>                                                                                                                                                                                                                                                                                                                           ^
+26>                                                                                                                                                                                                                                                                                                                            ^^
+27>                                                                                                                                                                                                                                                                                                                              ^
+28>                                                                                                                                                                                                                                                                                                                               ^^^
+29>                                                                                                                                                                                                                                                                                                                                  ^
+30>                                                                                                                                                                                                                                                                                                                                   ^^
+31>                                                                                                                                                                                                                                                                                                                                     ^
+32>                                                                                                                                                                                                                                                                                                                                      ^^
+33>                                                                                                                                                                                                                                                                                                                                        ^^
+34>                                                                                                                                                                                                                                                                                                                                          ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          name: nameA = "noName",
-  >          skills: {
-  >              primary: primaryA = "primary",
-  >              secondary: secondaryA = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = getMultiRobot()
-7 >                           
-8 >                             name: nameA = "noName"
-9 >                                           
-10>                                             name: nameA = "noName"
-11>                                                                                    ,
-  >                                                                                        
-12>                                                                                      skills: {
-  >                                                                                              primary: primaryA = "primary",
-  >                                                                                              secondary: secondaryA = "secondary"
-  >                                                                                          } = { primary: "none", secondary: "none" }
-13>                                                                                                      
-14>                                                                                                        skills: {
-  >                                                                                                                primary: primaryA = "primary",
-  >                                                                                                                secondary: secondaryA = "secondary"
-  >                                                                                                            } = { primary: "none", secondary: "none" }
-15>                                                                                                                                                                           
-16>                                                                                                                                                                             primary: primaryA = "primary"
-17>                                                                                                                                                                                              
-18>                                                                                                                                                                                                primary: primaryA = "primary"
-19>                                                                                                                                                                                                                                           ,
-  >                                                                                                                                                                                                                                                   
-20>                                                                                                                                                                                                                                             secondary: secondaryA = "secondary"
-21>                                                                                                                                                                                                                                                                
-22>                                                                                                                                                                                                                                                                  secondary: secondaryA = "secondary"
-23>                                                                                                                                                                                                                                                                                                                 
-  >                                                                                                                                                                                                                                                                                                                     } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                                 } = getMultiRobot()
-24>                                                                                                                                                                                                                                                                                                                       , 
-25>                                                                                                                                                                                                                                                                                                                         i
-26>                                                                                                                                                                                                                                                                                                                           = 
-27>                                                                                                                                                                                                                                                                                                                             0
-28>                                                                                                                                                                                                                                                                                                                              ; 
-29>                                                                                                                                                                                                                                                                                                                                i
-30>                                                                                                                                                                                                                                                                                                                                  < 
-31>                                                                                                                                                                                                                                                                                                                                    1
-32>                                                                                                                                                                                                                                                                                                                                     ; 
-33>                                                                                                                                                                                                                                                                                                                                       i
-34>                                                                                                                                                                                                                                                                                                                                        ++
-35>                                                                                                                                                                                                                                                                                                                                          ) 
-36>                                                                                                                                                                                                                                                                                                                                            {
+5 >     {
+  >         name: nameA = "noName",
+  >         skills: {
+  >             primary: primaryA = "primary",
+  >             secondary: secondaryA = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = getMultiRobot()
+6 >                          
+7 >                            name: nameA = "noName"
+8 >                                          
+9 >                                            name: nameA = "noName"
+10>                                                                                   ,
+  >                                                                                       
+11>                                                                                     skills: {
+  >                                                                                             primary: primaryA = "primary",
+  >                                                                                             secondary: secondaryA = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+12>                                                                                                     
+13>                                                                                                       skills: {
+  >                                                                                                               primary: primaryA = "primary",
+  >                                                                                                               secondary: secondaryA = "secondary"
+  >                                                                                                           } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                          
+15>                                                                                                                                                                            primary: primaryA = "primary"
+16>                                                                                                                                                                                             
+17>                                                                                                                                                                                               primary: primaryA = "primary"
+18>                                                                                                                                                                                                                                          ,
+  >                                                                                                                                                                                                                                                  
+19>                                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                               
+21>                                                                                                                                                                                                                                                                 secondary: secondaryA = "secondary"
+22>                                                                                                                                                                                                                                                                                                                
+  >                                                                                                                                                                                                                                                                                                                    } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                                } = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                                                       i
+24>                                                                                                                                                                                                                                                                                                                         = 
+25>                                                                                                                                                                                                                                                                                                                           0
+26>                                                                                                                                                                                                                                                                                                                            ; 
+27>                                                                                                                                                                                                                                                                                                                              i
+28>                                                                                                                                                                                                                                                                                                                                < 
+29>                                                                                                                                                                                                                                                                                                                                  1
+30>                                                                                                                                                                                                                                                                                                                                   ; 
+31>                                                                                                                                                                                                                                                                                                                                     i
+32>                                                                                                                                                                                                                                                                                                                                      ++
+33>                                                                                                                                                                                                                                                                                                                                        ) 
+34>                                                                                                                                                                                                                                                                                                                                          {
 1->Emitted(61, 1) Source(118, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(118, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(118, 5) + SourceIndex(0)
 4 >Emitted(61, 6) Source(118, 6) + SourceIndex(0)
-5 >Emitted(61, 7) Source(118, 6) + SourceIndex(0)
-6 >Emitted(61, 28) Source(124, 20) + SourceIndex(0)
-7 >Emitted(61, 30) Source(119, 5) + SourceIndex(0)
-8 >Emitted(61, 44) Source(119, 27) + SourceIndex(0)
-9 >Emitted(61, 46) Source(119, 5) + SourceIndex(0)
-10>Emitted(61, 85) Source(119, 27) + SourceIndex(0)
-11>Emitted(61, 87) Source(120, 5) + SourceIndex(0)
-12>Emitted(61, 103) Source(123, 47) + SourceIndex(0)
-13>Emitted(61, 105) Source(120, 5) + SourceIndex(0)
-14>Emitted(61, 172) Source(123, 47) + SourceIndex(0)
-15>Emitted(61, 174) Source(121, 9) + SourceIndex(0)
-16>Emitted(61, 191) Source(121, 38) + SourceIndex(0)
-17>Emitted(61, 193) Source(121, 9) + SourceIndex(0)
-18>Emitted(61, 236) Source(121, 38) + SourceIndex(0)
-19>Emitted(61, 238) Source(122, 9) + SourceIndex(0)
-20>Emitted(61, 257) Source(122, 44) + SourceIndex(0)
-21>Emitted(61, 259) Source(122, 9) + SourceIndex(0)
-22>Emitted(61, 306) Source(122, 44) + SourceIndex(0)
-23>Emitted(61, 312) Source(124, 20) + SourceIndex(0)
-24>Emitted(61, 314) Source(124, 22) + SourceIndex(0)
-25>Emitted(61, 315) Source(124, 23) + SourceIndex(0)
-26>Emitted(61, 318) Source(124, 26) + SourceIndex(0)
-27>Emitted(61, 319) Source(124, 27) + SourceIndex(0)
-28>Emitted(61, 321) Source(124, 29) + SourceIndex(0)
-29>Emitted(61, 322) Source(124, 30) + SourceIndex(0)
-30>Emitted(61, 325) Source(124, 33) + SourceIndex(0)
-31>Emitted(61, 326) Source(124, 34) + SourceIndex(0)
-32>Emitted(61, 328) Source(124, 36) + SourceIndex(0)
-33>Emitted(61, 329) Source(124, 37) + SourceIndex(0)
-34>Emitted(61, 331) Source(124, 39) + SourceIndex(0)
-35>Emitted(61, 333) Source(124, 41) + SourceIndex(0)
-36>Emitted(61, 334) Source(124, 42) + SourceIndex(0)
+5 >Emitted(61, 27) Source(124, 20) + SourceIndex(0)
+6 >Emitted(61, 29) Source(119, 5) + SourceIndex(0)
+7 >Emitted(61, 43) Source(119, 27) + SourceIndex(0)
+8 >Emitted(61, 45) Source(119, 5) + SourceIndex(0)
+9 >Emitted(61, 84) Source(119, 27) + SourceIndex(0)
+10>Emitted(61, 86) Source(120, 5) + SourceIndex(0)
+11>Emitted(61, 102) Source(123, 47) + SourceIndex(0)
+12>Emitted(61, 104) Source(120, 5) + SourceIndex(0)
+13>Emitted(61, 171) Source(123, 47) + SourceIndex(0)
+14>Emitted(61, 173) Source(121, 9) + SourceIndex(0)
+15>Emitted(61, 190) Source(121, 38) + SourceIndex(0)
+16>Emitted(61, 192) Source(121, 9) + SourceIndex(0)
+17>Emitted(61, 235) Source(121, 38) + SourceIndex(0)
+18>Emitted(61, 237) Source(122, 9) + SourceIndex(0)
+19>Emitted(61, 256) Source(122, 44) + SourceIndex(0)
+20>Emitted(61, 258) Source(122, 9) + SourceIndex(0)
+21>Emitted(61, 305) Source(122, 44) + SourceIndex(0)
+22>Emitted(61, 312) Source(124, 22) + SourceIndex(0)
+23>Emitted(61, 313) Source(124, 23) + SourceIndex(0)
+24>Emitted(61, 316) Source(124, 26) + SourceIndex(0)
+25>Emitted(61, 317) Source(124, 27) + SourceIndex(0)
+26>Emitted(61, 319) Source(124, 29) + SourceIndex(0)
+27>Emitted(61, 320) Source(124, 30) + SourceIndex(0)
+28>Emitted(61, 323) Source(124, 33) + SourceIndex(0)
+29>Emitted(61, 324) Source(124, 34) + SourceIndex(0)
+30>Emitted(61, 326) Source(124, 36) + SourceIndex(0)
+31>Emitted(61, 327) Source(124, 37) + SourceIndex(0)
+32>Emitted(61, 329) Source(124, 39) + SourceIndex(0)
+33>Emitted(61, 331) Source(124, 41) + SourceIndex(0)
+34>Emitted(61, 332) Source(124, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2546,100 +2444,92 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(63, 1) Source(126, 1) + SourceIndex(0)
 2 >Emitted(63, 2) Source(126, 2) + SourceIndex(0)
 ---
->>>for ((_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33),
+>>>for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                     ^^
-8 >                                                                                       ^^^^^^^^^^^^^^
-9 >                                                                                                     ^^
-10>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                              ^^
-12>                                                                                                                                                ^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                ^^
-14>                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                     ^^
-16>                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                        ^^
-18>                                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                                                                     ^^
-20>                                                                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                                                                                          ^^
-22>                                                                                                                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                                                                           ^^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^
+7 >                                                                                      ^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                             ^^
+11>                                                                                                                                               ^^^^^^^^^^^^^^^^
+12>                                                                                                                                                               ^^
+13>                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                    ^^
+15>                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                       ^^
+17>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                                    ^^
+19>                                                                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                                         ^^
+21>                                                                                                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          name: nameA = "noName",
-  >          skills: {
-  >              primary: primaryA = "primary",
-  >              secondary: secondaryA = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                     
-8 >                                                                                       name: nameA = "noName"
-9 >                                                                                                     
-10>                                                                                                       name: nameA = "noName"
-11>                                                                                                                                              ,
-  >                                                                                                                                                  
-12>                                                                                                                                                skills: {
-  >                                                                                                                                                        primary: primaryA = "primary",
-  >                                                                                                                                                        secondary: secondaryA = "secondary"
-  >                                                                                                                                                    } = { primary: "none", secondary: "none" }
-13>                                                                                                                                                                
-14>                                                                                                                                                                  skills: {
-  >                                                                                                                                                                          primary: primaryA = "primary",
-  >                                                                                                                                                                          secondary: secondaryA = "secondary"
-  >                                                                                                                                                                      } = { primary: "none", secondary: "none" }
-15>                                                                                                                                                                                                                                     
-16>                                                                                                                                                                                                                                       primary: primaryA = "primary"
-17>                                                                                                                                                                                                                                                        
-18>                                                                                                                                                                                                                                                          primary: primaryA = "primary"
-19>                                                                                                                                                                                                                                                                                                     ,
-  >                                                                                                                                                                                                                                                                                                             
-20>                                                                                                                                                                                                                                                                                                       secondary: secondaryA = "secondary"
-21>                                                                                                                                                                                                                                                                                                                          
-22>                                                                                                                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
-23>                                                                                                                                                                                                                                                                                                                                                                           
-  >                                                                                                                                                                                                                                                                                                                                                                               } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                                                                                           } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     {
+  >         name: nameA = "noName",
+  >         skills: {
+  >             primary: primaryA = "primary",
+  >             secondary: secondaryA = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                    
+7 >                                                                                      name: nameA = "noName"
+8 >                                                                                                    
+9 >                                                                                                      name: nameA = "noName"
+10>                                                                                                                                             ,
+  >                                                                                                                                                 
+11>                                                                                                                                               skills: {
+  >                                                                                                                                                       primary: primaryA = "primary",
+  >                                                                                                                                                       secondary: secondaryA = "secondary"
+  >                                                                                                                                                   } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                               
+13>                                                                                                                                                                 skills: {
+  >                                                                                                                                                                         primary: primaryA = "primary",
+  >                                                                                                                                                                         secondary: secondaryA = "secondary"
+  >                                                                                                                                                                     } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                                                                                    
+15>                                                                                                                                                                                                                                      primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                                       
+17>                                                                                                                                                                                                                                                         primary: primaryA = "primary"
+18>                                                                                                                                                                                                                                                                                                    ,
+  >                                                                                                                                                                                                                                                                                                            
+19>                                                                                                                                                                                                                                                                                                      secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                                                                                         
+21>                                                                                                                                                                                                                                                                                                                           secondary: secondaryA = "secondary"
 1->Emitted(64, 1) Source(127, 1) + SourceIndex(0)
 2 >Emitted(64, 4) Source(127, 4) + SourceIndex(0)
 3 >Emitted(64, 5) Source(127, 5) + SourceIndex(0)
 4 >Emitted(64, 6) Source(127, 6) + SourceIndex(0)
-5 >Emitted(64, 7) Source(127, 6) + SourceIndex(0)
-6 >Emitted(64, 86) Source(133, 90) + SourceIndex(0)
-7 >Emitted(64, 88) Source(128, 5) + SourceIndex(0)
-8 >Emitted(64, 102) Source(128, 27) + SourceIndex(0)
-9 >Emitted(64, 104) Source(128, 5) + SourceIndex(0)
-10>Emitted(64, 143) Source(128, 27) + SourceIndex(0)
-11>Emitted(64, 145) Source(129, 5) + SourceIndex(0)
-12>Emitted(64, 161) Source(132, 47) + SourceIndex(0)
-13>Emitted(64, 163) Source(129, 5) + SourceIndex(0)
-14>Emitted(64, 230) Source(132, 47) + SourceIndex(0)
-15>Emitted(64, 232) Source(130, 9) + SourceIndex(0)
-16>Emitted(64, 249) Source(130, 38) + SourceIndex(0)
-17>Emitted(64, 251) Source(130, 9) + SourceIndex(0)
-18>Emitted(64, 294) Source(130, 38) + SourceIndex(0)
-19>Emitted(64, 296) Source(131, 9) + SourceIndex(0)
-20>Emitted(64, 315) Source(131, 44) + SourceIndex(0)
-21>Emitted(64, 317) Source(131, 9) + SourceIndex(0)
-22>Emitted(64, 364) Source(131, 44) + SourceIndex(0)
-23>Emitted(64, 370) Source(133, 90) + SourceIndex(0)
+5 >Emitted(64, 85) Source(133, 90) + SourceIndex(0)
+6 >Emitted(64, 87) Source(128, 5) + SourceIndex(0)
+7 >Emitted(64, 101) Source(128, 27) + SourceIndex(0)
+8 >Emitted(64, 103) Source(128, 5) + SourceIndex(0)
+9 >Emitted(64, 142) Source(128, 27) + SourceIndex(0)
+10>Emitted(64, 144) Source(129, 5) + SourceIndex(0)
+11>Emitted(64, 160) Source(132, 47) + SourceIndex(0)
+12>Emitted(64, 162) Source(129, 5) + SourceIndex(0)
+13>Emitted(64, 229) Source(132, 47) + SourceIndex(0)
+14>Emitted(64, 231) Source(130, 9) + SourceIndex(0)
+15>Emitted(64, 248) Source(130, 38) + SourceIndex(0)
+16>Emitted(64, 250) Source(130, 9) + SourceIndex(0)
+17>Emitted(64, 293) Source(130, 38) + SourceIndex(0)
+18>Emitted(64, 295) Source(131, 9) + SourceIndex(0)
+19>Emitted(64, 314) Source(131, 44) + SourceIndex(0)
+20>Emitted(64, 316) Source(131, 9) + SourceIndex(0)
+21>Emitted(64, 363) Source(131, 44) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -2656,7 +2546,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 >
+  >    } = { primary: "none", secondary: "none" }
+  >} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
@@ -2714,100 +2606,94 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(67, 1) Source(136, 1) + SourceIndex(0)
 2 >Emitted(67, 2) Source(136, 2) + SourceIndex(0)
 ---
->>>for ((_39 = robot.name, name = _39 === void 0 ? "noName" : _39, _40 = robot.skill, skill = _40 === void 0 ? "skill" : _40, robot), i = 0; i < 1; i++) {
+>>>for (_39 = robot.name, name = _39 === void 0 ? "noName" : _39, _40 = robot.skill, skill = _40 === void 0 ? "skill" : _40, robot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^
-7 >                      ^^
-8 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                              ^^
-10>                                                                ^^^^^^^^^^^^^^^^^
-11>                                                                                 ^^
-12>                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                         ^^
-14>                                                                                                                           ^^^^^
-15>                                                                                                                                ^
-16>                                                                                                                                 ^^
-17>                                                                                                                                   ^
-18>                                                                                                                                    ^^^
-19>                                                                                                                                       ^
-20>                                                                                                                                        ^^
-21>                                                                                                                                          ^
-22>                                                                                                                                           ^^^
-23>                                                                                                                                              ^
-24>                                                                                                                                               ^^
-25>                                                                                                                                                 ^
-26>                                                                                                                                                  ^^
-27>                                                                                                                                                    ^^
-28>                                                                                                                                                      ^
+5 >     ^^^^^^^^^^^^^^^^
+6 >                     ^^
+7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                             ^^
+9 >                                                               ^^^^^^^^^^^^^^^^^
+10>                                                                                ^^
+11>                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                        ^^
+13>                                                                                                                          ^^^^^
+14>                                                                                                                               ^^
+15>                                                                                                                                 ^
+16>                                                                                                                                  ^^^
+17>                                                                                                                                     ^
+18>                                                                                                                                      ^^
+19>                                                                                                                                        ^
+20>                                                                                                                                         ^^^
+21>                                                                                                                                            ^
+22>                                                                                                                                             ^^
+23>                                                                                                                                               ^
+24>                                                                                                                                                ^^
+25>                                                                                                                                                  ^^
+26>                                                                                                                                                    ^
 1->
   >
   >
 2 >for
 3 >    
-4 >    (
-5 >     { 
-6 >      name = "noName"
-7 >                      
-8 >                        name = "noName"
-9 >                                                              , 
-10>                                                                skill = "skill"
-11>                                                                                 
-12>                                                                                   skill = "skill"
-13>                                                                                                                          } = 
-14>                                                                                                                           robot
-15>                                                                                                                                
-16>                                                                                                                                 , 
-17>                                                                                                                                   i
-18>                                                                                                                                     = 
-19>                                                                                                                                       0
-20>                                                                                                                                        ; 
-21>                                                                                                                                          i
-22>                                                                                                                                            < 
-23>                                                                                                                                              1
-24>                                                                                                                                               ; 
-25>                                                                                                                                                 i
-26>                                                                                                                                                  ++
-27>                                                                                                                                                    ) 
-28>                                                                                                                                                      {
+4 >    ({ 
+5 >     name = "noName"
+6 >                     
+7 >                       name = "noName"
+8 >                                                             , 
+9 >                                                               skill = "skill"
+10>                                                                                
+11>                                                                                  skill = "skill"
+12>                                                                                                                         } = 
+13>                                                                                                                          robot
+14>                                                                                                                               , 
+15>                                                                                                                                 i
+16>                                                                                                                                   = 
+17>                                                                                                                                     0
+18>                                                                                                                                      ; 
+19>                                                                                                                                        i
+20>                                                                                                                                          < 
+21>                                                                                                                                            1
+22>                                                                                                                                             ; 
+23>                                                                                                                                               i
+24>                                                                                                                                                ++
+25>                                                                                                                                                  ) 
+26>                                                                                                                                                    {
 1->Emitted(68, 1) Source(138, 1) + SourceIndex(0)
 2 >Emitted(68, 4) Source(138, 4) + SourceIndex(0)
 3 >Emitted(68, 5) Source(138, 5) + SourceIndex(0)
-4 >Emitted(68, 6) Source(138, 6) + SourceIndex(0)
-5 >Emitted(68, 7) Source(138, 8) + SourceIndex(0)
-6 >Emitted(68, 23) Source(138, 23) + SourceIndex(0)
-7 >Emitted(68, 25) Source(138, 8) + SourceIndex(0)
-8 >Emitted(68, 63) Source(138, 23) + SourceIndex(0)
-9 >Emitted(68, 65) Source(138, 25) + SourceIndex(0)
-10>Emitted(68, 82) Source(138, 40) + SourceIndex(0)
-11>Emitted(68, 84) Source(138, 25) + SourceIndex(0)
-12>Emitted(68, 122) Source(138, 40) + SourceIndex(0)
-13>Emitted(68, 124) Source(138, 45) + SourceIndex(0)
-14>Emitted(68, 129) Source(138, 50) + SourceIndex(0)
-15>Emitted(68, 130) Source(138, 50) + SourceIndex(0)
-16>Emitted(68, 132) Source(138, 52) + SourceIndex(0)
-17>Emitted(68, 133) Source(138, 53) + SourceIndex(0)
-18>Emitted(68, 136) Source(138, 56) + SourceIndex(0)
-19>Emitted(68, 137) Source(138, 57) + SourceIndex(0)
-20>Emitted(68, 139) Source(138, 59) + SourceIndex(0)
-21>Emitted(68, 140) Source(138, 60) + SourceIndex(0)
-22>Emitted(68, 143) Source(138, 63) + SourceIndex(0)
-23>Emitted(68, 144) Source(138, 64) + SourceIndex(0)
-24>Emitted(68, 146) Source(138, 66) + SourceIndex(0)
-25>Emitted(68, 147) Source(138, 67) + SourceIndex(0)
-26>Emitted(68, 149) Source(138, 69) + SourceIndex(0)
-27>Emitted(68, 151) Source(138, 71) + SourceIndex(0)
-28>Emitted(68, 152) Source(138, 72) + SourceIndex(0)
+4 >Emitted(68, 6) Source(138, 8) + SourceIndex(0)
+5 >Emitted(68, 22) Source(138, 23) + SourceIndex(0)
+6 >Emitted(68, 24) Source(138, 8) + SourceIndex(0)
+7 >Emitted(68, 62) Source(138, 23) + SourceIndex(0)
+8 >Emitted(68, 64) Source(138, 25) + SourceIndex(0)
+9 >Emitted(68, 81) Source(138, 40) + SourceIndex(0)
+10>Emitted(68, 83) Source(138, 25) + SourceIndex(0)
+11>Emitted(68, 121) Source(138, 40) + SourceIndex(0)
+12>Emitted(68, 123) Source(138, 45) + SourceIndex(0)
+13>Emitted(68, 128) Source(138, 50) + SourceIndex(0)
+14>Emitted(68, 130) Source(138, 52) + SourceIndex(0)
+15>Emitted(68, 131) Source(138, 53) + SourceIndex(0)
+16>Emitted(68, 134) Source(138, 56) + SourceIndex(0)
+17>Emitted(68, 135) Source(138, 57) + SourceIndex(0)
+18>Emitted(68, 137) Source(138, 59) + SourceIndex(0)
+19>Emitted(68, 138) Source(138, 60) + SourceIndex(0)
+20>Emitted(68, 141) Source(138, 63) + SourceIndex(0)
+21>Emitted(68, 142) Source(138, 64) + SourceIndex(0)
+22>Emitted(68, 144) Source(138, 66) + SourceIndex(0)
+23>Emitted(68, 145) Source(138, 67) + SourceIndex(0)
+24>Emitted(68, 147) Source(138, 69) + SourceIndex(0)
+25>Emitted(68, 149) Source(138, 71) + SourceIndex(0)
+26>Emitted(68, 150) Source(138, 72) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2839,99 +2725,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(70, 1) Source(140, 1) + SourceIndex(0)
 2 >Emitted(70, 2) Source(140, 2) + SourceIndex(0)
 ---
->>>for ((_41 = getRobot(), _42 = _41.name, name = _42 === void 0 ? "noName" : _42, _43 = _41.skill, skill = _43 === void 0 ? "skill" : _43, _41), i = 0; i < 1; i++) {
+>>>for (_41 = getRobot(), _42 = _41.name, name = _42 === void 0 ? "noName" : _42, _43 = _41.skill, skill = _43 === void 0 ? "skill" : _43, _41, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^
-7 >                      ^^
-8 >                        ^^^^^^^^^^^^^^
-9 >                                      ^^
-10>                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                              ^^
-12>                                                                                ^^^^^^^^^^^^^^^
-13>                                                                                               ^^
-14>                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                       ^^^^^^
-16>                                                                                                                                             ^^
-17>                                                                                                                                               ^
-18>                                                                                                                                                ^^^
-19>                                                                                                                                                   ^
-20>                                                                                                                                                    ^^
-21>                                                                                                                                                      ^
-22>                                                                                                                                                       ^^^
-23>                                                                                                                                                          ^
-24>                                                                                                                                                           ^^
-25>                                                                                                                                                             ^
-26>                                                                                                                                                              ^^
-27>                                                                                                                                                                ^^
-28>                                                                                                                                                                  ^
+5 >     ^^^^^^^^^^^^^^^^
+6 >                     ^^
+7 >                       ^^^^^^^^^^^^^^
+8 >                                     ^^
+9 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                             ^^
+11>                                                                               ^^^^^^^^^^^^^^^
+12>                                                                                              ^^
+13>                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                      ^^^^^^^
+15>                                                                                                                                             ^
+16>                                                                                                                                              ^^^
+17>                                                                                                                                                 ^
+18>                                                                                                                                                  ^^
+19>                                                                                                                                                    ^
+20>                                                                                                                                                     ^^^
+21>                                                                                                                                                        ^
+22>                                                                                                                                                         ^^
+23>                                                                                                                                                           ^
+24>                                                                                                                                                            ^^
+25>                                                                                                                                                              ^^
+26>                                                                                                                                                                ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name = "noName", skill = "skill" } = getRobot()
-7 >                      
-8 >                        name = "noName"
-9 >                                      
-10>                                        name = "noName"
-11>                                                                              , 
-12>                                                                                skill = "skill"
-13>                                                                                               
-14>                                                                                                 skill = "skill"
-15>                                                                                                                                        } = getRobot()
-16>                                                                                                                                             , 
-17>                                                                                                                                               i
-18>                                                                                                                                                 = 
-19>                                                                                                                                                   0
-20>                                                                                                                                                    ; 
-21>                                                                                                                                                      i
-22>                                                                                                                                                        < 
-23>                                                                                                                                                          1
-24>                                                                                                                                                           ; 
-25>                                                                                                                                                             i
-26>                                                                                                                                                              ++
-27>                                                                                                                                                                ) 
-28>                                                                                                                                                                  {
+5 >     { name = "noName", skill = "skill" } = getRobot()
+6 >                     
+7 >                       name = "noName"
+8 >                                     
+9 >                                       name = "noName"
+10>                                                                             , 
+11>                                                                               skill = "skill"
+12>                                                                                              
+13>                                                                                                skill = "skill"
+14>                                                                                                                                       } = getRobot(), 
+15>                                                                                                                                             i
+16>                                                                                                                                               = 
+17>                                                                                                                                                 0
+18>                                                                                                                                                  ; 
+19>                                                                                                                                                    i
+20>                                                                                                                                                      < 
+21>                                                                                                                                                        1
+22>                                                                                                                                                         ; 
+23>                                                                                                                                                           i
+24>                                                                                                                                                            ++
+25>                                                                                                                                                              ) 
+26>                                                                                                                                                                {
 1->Emitted(71, 1) Source(141, 1) + SourceIndex(0)
 2 >Emitted(71, 4) Source(141, 4) + SourceIndex(0)
 3 >Emitted(71, 5) Source(141, 5) + SourceIndex(0)
 4 >Emitted(71, 6) Source(141, 6) + SourceIndex(0)
-5 >Emitted(71, 7) Source(141, 6) + SourceIndex(0)
-6 >Emitted(71, 23) Source(141, 55) + SourceIndex(0)
-7 >Emitted(71, 25) Source(141, 8) + SourceIndex(0)
-8 >Emitted(71, 39) Source(141, 23) + SourceIndex(0)
-9 >Emitted(71, 41) Source(141, 8) + SourceIndex(0)
-10>Emitted(71, 79) Source(141, 23) + SourceIndex(0)
-11>Emitted(71, 81) Source(141, 25) + SourceIndex(0)
-12>Emitted(71, 96) Source(141, 40) + SourceIndex(0)
-13>Emitted(71, 98) Source(141, 25) + SourceIndex(0)
-14>Emitted(71, 136) Source(141, 40) + SourceIndex(0)
-15>Emitted(71, 142) Source(141, 55) + SourceIndex(0)
-16>Emitted(71, 144) Source(141, 57) + SourceIndex(0)
-17>Emitted(71, 145) Source(141, 58) + SourceIndex(0)
-18>Emitted(71, 148) Source(141, 61) + SourceIndex(0)
-19>Emitted(71, 149) Source(141, 62) + SourceIndex(0)
-20>Emitted(71, 151) Source(141, 64) + SourceIndex(0)
-21>Emitted(71, 152) Source(141, 65) + SourceIndex(0)
-22>Emitted(71, 155) Source(141, 68) + SourceIndex(0)
-23>Emitted(71, 156) Source(141, 69) + SourceIndex(0)
-24>Emitted(71, 158) Source(141, 71) + SourceIndex(0)
-25>Emitted(71, 159) Source(141, 72) + SourceIndex(0)
-26>Emitted(71, 161) Source(141, 74) + SourceIndex(0)
-27>Emitted(71, 163) Source(141, 76) + SourceIndex(0)
-28>Emitted(71, 164) Source(141, 77) + SourceIndex(0)
+5 >Emitted(71, 22) Source(141, 55) + SourceIndex(0)
+6 >Emitted(71, 24) Source(141, 8) + SourceIndex(0)
+7 >Emitted(71, 38) Source(141, 23) + SourceIndex(0)
+8 >Emitted(71, 40) Source(141, 8) + SourceIndex(0)
+9 >Emitted(71, 78) Source(141, 23) + SourceIndex(0)
+10>Emitted(71, 80) Source(141, 25) + SourceIndex(0)
+11>Emitted(71, 95) Source(141, 40) + SourceIndex(0)
+12>Emitted(71, 97) Source(141, 25) + SourceIndex(0)
+13>Emitted(71, 135) Source(141, 40) + SourceIndex(0)
+14>Emitted(71, 142) Source(141, 57) + SourceIndex(0)
+15>Emitted(71, 143) Source(141, 58) + SourceIndex(0)
+16>Emitted(71, 146) Source(141, 61) + SourceIndex(0)
+17>Emitted(71, 147) Source(141, 62) + SourceIndex(0)
+18>Emitted(71, 149) Source(141, 64) + SourceIndex(0)
+19>Emitted(71, 150) Source(141, 65) + SourceIndex(0)
+20>Emitted(71, 153) Source(141, 68) + SourceIndex(0)
+21>Emitted(71, 154) Source(141, 69) + SourceIndex(0)
+22>Emitted(71, 156) Source(141, 71) + SourceIndex(0)
+23>Emitted(71, 157) Source(141, 72) + SourceIndex(0)
+24>Emitted(71, 159) Source(141, 74) + SourceIndex(0)
+25>Emitted(71, 161) Source(141, 76) + SourceIndex(0)
+26>Emitted(71, 162) Source(141, 77) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2963,99 +2843,93 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(73, 1) Source(143, 1) + SourceIndex(0)
 2 >Emitted(73, 2) Source(143, 2) + SourceIndex(0)
 ---
->>>for ((_44 = { name: "trimmer", skill: "trimming" }, _45 = _44.name, name = _45 === void 0 ? "noName" : _45, _46 = _44.skill, skill = _46 === void 0 ? "skill" : _46, _44), i = 0; i < 1; i++) {
+>>>for (_44 = { name: "trimmer", skill: "trimming" }, _45 = _44.name, name = _45 === void 0 ? "noName" : _45, _46 = _44.skill, skill = _46 === void 0 ? "skill" : _46, _44, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                  ^^
-8 >                                                    ^^^^^^^^^^^^^^
-9 >                                                                  ^^
-10>                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                          ^^
-12>                                                                                                            ^^^^^^^^^^^^^^^
-13>                                                                                                                           ^^
-14>                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                   ^^^^^^
-16>                                                                                                                                                                         ^^
-17>                                                                                                                                                                           ^
-18>                                                                                                                                                                            ^^^
-19>                                                                                                                                                                               ^
-20>                                                                                                                                                                                ^^
-21>                                                                                                                                                                                  ^
-22>                                                                                                                                                                                   ^^^
-23>                                                                                                                                                                                      ^
-24>                                                                                                                                                                                       ^^
-25>                                                                                                                                                                                         ^
-26>                                                                                                                                                                                          ^^
-27>                                                                                                                                                                                            ^^
-28>                                                                                                                                                                                              ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                 ^^
+7 >                                                   ^^^^^^^^^^^^^^
+8 >                                                                 ^^
+9 >                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                         ^^
+11>                                                                                                           ^^^^^^^^^^^^^^^
+12>                                                                                                                          ^^
+13>                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                  ^^^^^^^
+15>                                                                                                                                                                         ^
+16>                                                                                                                                                                          ^^^
+17>                                                                                                                                                                             ^
+18>                                                                                                                                                                              ^^
+19>                                                                                                                                                                                ^
+20>                                                                                                                                                                                 ^^^
+21>                                                                                                                                                                                    ^
+22>                                                                                                                                                                                     ^^
+23>                                                                                                                                                                                       ^
+24>                                                                                                                                                                                        ^^
+25>                                                                                                                                                                                          ^^
+26>                                                                                                                                                                                            ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      { name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }
-7 >                                                  
-8 >                                                    name = "noName"
-9 >                                                                  
-10>                                                                    name = "noName"
-11>                                                                                                          , 
-12>                                                                                                            skill = "skill"
-13>                                                                                                                           
-14>                                                                                                                             skill = "skill"
-15>                                                                                                                                                                    } = <Robot>{ name: "trimmer", skill: "trimming" }
-16>                                                                                                                                                                         , 
-17>                                                                                                                                                                           i
-18>                                                                                                                                                                             = 
-19>                                                                                                                                                                               0
-20>                                                                                                                                                                                ; 
-21>                                                                                                                                                                                  i
-22>                                                                                                                                                                                    < 
-23>                                                                                                                                                                                      1
-24>                                                                                                                                                                                       ; 
-25>                                                                                                                                                                                         i
-26>                                                                                                                                                                                          ++
-27>                                                                                                                                                                                            ) 
-28>                                                                                                                                                                                              {
+5 >     { name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }
+6 >                                                 
+7 >                                                   name = "noName"
+8 >                                                                 
+9 >                                                                   name = "noName"
+10>                                                                                                         , 
+11>                                                                                                           skill = "skill"
+12>                                                                                                                          
+13>                                                                                                                            skill = "skill"
+14>                                                                                                                                                                   } = <Robot>{ name: "trimmer", skill: "trimming" }, 
+15>                                                                                                                                                                         i
+16>                                                                                                                                                                           = 
+17>                                                                                                                                                                             0
+18>                                                                                                                                                                              ; 
+19>                                                                                                                                                                                i
+20>                                                                                                                                                                                  < 
+21>                                                                                                                                                                                    1
+22>                                                                                                                                                                                     ; 
+23>                                                                                                                                                                                       i
+24>                                                                                                                                                                                        ++
+25>                                                                                                                                                                                          ) 
+26>                                                                                                                                                                                            {
 1->Emitted(74, 1) Source(144, 1) + SourceIndex(0)
 2 >Emitted(74, 4) Source(144, 4) + SourceIndex(0)
 3 >Emitted(74, 5) Source(144, 5) + SourceIndex(0)
 4 >Emitted(74, 6) Source(144, 6) + SourceIndex(0)
-5 >Emitted(74, 7) Source(144, 6) + SourceIndex(0)
-6 >Emitted(74, 51) Source(144, 90) + SourceIndex(0)
-7 >Emitted(74, 53) Source(144, 8) + SourceIndex(0)
-8 >Emitted(74, 67) Source(144, 23) + SourceIndex(0)
-9 >Emitted(74, 69) Source(144, 8) + SourceIndex(0)
-10>Emitted(74, 107) Source(144, 23) + SourceIndex(0)
-11>Emitted(74, 109) Source(144, 25) + SourceIndex(0)
-12>Emitted(74, 124) Source(144, 40) + SourceIndex(0)
-13>Emitted(74, 126) Source(144, 25) + SourceIndex(0)
-14>Emitted(74, 164) Source(144, 40) + SourceIndex(0)
-15>Emitted(74, 170) Source(144, 90) + SourceIndex(0)
-16>Emitted(74, 172) Source(144, 92) + SourceIndex(0)
-17>Emitted(74, 173) Source(144, 93) + SourceIndex(0)
-18>Emitted(74, 176) Source(144, 96) + SourceIndex(0)
-19>Emitted(74, 177) Source(144, 97) + SourceIndex(0)
-20>Emitted(74, 179) Source(144, 99) + SourceIndex(0)
-21>Emitted(74, 180) Source(144, 100) + SourceIndex(0)
-22>Emitted(74, 183) Source(144, 103) + SourceIndex(0)
-23>Emitted(74, 184) Source(144, 104) + SourceIndex(0)
-24>Emitted(74, 186) Source(144, 106) + SourceIndex(0)
-25>Emitted(74, 187) Source(144, 107) + SourceIndex(0)
-26>Emitted(74, 189) Source(144, 109) + SourceIndex(0)
-27>Emitted(74, 191) Source(144, 111) + SourceIndex(0)
-28>Emitted(74, 192) Source(144, 112) + SourceIndex(0)
+5 >Emitted(74, 50) Source(144, 90) + SourceIndex(0)
+6 >Emitted(74, 52) Source(144, 8) + SourceIndex(0)
+7 >Emitted(74, 66) Source(144, 23) + SourceIndex(0)
+8 >Emitted(74, 68) Source(144, 8) + SourceIndex(0)
+9 >Emitted(74, 106) Source(144, 23) + SourceIndex(0)
+10>Emitted(74, 108) Source(144, 25) + SourceIndex(0)
+11>Emitted(74, 123) Source(144, 40) + SourceIndex(0)
+12>Emitted(74, 125) Source(144, 25) + SourceIndex(0)
+13>Emitted(74, 163) Source(144, 40) + SourceIndex(0)
+14>Emitted(74, 170) Source(144, 92) + SourceIndex(0)
+15>Emitted(74, 171) Source(144, 93) + SourceIndex(0)
+16>Emitted(74, 174) Source(144, 96) + SourceIndex(0)
+17>Emitted(74, 175) Source(144, 97) + SourceIndex(0)
+18>Emitted(74, 177) Source(144, 99) + SourceIndex(0)
+19>Emitted(74, 178) Source(144, 100) + SourceIndex(0)
+20>Emitted(74, 181) Source(144, 103) + SourceIndex(0)
+21>Emitted(74, 182) Source(144, 104) + SourceIndex(0)
+22>Emitted(74, 184) Source(144, 106) + SourceIndex(0)
+23>Emitted(74, 185) Source(144, 107) + SourceIndex(0)
+24>Emitted(74, 187) Source(144, 109) + SourceIndex(0)
+25>Emitted(74, 189) Source(144, 111) + SourceIndex(0)
+26>Emitted(74, 190) Source(144, 112) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3087,134 +2961,128 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(76, 1) Source(146, 1) + SourceIndex(0)
 2 >Emitted(76, 2) Source(146, 2) + SourceIndex(0)
 ---
->>>for ((_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot), i = 0; i < 1; i++) {
+>>>for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^
-7 >                           ^^
-8 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                   ^^
-10>                                                                     ^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                            ^^
-12>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                 ^^
-14>                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                    ^^
-16>                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                ^^
-18>                                                                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                     ^^
-20>                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                                                                     ^^
-22>                                                                                                                                                                                                                                                                                                       ^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                 ^
-24>                                                                                                                                                                                                                                                                                                                  ^^
-25>                                                                                                                                                                                                                                                                                                                    ^
-26>                                                                                                                                                                                                                                                                                                                     ^^^
-27>                                                                                                                                                                                                                                                                                                                        ^
-28>                                                                                                                                                                                                                                                                                                                         ^^
-29>                                                                                                                                                                                                                                                                                                                           ^
-30>                                                                                                                                                                                                                                                                                                                            ^^^
-31>                                                                                                                                                                                                                                                                                                                               ^
-32>                                                                                                                                                                                                                                                                                                                                ^^
-33>                                                                                                                                                                                                                                                                                                                                  ^
-34>                                                                                                                                                                                                                                                                                                                                   ^^
-35>                                                                                                                                                                                                                                                                                                                                     ^^
-36>                                                                                                                                                                                                                                                                                                                                       ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                  ^^
+9 >                                                                    ^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                           ^^
+11>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                ^^
+13>                                                                                                                                                                  ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                   ^^
+15>                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                               ^^
+17>                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                    ^^
+19>                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                    ^^
+21>                                                                                                                                                                                                                                                                                                      ^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                                ^^
+23>                                                                                                                                                                                                                                                                                                                  ^
+24>                                                                                                                                                                                                                                                                                                                   ^^^
+25>                                                                                                                                                                                                                                                                                                                      ^
+26>                                                                                                                                                                                                                                                                                                                       ^^
+27>                                                                                                                                                                                                                                                                                                                         ^
+28>                                                                                                                                                                                                                                                                                                                          ^^^
+29>                                                                                                                                                                                                                                                                                                                             ^
+30>                                                                                                                                                                                                                                                                                                                              ^^
+31>                                                                                                                                                                                                                                                                                                                                ^
+32>                                                                                                                                                                                                                                                                                                                                 ^^
+33>                                                                                                                                                                                                                                                                                                                                   ^^
+34>                                                                                                                                                                                                                                                                                                                                     ^
 1->
   >
 2 >for
 3 >    
-4 >    (
-5 >     {
-  >         
-6 >      name = "noName"
-7 >                           
-8 >                             name = "noName"
-9 >                                                                   ,
-  >                                                                       
-10>                                                                     skills: {
-  >                                                                             primary = "primary",
-  >                                                                             secondary = "secondary"
-  >                                                                         } = { primary: "none", secondary: "none" }
-11>                                                                                            
-12>                                                                                              skills: {
-  >                                                                                                      primary = "primary",
-  >                                                                                                      secondary = "secondary"
-  >                                                                                                  } = { primary: "none", secondary: "none" }
-13>                                                                                                                                                                 
-14>                                                                                                                                                                   primary = "primary"
-15>                                                                                                                                                                                    
-16>                                                                                                                                                                                      primary = "primary"
-17>                                                                                                                                                                                                                                ,
-  >                                                                                                                                                                                                                                        
-18>                                                                                                                                                                                                                                  secondary = "secondary"
-19>                                                                                                                                                                                                                                                     
-20>                                                                                                                                                                                                                                                       secondary = "secondary"
-21>                                                                                                                                                                                                                                                                                                     
-  >                                                                                                                                                                                                                                                                                                         } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                     } = 
-22>                                                                                                                                                                                                                                                                                                       multiRobot
-23>                                                                                                                                                                                                                                                                                                                 
-24>                                                                                                                                                                                                                                                                                                                  , 
-25>                                                                                                                                                                                                                                                                                                                    i
-26>                                                                                                                                                                                                                                                                                                                      = 
-27>                                                                                                                                                                                                                                                                                                                        0
-28>                                                                                                                                                                                                                                                                                                                         ; 
-29>                                                                                                                                                                                                                                                                                                                           i
-30>                                                                                                                                                                                                                                                                                                                             < 
-31>                                                                                                                                                                                                                                                                                                                               1
-32>                                                                                                                                                                                                                                                                                                                                ; 
-33>                                                                                                                                                                                                                                                                                                                                  i
-34>                                                                                                                                                                                                                                                                                                                                   ++
-35>                                                                                                                                                                                                                                                                                                                                     ) 
-36>                                                                                                                                                                                                                                                                                                                                       {
+4 >    ({
+  >        
+5 >     name = "noName"
+6 >                          
+7 >                            name = "noName"
+8 >                                                                  ,
+  >                                                                      
+9 >                                                                    skills: {
+  >                                                                            primary = "primary",
+  >                                                                            secondary = "secondary"
+  >                                                                        } = { primary: "none", secondary: "none" }
+10>                                                                                           
+11>                                                                                             skills: {
+  >                                                                                                     primary = "primary",
+  >                                                                                                     secondary = "secondary"
+  >                                                                                                 } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                                
+13>                                                                                                                                                                  primary = "primary"
+14>                                                                                                                                                                                   
+15>                                                                                                                                                                                     primary = "primary"
+16>                                                                                                                                                                                                                               ,
+  >                                                                                                                                                                                                                                       
+17>                                                                                                                                                                                                                                 secondary = "secondary"
+18>                                                                                                                                                                                                                                                    
+19>                                                                                                                                                                                                                                                      secondary = "secondary"
+20>                                                                                                                                                                                                                                                                                                    
+  >                                                                                                                                                                                                                                                                                                        } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                    } = 
+21>                                                                                                                                                                                                                                                                                                      multiRobot
+22>                                                                                                                                                                                                                                                                                                                , 
+23>                                                                                                                                                                                                                                                                                                                  i
+24>                                                                                                                                                                                                                                                                                                                    = 
+25>                                                                                                                                                                                                                                                                                                                      0
+26>                                                                                                                                                                                                                                                                                                                       ; 
+27>                                                                                                                                                                                                                                                                                                                         i
+28>                                                                                                                                                                                                                                                                                                                           < 
+29>                                                                                                                                                                                                                                                                                                                             1
+30>                                                                                                                                                                                                                                                                                                                              ; 
+31>                                                                                                                                                                                                                                                                                                                                i
+32>                                                                                                                                                                                                                                                                                                                                 ++
+33>                                                                                                                                                                                                                                                                                                                                   ) 
+34>                                                                                                                                                                                                                                                                                                                                     {
 1->Emitted(77, 1) Source(147, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(147, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(147, 5) + SourceIndex(0)
-4 >Emitted(77, 6) Source(147, 6) + SourceIndex(0)
-5 >Emitted(77, 7) Source(148, 5) + SourceIndex(0)
-6 >Emitted(77, 28) Source(148, 20) + SourceIndex(0)
-7 >Emitted(77, 30) Source(148, 5) + SourceIndex(0)
-8 >Emitted(77, 68) Source(148, 20) + SourceIndex(0)
-9 >Emitted(77, 70) Source(149, 5) + SourceIndex(0)
-10>Emitted(77, 93) Source(152, 47) + SourceIndex(0)
-11>Emitted(77, 95) Source(149, 5) + SourceIndex(0)
-12>Emitted(77, 162) Source(152, 47) + SourceIndex(0)
-13>Emitted(77, 164) Source(150, 9) + SourceIndex(0)
-14>Emitted(77, 181) Source(150, 28) + SourceIndex(0)
-15>Emitted(77, 183) Source(150, 9) + SourceIndex(0)
-16>Emitted(77, 225) Source(150, 28) + SourceIndex(0)
-17>Emitted(77, 227) Source(151, 9) + SourceIndex(0)
-18>Emitted(77, 246) Source(151, 32) + SourceIndex(0)
-19>Emitted(77, 248) Source(151, 9) + SourceIndex(0)
-20>Emitted(77, 294) Source(151, 32) + SourceIndex(0)
-21>Emitted(77, 296) Source(153, 5) + SourceIndex(0)
-22>Emitted(77, 306) Source(153, 15) + SourceIndex(0)
-23>Emitted(77, 307) Source(153, 15) + SourceIndex(0)
-24>Emitted(77, 309) Source(153, 17) + SourceIndex(0)
-25>Emitted(77, 310) Source(153, 18) + SourceIndex(0)
-26>Emitted(77, 313) Source(153, 21) + SourceIndex(0)
-27>Emitted(77, 314) Source(153, 22) + SourceIndex(0)
-28>Emitted(77, 316) Source(153, 24) + SourceIndex(0)
-29>Emitted(77, 317) Source(153, 25) + SourceIndex(0)
-30>Emitted(77, 320) Source(153, 28) + SourceIndex(0)
-31>Emitted(77, 321) Source(153, 29) + SourceIndex(0)
-32>Emitted(77, 323) Source(153, 31) + SourceIndex(0)
-33>Emitted(77, 324) Source(153, 32) + SourceIndex(0)
-34>Emitted(77, 326) Source(153, 34) + SourceIndex(0)
-35>Emitted(77, 328) Source(153, 36) + SourceIndex(0)
-36>Emitted(77, 329) Source(153, 37) + SourceIndex(0)
+4 >Emitted(77, 6) Source(148, 5) + SourceIndex(0)
+5 >Emitted(77, 27) Source(148, 20) + SourceIndex(0)
+6 >Emitted(77, 29) Source(148, 5) + SourceIndex(0)
+7 >Emitted(77, 67) Source(148, 20) + SourceIndex(0)
+8 >Emitted(77, 69) Source(149, 5) + SourceIndex(0)
+9 >Emitted(77, 92) Source(152, 47) + SourceIndex(0)
+10>Emitted(77, 94) Source(149, 5) + SourceIndex(0)
+11>Emitted(77, 161) Source(152, 47) + SourceIndex(0)
+12>Emitted(77, 163) Source(150, 9) + SourceIndex(0)
+13>Emitted(77, 180) Source(150, 28) + SourceIndex(0)
+14>Emitted(77, 182) Source(150, 9) + SourceIndex(0)
+15>Emitted(77, 224) Source(150, 28) + SourceIndex(0)
+16>Emitted(77, 226) Source(151, 9) + SourceIndex(0)
+17>Emitted(77, 245) Source(151, 32) + SourceIndex(0)
+18>Emitted(77, 247) Source(151, 9) + SourceIndex(0)
+19>Emitted(77, 293) Source(151, 32) + SourceIndex(0)
+20>Emitted(77, 295) Source(153, 5) + SourceIndex(0)
+21>Emitted(77, 305) Source(153, 15) + SourceIndex(0)
+22>Emitted(77, 307) Source(153, 17) + SourceIndex(0)
+23>Emitted(77, 308) Source(153, 18) + SourceIndex(0)
+24>Emitted(77, 311) Source(153, 21) + SourceIndex(0)
+25>Emitted(77, 312) Source(153, 22) + SourceIndex(0)
+26>Emitted(77, 314) Source(153, 24) + SourceIndex(0)
+27>Emitted(77, 315) Source(153, 25) + SourceIndex(0)
+28>Emitted(77, 318) Source(153, 28) + SourceIndex(0)
+29>Emitted(77, 319) Source(153, 29) + SourceIndex(0)
+30>Emitted(77, 321) Source(153, 31) + SourceIndex(0)
+31>Emitted(77, 322) Source(153, 32) + SourceIndex(0)
+32>Emitted(77, 324) Source(153, 34) + SourceIndex(0)
+33>Emitted(77, 326) Source(153, 36) + SourceIndex(0)
+34>Emitted(77, 327) Source(153, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -3246,139 +3114,133 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(79, 1) Source(155, 1) + SourceIndex(0)
 2 >Emitted(79, 2) Source(155, 2) + SourceIndex(0)
 ---
->>>for ((_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52), i = 0; i < 1; i++) {
+>>>for (_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^
-7 >                           ^^
-8 >                             ^^^^^^^^^^^^^^
-9 >                                           ^^
-10>                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                   ^^
-12>                                                                                     ^^^^^^^^^^^^^^^^
-13>                                                                                                     ^^
-14>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                          ^^
-16>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                             ^^
-18>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                         ^^
-20>                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                              ^^
-22>                                                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                              ^^^^^^
-24>                                                                                                                                                                                                                                                                                                                    ^^
-25>                                                                                                                                                                                                                                                                                                                      ^
-26>                                                                                                                                                                                                                                                                                                                       ^^^
-27>                                                                                                                                                                                                                                                                                                                          ^
-28>                                                                                                                                                                                                                                                                                                                           ^^
-29>                                                                                                                                                                                                                                                                                                                             ^
-30>                                                                                                                                                                                                                                                                                                                              ^^^
-31>                                                                                                                                                                                                                                                                                                                                 ^
-32>                                                                                                                                                                                                                                                                                                                                  ^^
-33>                                                                                                                                                                                                                                                                                                                                    ^
-34>                                                                                                                                                                                                                                                                                                                                     ^^
-35>                                                                                                                                                                                                                                                                                                                                       ^^
-36>                                                                                                                                                                                                                                                                                                                                         ^
+5 >     ^^^^^^^^^^^^^^^^^^^^^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                  ^^
+11>                                                                                    ^^^^^^^^^^^^^^^^
+12>                                                                                                    ^^
+13>                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                         ^^
+15>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                            ^^
+17>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                        ^^
+19>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                             ^^
+21>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                             ^^^^^^^
+23>                                                                                                                                                                                                                                                                                                                    ^
+24>                                                                                                                                                                                                                                                                                                                     ^^^
+25>                                                                                                                                                                                                                                                                                                                        ^
+26>                                                                                                                                                                                                                                                                                                                         ^^
+27>                                                                                                                                                                                                                                                                                                                           ^
+28>                                                                                                                                                                                                                                                                                                                            ^^^
+29>                                                                                                                                                                                                                                                                                                                               ^
+30>                                                                                                                                                                                                                                                                                                                                ^^
+31>                                                                                                                                                                                                                                                                                                                                  ^
+32>                                                                                                                                                                                                                                                                                                                                   ^^
+33>                                                                                                                                                                                                                                                                                                                                     ^^
+34>                                                                                                                                                                                                                                                                                                                                       ^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          name = "noName",
-  >          skills: {
-  >              primary = "primary",
-  >              secondary = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = getMultiRobot()
-7 >                           
-8 >                             name = "noName"
-9 >                                           
-10>                                             name = "noName"
-11>                                                                                   ,
-  >                                                                                       
-12>                                                                                     skills: {
-  >                                                                                             primary = "primary",
-  >                                                                                             secondary = "secondary"
-  >                                                                                         } = { primary: "none", secondary: "none" }
-13>                                                                                                     
-14>                                                                                                       skills: {
-  >                                                                                                               primary = "primary",
-  >                                                                                                               secondary = "secondary"
-  >                                                                                                           } = { primary: "none", secondary: "none" }
-15>                                                                                                                                                                          
-16>                                                                                                                                                                            primary = "primary"
-17>                                                                                                                                                                                             
-18>                                                                                                                                                                                               primary = "primary"
-19>                                                                                                                                                                                                                                         ,
-  >                                                                                                                                                                                                                                                 
-20>                                                                                                                                                                                                                                           secondary = "secondary"
-21>                                                                                                                                                                                                                                                              
-22>                                                                                                                                                                                                                                                                secondary = "secondary"
-23>                                                                                                                                                                                                                                                                                                              
-  >                                                                                                                                                                                                                                                                                                                  } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                              } = getMultiRobot()
-24>                                                                                                                                                                                                                                                                                                                    , 
-25>                                                                                                                                                                                                                                                                                                                      i
-26>                                                                                                                                                                                                                                                                                                                        = 
-27>                                                                                                                                                                                                                                                                                                                          0
-28>                                                                                                                                                                                                                                                                                                                           ; 
-29>                                                                                                                                                                                                                                                                                                                             i
-30>                                                                                                                                                                                                                                                                                                                               < 
-31>                                                                                                                                                                                                                                                                                                                                 1
-32>                                                                                                                                                                                                                                                                                                                                  ; 
-33>                                                                                                                                                                                                                                                                                                                                    i
-34>                                                                                                                                                                                                                                                                                                                                     ++
-35>                                                                                                                                                                                                                                                                                                                                       ) 
-36>                                                                                                                                                                                                                                                                                                                                         {
+5 >     {
+  >         name = "noName",
+  >         skills: {
+  >             primary = "primary",
+  >             secondary = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = getMultiRobot()
+6 >                          
+7 >                            name = "noName"
+8 >                                          
+9 >                                            name = "noName"
+10>                                                                                  ,
+  >                                                                                      
+11>                                                                                    skills: {
+  >                                                                                            primary = "primary",
+  >                                                                                            secondary = "secondary"
+  >                                                                                        } = { primary: "none", secondary: "none" }
+12>                                                                                                    
+13>                                                                                                      skills: {
+  >                                                                                                              primary = "primary",
+  >                                                                                                              secondary = "secondary"
+  >                                                                                                          } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                         
+15>                                                                                                                                                                           primary = "primary"
+16>                                                                                                                                                                                            
+17>                                                                                                                                                                                              primary = "primary"
+18>                                                                                                                                                                                                                                        ,
+  >                                                                                                                                                                                                                                                
+19>                                                                                                                                                                                                                                          secondary = "secondary"
+20>                                                                                                                                                                                                                                                             
+21>                                                                                                                                                                                                                                                               secondary = "secondary"
+22>                                                                                                                                                                                                                                                                                                             
+  >                                                                                                                                                                                                                                                                                                                 } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                             } = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                                                    i
+24>                                                                                                                                                                                                                                                                                                                      = 
+25>                                                                                                                                                                                                                                                                                                                        0
+26>                                                                                                                                                                                                                                                                                                                         ; 
+27>                                                                                                                                                                                                                                                                                                                           i
+28>                                                                                                                                                                                                                                                                                                                             < 
+29>                                                                                                                                                                                                                                                                                                                               1
+30>                                                                                                                                                                                                                                                                                                                                ; 
+31>                                                                                                                                                                                                                                                                                                                                  i
+32>                                                                                                                                                                                                                                                                                                                                   ++
+33>                                                                                                                                                                                                                                                                                                                                     ) 
+34>                                                                                                                                                                                                                                                                                                                                       {
 1->Emitted(80, 1) Source(156, 1) + SourceIndex(0)
 2 >Emitted(80, 4) Source(156, 4) + SourceIndex(0)
 3 >Emitted(80, 5) Source(156, 5) + SourceIndex(0)
 4 >Emitted(80, 6) Source(156, 6) + SourceIndex(0)
-5 >Emitted(80, 7) Source(156, 6) + SourceIndex(0)
-6 >Emitted(80, 28) Source(162, 20) + SourceIndex(0)
-7 >Emitted(80, 30) Source(157, 5) + SourceIndex(0)
-8 >Emitted(80, 44) Source(157, 20) + SourceIndex(0)
-9 >Emitted(80, 46) Source(157, 5) + SourceIndex(0)
-10>Emitted(80, 84) Source(157, 20) + SourceIndex(0)
-11>Emitted(80, 86) Source(158, 5) + SourceIndex(0)
-12>Emitted(80, 102) Source(161, 47) + SourceIndex(0)
-13>Emitted(80, 104) Source(158, 5) + SourceIndex(0)
-14>Emitted(80, 171) Source(161, 47) + SourceIndex(0)
-15>Emitted(80, 173) Source(159, 9) + SourceIndex(0)
-16>Emitted(80, 190) Source(159, 28) + SourceIndex(0)
-17>Emitted(80, 192) Source(159, 9) + SourceIndex(0)
-18>Emitted(80, 234) Source(159, 28) + SourceIndex(0)
-19>Emitted(80, 236) Source(160, 9) + SourceIndex(0)
-20>Emitted(80, 255) Source(160, 32) + SourceIndex(0)
-21>Emitted(80, 257) Source(160, 9) + SourceIndex(0)
-22>Emitted(80, 303) Source(160, 32) + SourceIndex(0)
-23>Emitted(80, 309) Source(162, 20) + SourceIndex(0)
-24>Emitted(80, 311) Source(162, 22) + SourceIndex(0)
-25>Emitted(80, 312) Source(162, 23) + SourceIndex(0)
-26>Emitted(80, 315) Source(162, 26) + SourceIndex(0)
-27>Emitted(80, 316) Source(162, 27) + SourceIndex(0)
-28>Emitted(80, 318) Source(162, 29) + SourceIndex(0)
-29>Emitted(80, 319) Source(162, 30) + SourceIndex(0)
-30>Emitted(80, 322) Source(162, 33) + SourceIndex(0)
-31>Emitted(80, 323) Source(162, 34) + SourceIndex(0)
-32>Emitted(80, 325) Source(162, 36) + SourceIndex(0)
-33>Emitted(80, 326) Source(162, 37) + SourceIndex(0)
-34>Emitted(80, 328) Source(162, 39) + SourceIndex(0)
-35>Emitted(80, 330) Source(162, 41) + SourceIndex(0)
-36>Emitted(80, 331) Source(162, 42) + SourceIndex(0)
+5 >Emitted(80, 27) Source(162, 20) + SourceIndex(0)
+6 >Emitted(80, 29) Source(157, 5) + SourceIndex(0)
+7 >Emitted(80, 43) Source(157, 20) + SourceIndex(0)
+8 >Emitted(80, 45) Source(157, 5) + SourceIndex(0)
+9 >Emitted(80, 83) Source(157, 20) + SourceIndex(0)
+10>Emitted(80, 85) Source(158, 5) + SourceIndex(0)
+11>Emitted(80, 101) Source(161, 47) + SourceIndex(0)
+12>Emitted(80, 103) Source(158, 5) + SourceIndex(0)
+13>Emitted(80, 170) Source(161, 47) + SourceIndex(0)
+14>Emitted(80, 172) Source(159, 9) + SourceIndex(0)
+15>Emitted(80, 189) Source(159, 28) + SourceIndex(0)
+16>Emitted(80, 191) Source(159, 9) + SourceIndex(0)
+17>Emitted(80, 233) Source(159, 28) + SourceIndex(0)
+18>Emitted(80, 235) Source(160, 9) + SourceIndex(0)
+19>Emitted(80, 254) Source(160, 32) + SourceIndex(0)
+20>Emitted(80, 256) Source(160, 9) + SourceIndex(0)
+21>Emitted(80, 302) Source(160, 32) + SourceIndex(0)
+22>Emitted(80, 309) Source(162, 22) + SourceIndex(0)
+23>Emitted(80, 310) Source(162, 23) + SourceIndex(0)
+24>Emitted(80, 313) Source(162, 26) + SourceIndex(0)
+25>Emitted(80, 314) Source(162, 27) + SourceIndex(0)
+26>Emitted(80, 316) Source(162, 29) + SourceIndex(0)
+27>Emitted(80, 317) Source(162, 30) + SourceIndex(0)
+28>Emitted(80, 320) Source(162, 33) + SourceIndex(0)
+29>Emitted(80, 321) Source(162, 34) + SourceIndex(0)
+30>Emitted(80, 323) Source(162, 36) + SourceIndex(0)
+31>Emitted(80, 324) Source(162, 37) + SourceIndex(0)
+32>Emitted(80, 326) Source(162, 39) + SourceIndex(0)
+33>Emitted(80, 328) Source(162, 41) + SourceIndex(0)
+34>Emitted(80, 329) Source(162, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -3410,100 +3272,92 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(82, 1) Source(164, 1) + SourceIndex(0)
 2 >Emitted(82, 2) Source(164, 2) + SourceIndex(0)
 ---
->>>for ((_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58),
+>>>for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
-5 >     ^
-6 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                     ^^
-8 >                                                                                       ^^^^^^^^^^^^^^
-9 >                                                                                                     ^^
-10>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                             ^^
-12>                                                                                                                                               ^^^^^^^^^^^^^^^^
-13>                                                                                                                                                               ^^
-14>                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                    ^^
-16>                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                       ^^
-18>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                                                                   ^^
-20>                                                                                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^
-21>                                                                                                                                                                                                                                                                                                                        ^^
-22>                                                                                                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                                                                        ^^^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^
+7 >                                                                                      ^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                            ^^
+11>                                                                                                                                              ^^^^^^^^^^^^^^^^
+12>                                                                                                                                                              ^^
+13>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                   ^^
+15>                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                      ^^
+17>                                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                                  ^^
+19>                                                                                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                                       ^^
+21>                                                                                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
 3 >    
 4 >    (
-5 >     
-6 >      {
-  >          name = "noName",
-  >          skills: {
-  >              primary = "primary",
-  >              secondary = "secondary"
-  >          } = { primary: "none", secondary: "none" }
-  >      } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
-7 >                                                                                     
-8 >                                                                                       name = "noName"
-9 >                                                                                                     
-10>                                                                                                       name = "noName"
-11>                                                                                                                                             ,
-  >                                                                                                                                                 
-12>                                                                                                                                               skills: {
-  >                                                                                                                                                       primary = "primary",
-  >                                                                                                                                                       secondary = "secondary"
-  >                                                                                                                                                   } = { primary: "none", secondary: "none" }
-13>                                                                                                                                                               
-14>                                                                                                                                                                 skills: {
-  >                                                                                                                                                                         primary = "primary",
-  >                                                                                                                                                                         secondary = "secondary"
-  >                                                                                                                                                                     } = { primary: "none", secondary: "none" }
-15>                                                                                                                                                                                                                                    
-16>                                                                                                                                                                                                                                      primary = "primary"
-17>                                                                                                                                                                                                                                                       
-18>                                                                                                                                                                                                                                                         primary = "primary"
-19>                                                                                                                                                                                                                                                                                                   ,
-  >                                                                                                                                                                                                                                                                                                           
-20>                                                                                                                                                                                                                                                                                                     secondary = "secondary"
-21>                                                                                                                                                                                                                                                                                                                        
-22>                                                                                                                                                                                                                                                                                                                          secondary = "secondary"
-23>                                                                                                                                                                                                                                                                                                                                                                        
-  >                                                                                                                                                                                                                                                                                                                                                                            } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                                                                                        } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+5 >     {
+  >         name = "noName",
+  >         skills: {
+  >             primary = "primary",
+  >             secondary = "secondary"
+  >         } = { primary: "none", secondary: "none" }
+  >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
+6 >                                                                                    
+7 >                                                                                      name = "noName"
+8 >                                                                                                    
+9 >                                                                                                      name = "noName"
+10>                                                                                                                                            ,
+  >                                                                                                                                                
+11>                                                                                                                                              skills: {
+  >                                                                                                                                                      primary = "primary",
+  >                                                                                                                                                      secondary = "secondary"
+  >                                                                                                                                                  } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                              
+13>                                                                                                                                                                skills: {
+  >                                                                                                                                                                        primary = "primary",
+  >                                                                                                                                                                        secondary = "secondary"
+  >                                                                                                                                                                    } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                                                                                   
+15>                                                                                                                                                                                                                                     primary = "primary"
+16>                                                                                                                                                                                                                                                      
+17>                                                                                                                                                                                                                                                        primary = "primary"
+18>                                                                                                                                                                                                                                                                                                  ,
+  >                                                                                                                                                                                                                                                                                                          
+19>                                                                                                                                                                                                                                                                                                    secondary = "secondary"
+20>                                                                                                                                                                                                                                                                                                                       
+21>                                                                                                                                                                                                                                                                                                                         secondary = "secondary"
 1->Emitted(83, 1) Source(165, 1) + SourceIndex(0)
 2 >Emitted(83, 4) Source(165, 4) + SourceIndex(0)
 3 >Emitted(83, 5) Source(165, 5) + SourceIndex(0)
 4 >Emitted(83, 6) Source(165, 6) + SourceIndex(0)
-5 >Emitted(83, 7) Source(165, 6) + SourceIndex(0)
-6 >Emitted(83, 86) Source(171, 90) + SourceIndex(0)
-7 >Emitted(83, 88) Source(166, 5) + SourceIndex(0)
-8 >Emitted(83, 102) Source(166, 20) + SourceIndex(0)
-9 >Emitted(83, 104) Source(166, 5) + SourceIndex(0)
-10>Emitted(83, 142) Source(166, 20) + SourceIndex(0)
-11>Emitted(83, 144) Source(167, 5) + SourceIndex(0)
-12>Emitted(83, 160) Source(170, 47) + SourceIndex(0)
-13>Emitted(83, 162) Source(167, 5) + SourceIndex(0)
-14>Emitted(83, 229) Source(170, 47) + SourceIndex(0)
-15>Emitted(83, 231) Source(168, 9) + SourceIndex(0)
-16>Emitted(83, 248) Source(168, 28) + SourceIndex(0)
-17>Emitted(83, 250) Source(168, 9) + SourceIndex(0)
-18>Emitted(83, 292) Source(168, 28) + SourceIndex(0)
-19>Emitted(83, 294) Source(169, 9) + SourceIndex(0)
-20>Emitted(83, 313) Source(169, 32) + SourceIndex(0)
-21>Emitted(83, 315) Source(169, 9) + SourceIndex(0)
-22>Emitted(83, 361) Source(169, 32) + SourceIndex(0)
-23>Emitted(83, 367) Source(171, 90) + SourceIndex(0)
+5 >Emitted(83, 85) Source(171, 90) + SourceIndex(0)
+6 >Emitted(83, 87) Source(166, 5) + SourceIndex(0)
+7 >Emitted(83, 101) Source(166, 20) + SourceIndex(0)
+8 >Emitted(83, 103) Source(166, 5) + SourceIndex(0)
+9 >Emitted(83, 141) Source(166, 20) + SourceIndex(0)
+10>Emitted(83, 143) Source(167, 5) + SourceIndex(0)
+11>Emitted(83, 159) Source(170, 47) + SourceIndex(0)
+12>Emitted(83, 161) Source(167, 5) + SourceIndex(0)
+13>Emitted(83, 228) Source(170, 47) + SourceIndex(0)
+14>Emitted(83, 230) Source(168, 9) + SourceIndex(0)
+15>Emitted(83, 247) Source(168, 28) + SourceIndex(0)
+16>Emitted(83, 249) Source(168, 9) + SourceIndex(0)
+17>Emitted(83, 291) Source(168, 28) + SourceIndex(0)
+18>Emitted(83, 293) Source(169, 9) + SourceIndex(0)
+19>Emitted(83, 312) Source(169, 32) + SourceIndex(0)
+20>Emitted(83, 314) Source(169, 9) + SourceIndex(0)
+21>Emitted(83, 360) Source(169, 32) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -3520,7 +3374,9 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 12>                     ^^
 13>                       ^
 14>                        ^^^->
-1 >,
+1 >
+  >    } = { primary: "none", secondary: "none" }
+  >} = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
   >    
 2 >    i
 3 >      = 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.js.map
index 076b6994fa3..f9218ab62eb 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfArrayBindingPattern.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPattern.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAkB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAxB,qBAAa,EAAN,aAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA7B,eAAa,EAAN,aAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkB,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAAlC,eAAa,EAAN,aAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6C,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAxD,0BAAwC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAA6C,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA7D,eAAwC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAA6C,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,CAAC;IAAvE,eAAwC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAkB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAnB,6BAAO;IACb,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAkB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAxB,uBAAO;IACb,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAkB,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA7B,uBAAO;IACb,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAgB,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAtB,gCAAK;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAgB,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA3B,qBAAK;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAgB,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,CAAC;IAArC,qBAAK;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAAoC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAA1C,qBAA+B,EAA1B,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAoC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA/C,eAA+B,EAA1B,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAoC,UAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,eAAgB,EAAhB,IAAgB,CAAC;IAApD,iBAA+B,EAA1B,iBAAQ,EAAE,eAAM,EAAE,gBAAO;IAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAmD,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAA9D,4BAA8C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAmD,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAnE,kBAA8C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAmD,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAA7E,kBAA8C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAAkC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAAxC,uBAA6B,EAAxB,iBAAQ,EAAE,yBAAa;IAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAkC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAA7C,kBAA6B,EAAxB,iBAAQ,EAAE,yBAAa;IAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAkC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAlD,kBAA6B,EAAxB,iBAAQ,EAAE,yBAAa;IAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA6B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAAnC,iDAAkB;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAA6B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAxC,uCAAkB;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAA6B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAAlD,uCAAkB;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPattern.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAkB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAnB,IAAA,iBAAS,EAAN,aAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAxB,IAAA,WAAS,EAAN,aAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkB,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB;IAA7B,IAAA,WAAS,EAAN,aAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6C,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAAnD,IAAA,sBAAoC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAA6C,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAAxD,IAAA,WAAoC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAA6C,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B;IAAlE,IAAA,WAAoC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAkB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAlB,IAAA,yBAAO;IACb,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAkB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAvB,IAAA,mBAAO;IACb,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAkB,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB;IAA5B,IAAA,mBAAO;IACb,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAgB,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAArB,IAAA,4BAAK;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAgB,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAA1B,IAAA,iBAAK;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAgB,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B;IAApC,IAAA,iBAAK;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAAoC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAArC,IAAA,iBAA2B,EAA1B,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAoC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAA1C,IAAA,WAA2B,EAA1B,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAoC,UAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,eAAgB,EAAhB,IAAgB;IAA/C,IAAA,aAA2B,EAA1B,iBAAQ,EAAE,eAAM,EAAE,gBAAO;IAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAmD,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IAAzD,IAAA,wBAA0C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAmD,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAA9D,IAAA,cAA0C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAmD,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;IAAxE,IAAA,cAA0C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAAkC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;IAAnC,IAAA,mBAAyB,EAAxB,iBAAQ,EAAE,yBAAa;IAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAkC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;IAAxC,IAAA,cAAyB,EAAxB,iBAAQ,EAAE,yBAAa;IAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAkC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;IAA7C,IAAA,cAAyB,EAAxB,iBAAQ,EAAE,yBAAa;IAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA6B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IAAlC,IAAA,6CAAkB;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAA6B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAAvC,IAAA,mCAAkB;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAA6B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;IAAjD,IAAA,mCAAkB;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.sourcemap.txt
index 17110072800..9c039efbea8 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.sourcemap.txt
@@ -332,7 +332,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -346,7 +345,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(13, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(13, 4) Source(21, 4) + SourceIndex(0)
 3 >Emitted(13, 5) Source(21, 5) + SourceIndex(0)
@@ -358,21 +356,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(13, 57) Source(21, 29) + SourceIndex(0)
 10>Emitted(13, 59) Source(21, 23) + SourceIndex(0)
 11>Emitted(13, 63) Source(21, 29) + SourceIndex(0)
-12>Emitted(13, 64) Source(21, 30) + SourceIndex(0)
 ---
 >>>    var _a = robots_1[_i], nameA = _a[1];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^^
 1 >
-2 >    let [, nameA]
-3 >                         
-4 >                           nameA
-1 >Emitted(14, 5) Source(21, 6) + SourceIndex(0)
-2 >Emitted(14, 26) Source(21, 19) + SourceIndex(0)
-3 >Emitted(14, 28) Source(21, 13) + SourceIndex(0)
-4 >Emitted(14, 41) Source(21, 18) + SourceIndex(0)
+2 >    
+3 >        [, nameA]
+4 >                         
+5 >                           nameA
+1 >Emitted(14, 5) Source(21, 10) + SourceIndex(0)
+2 >Emitted(14, 9) Source(21, 10) + SourceIndex(0)
+3 >Emitted(14, 26) Source(21, 19) + SourceIndex(0)
+4 >Emitted(14, 28) Source(21, 13) + SourceIndex(0)
+5 >Emitted(14, 41) Source(21, 18) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -422,7 +422,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -437,7 +436,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(17, 1) Source(24, 1) + SourceIndex(0)
 2 >Emitted(17, 4) Source(24, 4) + SourceIndex(0)
 3 >Emitted(17, 5) Source(24, 5) + SourceIndex(0)
@@ -451,21 +449,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(17, 50) Source(24, 34) + SourceIndex(0)
 12>Emitted(17, 52) Source(24, 23) + SourceIndex(0)
 13>Emitted(17, 56) Source(24, 34) + SourceIndex(0)
-14>Emitted(17, 57) Source(24, 35) + SourceIndex(0)
 ---
 >>>    var _d = _c[_b], nameA = _d[1];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^
 1 >
-2 >    let [, nameA]
-3 >                   
-4 >                     nameA
-1 >Emitted(18, 5) Source(24, 6) + SourceIndex(0)
-2 >Emitted(18, 20) Source(24, 19) + SourceIndex(0)
-3 >Emitted(18, 22) Source(24, 13) + SourceIndex(0)
-4 >Emitted(18, 35) Source(24, 18) + SourceIndex(0)
+2 >    
+3 >        [, nameA]
+4 >                   
+5 >                     nameA
+1 >Emitted(18, 5) Source(24, 10) + SourceIndex(0)
+2 >Emitted(18, 9) Source(24, 10) + SourceIndex(0)
+3 >Emitted(18, 20) Source(24, 19) + SourceIndex(0)
+4 >Emitted(18, 22) Source(24, 13) + SourceIndex(0)
+5 >Emitted(18, 35) Source(24, 18) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -517,7 +517,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                        ^^^^^^^^^^^^^^
 14>                                                      ^^
 15>                                                        ^^^^
-16>                                                            ^
 1->
   >
 2 >for
@@ -534,7 +533,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                        [robotA, robotB]
 14>                                                      
 15>                                                        [robotA, robotB]
-16>                                                            )
 1->Emitted(21, 1) Source(27, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(27, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(27, 5) + SourceIndex(0)
@@ -550,21 +548,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(21, 55) Source(27, 39) + SourceIndex(0)
 14>Emitted(21, 57) Source(27, 23) + SourceIndex(0)
 15>Emitted(21, 61) Source(27, 39) + SourceIndex(0)
-16>Emitted(21, 62) Source(27, 40) + SourceIndex(0)
 ---
 >>>    var _g = _f[_e], nameA = _g[1];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^
 1 >
-2 >    let [, nameA]
-3 >                   
-4 >                     nameA
-1 >Emitted(22, 5) Source(27, 6) + SourceIndex(0)
-2 >Emitted(22, 20) Source(27, 19) + SourceIndex(0)
-3 >Emitted(22, 22) Source(27, 13) + SourceIndex(0)
-4 >Emitted(22, 35) Source(27, 18) + SourceIndex(0)
+2 >    
+3 >        [, nameA]
+4 >                   
+5 >                     nameA
+1 >Emitted(22, 5) Source(27, 10) + SourceIndex(0)
+2 >Emitted(22, 9) Source(27, 10) + SourceIndex(0)
+3 >Emitted(22, 20) Source(27, 19) + SourceIndex(0)
+4 >Emitted(22, 22) Source(27, 13) + SourceIndex(0)
+5 >Emitted(22, 35) Source(27, 18) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -612,8 +612,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -626,7 +625,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(25, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(25, 4) Source(30, 4) + SourceIndex(0)
 3 >Emitted(25, 5) Source(30, 5) + SourceIndex(0)
@@ -638,33 +636,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(25, 72) Source(30, 61) + SourceIndex(0)
 10>Emitted(25, 74) Source(30, 50) + SourceIndex(0)
 11>Emitted(25, 78) Source(30, 61) + SourceIndex(0)
-12>Emitted(25, 79) Source(30, 62) + SourceIndex(0)
 ---
 >>>    var _j = multiRobots_1[_h], _k = _j[1], primarySkillA = _k[0], secondarySkillA = _k[1];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                              ^^
-4 >                                ^^^^^^^^^^
-5 >                                          ^^
-6 >                                            ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                 ^^
-8 >                                                                   ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^
+4 >                              ^^
+5 >                                ^^^^^^^^^^
+6 >                                          ^^
+7 >                                            ^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                 ^^
+9 >                                                                   ^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, [primarySkillA, secondarySkillA]]
-3 >                              
-4 >                                [primarySkillA, secondarySkillA]
-5 >                                          
-6 >                                            primarySkillA
-7 >                                                                 , 
-8 >                                                                   secondarySkillA
-1->Emitted(26, 5) Source(30, 6) + SourceIndex(0)
-2 >Emitted(26, 31) Source(30, 46) + SourceIndex(0)
-3 >Emitted(26, 33) Source(30, 13) + SourceIndex(0)
-4 >Emitted(26, 43) Source(30, 45) + SourceIndex(0)
-5 >Emitted(26, 45) Source(30, 14) + SourceIndex(0)
-6 >Emitted(26, 66) Source(30, 27) + SourceIndex(0)
-7 >Emitted(26, 68) Source(30, 29) + SourceIndex(0)
-8 >Emitted(26, 91) Source(30, 44) + SourceIndex(0)
+2 >    
+3 >        [, [primarySkillA, secondarySkillA]]
+4 >                              
+5 >                                [primarySkillA, secondarySkillA]
+6 >                                          
+7 >                                            primarySkillA
+8 >                                                                 , 
+9 >                                                                   secondarySkillA
+1->Emitted(26, 5) Source(30, 10) + SourceIndex(0)
+2 >Emitted(26, 9) Source(30, 10) + SourceIndex(0)
+3 >Emitted(26, 31) Source(30, 46) + SourceIndex(0)
+4 >Emitted(26, 33) Source(30, 13) + SourceIndex(0)
+5 >Emitted(26, 43) Source(30, 45) + SourceIndex(0)
+6 >Emitted(26, 45) Source(30, 14) + SourceIndex(0)
+7 >Emitted(26, 66) Source(30, 27) + SourceIndex(0)
+8 >Emitted(26, 68) Source(30, 29) + SourceIndex(0)
+9 >Emitted(26, 91) Source(30, 44) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -714,8 +714,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -730,7 +729,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(29, 1) Source(33, 1) + SourceIndex(0)
 2 >Emitted(29, 4) Source(33, 4) + SourceIndex(0)
 3 >Emitted(29, 5) Source(33, 5) + SourceIndex(0)
@@ -744,33 +742,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(29, 55) Source(33, 66) + SourceIndex(0)
 12>Emitted(29, 57) Source(33, 50) + SourceIndex(0)
 13>Emitted(29, 61) Source(33, 66) + SourceIndex(0)
-14>Emitted(29, 62) Source(33, 67) + SourceIndex(0)
 ---
 >>>    var _o = _m[_l], _p = _o[1], primarySkillA = _p[0], secondarySkillA = _p[1];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                      ^^
-8 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^
+8 >                                                      ^^
+9 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, [primarySkillA, secondarySkillA]]
-3 >                   
-4 >                     [primarySkillA, secondarySkillA]
-5 >                               
-6 >                                 primarySkillA
-7 >                                                      , 
-8 >                                                        secondarySkillA
-1->Emitted(30, 5) Source(33, 6) + SourceIndex(0)
-2 >Emitted(30, 20) Source(33, 46) + SourceIndex(0)
-3 >Emitted(30, 22) Source(33, 13) + SourceIndex(0)
-4 >Emitted(30, 32) Source(33, 45) + SourceIndex(0)
-5 >Emitted(30, 34) Source(33, 14) + SourceIndex(0)
-6 >Emitted(30, 55) Source(33, 27) + SourceIndex(0)
-7 >Emitted(30, 57) Source(33, 29) + SourceIndex(0)
-8 >Emitted(30, 80) Source(33, 44) + SourceIndex(0)
+2 >    
+3 >        [, [primarySkillA, secondarySkillA]]
+4 >                   
+5 >                     [primarySkillA, secondarySkillA]
+6 >                               
+7 >                                 primarySkillA
+8 >                                                      , 
+9 >                                                        secondarySkillA
+1->Emitted(30, 5) Source(33, 10) + SourceIndex(0)
+2 >Emitted(30, 9) Source(33, 10) + SourceIndex(0)
+3 >Emitted(30, 20) Source(33, 46) + SourceIndex(0)
+4 >Emitted(30, 22) Source(33, 13) + SourceIndex(0)
+5 >Emitted(30, 32) Source(33, 45) + SourceIndex(0)
+6 >Emitted(30, 34) Source(33, 14) + SourceIndex(0)
+7 >Emitted(30, 55) Source(33, 27) + SourceIndex(0)
+8 >Emitted(30, 57) Source(33, 29) + SourceIndex(0)
+9 >Emitted(30, 80) Source(33, 44) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -822,8 +822,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                  ^^^^^^^^^^^^^^
 14>                                                                ^^
 15>                                                                  ^^^^
-16>                                                                      ^
-17>                                                                       ^^^^^^^^^^->
+16>                                                                      ^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -840,7 +839,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                  [multiRobotA, multiRobotB]
 14>                                                                
 15>                                                                  [multiRobotA, multiRobotB]
-16>                                                                      )
 1->Emitted(33, 1) Source(36, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(36, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(36, 5) + SourceIndex(0)
@@ -856,33 +854,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(33, 65) Source(36, 76) + SourceIndex(0)
 14>Emitted(33, 67) Source(36, 50) + SourceIndex(0)
 15>Emitted(33, 71) Source(36, 76) + SourceIndex(0)
-16>Emitted(33, 72) Source(36, 77) + SourceIndex(0)
 ---
 >>>    var _s = _r[_q], _t = _s[1], primarySkillA = _t[0], secondarySkillA = _t[1];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                      ^^
-8 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^
+8 >                                                      ^^
+9 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, [primarySkillA, secondarySkillA]]
-3 >                   
-4 >                     [primarySkillA, secondarySkillA]
-5 >                               
-6 >                                 primarySkillA
-7 >                                                      , 
-8 >                                                        secondarySkillA
-1->Emitted(34, 5) Source(36, 6) + SourceIndex(0)
-2 >Emitted(34, 20) Source(36, 46) + SourceIndex(0)
-3 >Emitted(34, 22) Source(36, 13) + SourceIndex(0)
-4 >Emitted(34, 32) Source(36, 45) + SourceIndex(0)
-5 >Emitted(34, 34) Source(36, 14) + SourceIndex(0)
-6 >Emitted(34, 55) Source(36, 27) + SourceIndex(0)
-7 >Emitted(34, 57) Source(36, 29) + SourceIndex(0)
-8 >Emitted(34, 80) Source(36, 44) + SourceIndex(0)
+2 >    
+3 >        [, [primarySkillA, secondarySkillA]]
+4 >                   
+5 >                     [primarySkillA, secondarySkillA]
+6 >                               
+7 >                                 primarySkillA
+8 >                                                      , 
+9 >                                                        secondarySkillA
+1->Emitted(34, 5) Source(36, 10) + SourceIndex(0)
+2 >Emitted(34, 9) Source(36, 10) + SourceIndex(0)
+3 >Emitted(34, 20) Source(36, 46) + SourceIndex(0)
+4 >Emitted(34, 22) Source(36, 13) + SourceIndex(0)
+5 >Emitted(34, 32) Source(36, 45) + SourceIndex(0)
+6 >Emitted(34, 34) Source(36, 14) + SourceIndex(0)
+7 >Emitted(34, 55) Source(36, 27) + SourceIndex(0)
+8 >Emitted(34, 57) Source(36, 29) + SourceIndex(0)
+9 >Emitted(34, 80) Source(36, 44) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -930,7 +930,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -944,7 +943,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(37, 1) Source(40, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(40, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(40, 5) + SourceIndex(0)
@@ -956,15 +954,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(37, 57) Source(40, 29) + SourceIndex(0)
 10>Emitted(37, 59) Source(40, 23) + SourceIndex(0)
 11>Emitted(37, 63) Source(40, 29) + SourceIndex(0)
-12>Emitted(37, 64) Source(40, 30) + SourceIndex(0)
 ---
 >>>    var numberB = robots_2[_u][0];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    numberB
+2 >    
+3 >        numberB
 1 >Emitted(38, 5) Source(40, 11) + SourceIndex(0)
-2 >Emitted(38, 34) Source(40, 18) + SourceIndex(0)
+2 >Emitted(38, 9) Source(40, 11) + SourceIndex(0)
+3 >Emitted(38, 34) Source(40, 18) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1014,7 +1014,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -1029,7 +1028,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(41, 1) Source(43, 1) + SourceIndex(0)
 2 >Emitted(41, 4) Source(43, 4) + SourceIndex(0)
 3 >Emitted(41, 5) Source(43, 5) + SourceIndex(0)
@@ -1043,15 +1041,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(41, 50) Source(43, 34) + SourceIndex(0)
 12>Emitted(41, 52) Source(43, 23) + SourceIndex(0)
 13>Emitted(41, 56) Source(43, 34) + SourceIndex(0)
-14>Emitted(41, 57) Source(43, 35) + SourceIndex(0)
 ---
 >>>    var numberB = _w[_v][0];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    numberB
+2 >    
+3 >        numberB
 1 >Emitted(42, 5) Source(43, 11) + SourceIndex(0)
-2 >Emitted(42, 28) Source(43, 18) + SourceIndex(0)
+2 >Emitted(42, 9) Source(43, 11) + SourceIndex(0)
+3 >Emitted(42, 28) Source(43, 18) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1103,7 +1103,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                        ^^^^^^^^^^^^^^
 14>                                                      ^^
 15>                                                        ^^^^
-16>                                                            ^
 1->
   >
 2 >for
@@ -1120,7 +1119,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                        [robotA, robotB]
 14>                                                      
 15>                                                        [robotA, robotB]
-16>                                                            )
 1->Emitted(45, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(46, 5) + SourceIndex(0)
@@ -1136,15 +1134,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(45, 55) Source(46, 39) + SourceIndex(0)
 14>Emitted(45, 57) Source(46, 23) + SourceIndex(0)
 15>Emitted(45, 61) Source(46, 39) + SourceIndex(0)
-16>Emitted(45, 62) Source(46, 40) + SourceIndex(0)
 ---
 >>>    var numberB = _y[_x][0];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    numberB
+2 >    
+3 >        numberB
 1 >Emitted(46, 5) Source(46, 11) + SourceIndex(0)
-2 >Emitted(46, 28) Source(46, 18) + SourceIndex(0)
+2 >Emitted(46, 9) Source(46, 11) + SourceIndex(0)
+3 >Emitted(46, 28) Source(46, 18) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1192,7 +1192,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
 1->
   >
 2 >for
@@ -1205,7 +1204,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(49, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(49, 5) + SourceIndex(0)
@@ -1217,15 +1215,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(49, 72) Source(49, 32) + SourceIndex(0)
 10>Emitted(49, 74) Source(49, 21) + SourceIndex(0)
 11>Emitted(49, 78) Source(49, 32) + SourceIndex(0)
-12>Emitted(49, 79) Source(49, 33) + SourceIndex(0)
 ---
 >>>    var nameB = multiRobots_2[_z][0];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    nameB
+2 >    
+3 >        nameB
 1 >Emitted(50, 5) Source(49, 11) + SourceIndex(0)
-2 >Emitted(50, 37) Source(49, 16) + SourceIndex(0)
+2 >Emitted(50, 9) Source(49, 11) + SourceIndex(0)
+3 >Emitted(50, 37) Source(49, 16) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1275,7 +1275,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
 1->
   >
 2 >for
@@ -1290,7 +1289,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(53, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(53, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(53, 5) Source(52, 5) + SourceIndex(0)
@@ -1304,15 +1302,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(53, 55) Source(52, 37) + SourceIndex(0)
 12>Emitted(53, 57) Source(52, 21) + SourceIndex(0)
 13>Emitted(53, 61) Source(52, 37) + SourceIndex(0)
-14>Emitted(53, 62) Source(52, 38) + SourceIndex(0)
 ---
 >>>    var nameB = _1[_0][0];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
 1 >
-2 >    nameB
+2 >    
+3 >        nameB
 1 >Emitted(54, 5) Source(52, 11) + SourceIndex(0)
-2 >Emitted(54, 26) Source(52, 16) + SourceIndex(0)
+2 >Emitted(54, 9) Source(52, 11) + SourceIndex(0)
+3 >Emitted(54, 26) Source(52, 16) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1364,7 +1364,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                  ^^^^^^^^^^^^^^
 14>                                                                ^^
 15>                                                                  ^^^^
-16>                                                                      ^
 1->
   >
 2 >for
@@ -1381,7 +1380,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                  [multiRobotA, multiRobotB]
 14>                                                                
 15>                                                                  [multiRobotA, multiRobotB]
-16>                                                                      )
 1->Emitted(57, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(57, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(57, 5) Source(55, 5) + SourceIndex(0)
@@ -1397,15 +1395,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(57, 65) Source(55, 47) + SourceIndex(0)
 14>Emitted(57, 67) Source(55, 21) + SourceIndex(0)
 15>Emitted(57, 71) Source(55, 47) + SourceIndex(0)
-16>Emitted(57, 72) Source(55, 48) + SourceIndex(0)
 ---
 >>>    var nameB = _3[_2][0];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
 1 >
-2 >    nameB
+2 >    
+3 >        nameB
 1 >Emitted(58, 5) Source(55, 11) + SourceIndex(0)
-2 >Emitted(58, 26) Source(55, 16) + SourceIndex(0)
+2 >Emitted(58, 9) Source(55, 11) + SourceIndex(0)
+3 >Emitted(58, 26) Source(55, 16) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1453,8 +1453,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^^^^^^^^^^^^->
+12>                                                              ^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1468,7 +1467,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(61, 1) Source(59, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(59, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(59, 5) + SourceIndex(0)
@@ -1480,33 +1478,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(61, 57) Source(59, 47) + SourceIndex(0)
 10>Emitted(61, 59) Source(59, 41) + SourceIndex(0)
 11>Emitted(61, 63) Source(59, 47) + SourceIndex(0)
-12>Emitted(61, 64) Source(59, 48) + SourceIndex(0)
 ---
 >>>    var _5 = robots_3[_4], numberA2 = _5[0], nameA2 = _5[1], skillA2 = _5[2];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^^^^^
-5 >                                           ^^
-6 >                                             ^^^^^^^^^^^^^^
-7 >                                                           ^^
-8 >                                                             ^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^^^^^
+6 >                                           ^^
+7 >                                             ^^^^^^^^^^^^^^
+8 >                                                           ^^
+9 >                                                             ^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA2, nameA2, skillA2]
-3 >                         
-4 >                           numberA2
-5 >                                           , 
-6 >                                             nameA2
-7 >                                                           , 
-8 >                                                             skillA2
-1->Emitted(62, 5) Source(59, 6) + SourceIndex(0)
-2 >Emitted(62, 26) Source(59, 37) + SourceIndex(0)
-3 >Emitted(62, 28) Source(59, 11) + SourceIndex(0)
-4 >Emitted(62, 44) Source(59, 19) + SourceIndex(0)
-5 >Emitted(62, 46) Source(59, 21) + SourceIndex(0)
-6 >Emitted(62, 60) Source(59, 27) + SourceIndex(0)
-7 >Emitted(62, 62) Source(59, 29) + SourceIndex(0)
-8 >Emitted(62, 77) Source(59, 36) + SourceIndex(0)
+2 >    
+3 >        [numberA2, nameA2, skillA2]
+4 >                         
+5 >                           numberA2
+6 >                                           , 
+7 >                                             nameA2
+8 >                                                           , 
+9 >                                                             skillA2
+1->Emitted(62, 5) Source(59, 10) + SourceIndex(0)
+2 >Emitted(62, 9) Source(59, 10) + SourceIndex(0)
+3 >Emitted(62, 26) Source(59, 37) + SourceIndex(0)
+4 >Emitted(62, 28) Source(59, 11) + SourceIndex(0)
+5 >Emitted(62, 44) Source(59, 19) + SourceIndex(0)
+6 >Emitted(62, 46) Source(59, 21) + SourceIndex(0)
+7 >Emitted(62, 60) Source(59, 27) + SourceIndex(0)
+8 >Emitted(62, 62) Source(59, 29) + SourceIndex(0)
+9 >Emitted(62, 77) Source(59, 36) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1556,8 +1556,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^^^^^^^^^^^->
+14>                                                       ^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1572,7 +1571,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(65, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(65, 4) Source(62, 4) + SourceIndex(0)
 3 >Emitted(65, 5) Source(62, 5) + SourceIndex(0)
@@ -1586,33 +1584,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(65, 50) Source(62, 52) + SourceIndex(0)
 12>Emitted(65, 52) Source(62, 41) + SourceIndex(0)
 13>Emitted(65, 56) Source(62, 52) + SourceIndex(0)
-14>Emitted(65, 57) Source(62, 53) + SourceIndex(0)
 ---
 >>>    var _8 = _7[_6], numberA2 = _8[0], nameA2 = _8[1], skillA2 = _8[2];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^
-7 >                                                     ^^
-8 >                                                       ^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^^^^
+6 >                                     ^^
+7 >                                       ^^^^^^^^^^^^^^
+8 >                                                     ^^
+9 >                                                       ^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA2, nameA2, skillA2]
-3 >                   
-4 >                     numberA2
-5 >                                     , 
-6 >                                       nameA2
-7 >                                                     , 
-8 >                                                       skillA2
-1->Emitted(66, 5) Source(62, 6) + SourceIndex(0)
-2 >Emitted(66, 20) Source(62, 37) + SourceIndex(0)
-3 >Emitted(66, 22) Source(62, 11) + SourceIndex(0)
-4 >Emitted(66, 38) Source(62, 19) + SourceIndex(0)
-5 >Emitted(66, 40) Source(62, 21) + SourceIndex(0)
-6 >Emitted(66, 54) Source(62, 27) + SourceIndex(0)
-7 >Emitted(66, 56) Source(62, 29) + SourceIndex(0)
-8 >Emitted(66, 71) Source(62, 36) + SourceIndex(0)
+2 >    
+3 >        [numberA2, nameA2, skillA2]
+4 >                   
+5 >                     numberA2
+6 >                                     , 
+7 >                                       nameA2
+8 >                                                     , 
+9 >                                                       skillA2
+1->Emitted(66, 5) Source(62, 10) + SourceIndex(0)
+2 >Emitted(66, 9) Source(62, 10) + SourceIndex(0)
+3 >Emitted(66, 20) Source(62, 37) + SourceIndex(0)
+4 >Emitted(66, 22) Source(62, 11) + SourceIndex(0)
+5 >Emitted(66, 38) Source(62, 19) + SourceIndex(0)
+6 >Emitted(66, 40) Source(62, 21) + SourceIndex(0)
+7 >Emitted(66, 54) Source(62, 27) + SourceIndex(0)
+8 >Emitted(66, 56) Source(62, 29) + SourceIndex(0)
+9 >Emitted(66, 71) Source(62, 36) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1664,8 +1664,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                         ^^^^^^^^^^^^^^^
 14>                                                        ^^
 15>                                                          ^^^^
-16>                                                              ^
-17>                                                               ^^^^^^^^^^^^^^->
+16>                                                              ^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1682,7 +1681,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                         [robotA, robotB]
 14>                                                        
 15>                                                          [robotA, robotB]
-16>                                                              )
 1->Emitted(69, 1) Source(65, 1) + SourceIndex(0)
 2 >Emitted(69, 4) Source(65, 4) + SourceIndex(0)
 3 >Emitted(69, 5) Source(65, 5) + SourceIndex(0)
@@ -1698,33 +1696,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(69, 57) Source(65, 57) + SourceIndex(0)
 14>Emitted(69, 59) Source(65, 41) + SourceIndex(0)
 15>Emitted(69, 63) Source(65, 57) + SourceIndex(0)
-16>Emitted(69, 64) Source(65, 58) + SourceIndex(0)
 ---
 >>>    var _11 = _10[_9], numberA2 = _11[0], nameA2 = _11[1], skillA2 = _11[2];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^
-4 >                       ^^^^^^^^^^^^^^^^^
-5 >                                        ^^
-6 >                                          ^^^^^^^^^^^^^^^
-7 >                                                         ^^
-8 >                                                           ^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^
+4 >                     ^^
+5 >                       ^^^^^^^^^^^^^^^^^
+6 >                                        ^^
+7 >                                          ^^^^^^^^^^^^^^^
+8 >                                                         ^^
+9 >                                                           ^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA2, nameA2, skillA2]
-3 >                     
-4 >                       numberA2
-5 >                                        , 
-6 >                                          nameA2
-7 >                                                         , 
-8 >                                                           skillA2
-1->Emitted(70, 5) Source(65, 6) + SourceIndex(0)
-2 >Emitted(70, 22) Source(65, 37) + SourceIndex(0)
-3 >Emitted(70, 24) Source(65, 11) + SourceIndex(0)
-4 >Emitted(70, 41) Source(65, 19) + SourceIndex(0)
-5 >Emitted(70, 43) Source(65, 21) + SourceIndex(0)
-6 >Emitted(70, 58) Source(65, 27) + SourceIndex(0)
-7 >Emitted(70, 60) Source(65, 29) + SourceIndex(0)
-8 >Emitted(70, 76) Source(65, 36) + SourceIndex(0)
+2 >    
+3 >        [numberA2, nameA2, skillA2]
+4 >                     
+5 >                       numberA2
+6 >                                        , 
+7 >                                          nameA2
+8 >                                                         , 
+9 >                                                           skillA2
+1->Emitted(70, 5) Source(65, 10) + SourceIndex(0)
+2 >Emitted(70, 9) Source(65, 10) + SourceIndex(0)
+3 >Emitted(70, 22) Source(65, 37) + SourceIndex(0)
+4 >Emitted(70, 24) Source(65, 11) + SourceIndex(0)
+5 >Emitted(70, 41) Source(65, 19) + SourceIndex(0)
+6 >Emitted(70, 43) Source(65, 21) + SourceIndex(0)
+7 >Emitted(70, 58) Source(65, 27) + SourceIndex(0)
+8 >Emitted(70, 60) Source(65, 29) + SourceIndex(0)
+9 >Emitted(70, 76) Source(65, 36) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1772,8 +1772,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1786,7 +1785,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(73, 1) Source(68, 1) + SourceIndex(0)
 2 >Emitted(73, 4) Source(68, 4) + SourceIndex(0)
 3 >Emitted(73, 5) Source(68, 5) + SourceIndex(0)
@@ -1798,39 +1796,41 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(73, 74) Source(68, 67) + SourceIndex(0)
 10>Emitted(73, 76) Source(68, 56) + SourceIndex(0)
 11>Emitted(73, 81) Source(68, 67) + SourceIndex(0)
-12>Emitted(73, 82) Source(68, 68) + SourceIndex(0)
 ---
 >>>    var _13 = multiRobots_3[_12], nameMA = _13[0], _14 = _13[1], primarySkillA = _14[0], secondarySkillA = _14[1];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                ^^
-4 >                                  ^^^^^^^^^^^^^^^
-5 >                                                 ^^
-6 >                                                   ^^^^^^^^^^^^
-7 >                                                               ^^
-8 >                                                                 ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                       ^^
-10>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                ^^
+5 >                                  ^^^^^^^^^^^^^^^
+6 >                                                 ^^
+7 >                                                   ^^^^^^^^^^^^
+8 >                                                               ^^
+9 >                                                                 ^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                       ^^
+11>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [nameMA, [primarySkillA, secondarySkillA]]
-3 >                                
-4 >                                  nameMA
-5 >                                                 , 
-6 >                                                   [primarySkillA, secondarySkillA]
-7 >                                                               
-8 >                                                                 primarySkillA
-9 >                                                                                       , 
-10>                                                                                         secondarySkillA
-1->Emitted(74, 5) Source(68, 6) + SourceIndex(0)
-2 >Emitted(74, 33) Source(68, 52) + SourceIndex(0)
-3 >Emitted(74, 35) Source(68, 11) + SourceIndex(0)
-4 >Emitted(74, 50) Source(68, 17) + SourceIndex(0)
-5 >Emitted(74, 52) Source(68, 19) + SourceIndex(0)
-6 >Emitted(74, 64) Source(68, 51) + SourceIndex(0)
-7 >Emitted(74, 66) Source(68, 20) + SourceIndex(0)
-8 >Emitted(74, 88) Source(68, 33) + SourceIndex(0)
-9 >Emitted(74, 90) Source(68, 35) + SourceIndex(0)
-10>Emitted(74, 114) Source(68, 50) + SourceIndex(0)
+2 >    
+3 >        [nameMA, [primarySkillA, secondarySkillA]]
+4 >                                
+5 >                                  nameMA
+6 >                                                 , 
+7 >                                                   [primarySkillA, secondarySkillA]
+8 >                                                               
+9 >                                                                 primarySkillA
+10>                                                                                       , 
+11>                                                                                         secondarySkillA
+1->Emitted(74, 5) Source(68, 10) + SourceIndex(0)
+2 >Emitted(74, 9) Source(68, 10) + SourceIndex(0)
+3 >Emitted(74, 33) Source(68, 52) + SourceIndex(0)
+4 >Emitted(74, 35) Source(68, 11) + SourceIndex(0)
+5 >Emitted(74, 50) Source(68, 17) + SourceIndex(0)
+6 >Emitted(74, 52) Source(68, 19) + SourceIndex(0)
+7 >Emitted(74, 64) Source(68, 51) + SourceIndex(0)
+8 >Emitted(74, 66) Source(68, 20) + SourceIndex(0)
+9 >Emitted(74, 88) Source(68, 33) + SourceIndex(0)
+10>Emitted(74, 90) Source(68, 35) + SourceIndex(0)
+11>Emitted(74, 114) Source(68, 50) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -1880,8 +1880,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1896,7 +1895,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(77, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(71, 5) + SourceIndex(0)
@@ -1910,39 +1908,41 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(77, 59) Source(71, 72) + SourceIndex(0)
 12>Emitted(77, 61) Source(71, 56) + SourceIndex(0)
 13>Emitted(77, 66) Source(71, 72) + SourceIndex(0)
-14>Emitted(77, 67) Source(71, 73) + SourceIndex(0)
 ---
 >>>    var _17 = _16[_15], nameMA = _17[0], _18 = _17[1], primarySkillA = _18[0], secondarySkillA = _18[1];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^^
-5 >                                       ^^
-6 >                                         ^^^^^^^^^^^^
-7 >                                                     ^^
-8 >                                                       ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                             ^^
-10>                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^^
+6 >                                       ^^
+7 >                                         ^^^^^^^^^^^^
+8 >                                                     ^^
+9 >                                                       ^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                             ^^
+11>                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [nameMA, [primarySkillA, secondarySkillA]]
-3 >                      
-4 >                        nameMA
-5 >                                       , 
-6 >                                         [primarySkillA, secondarySkillA]
-7 >                                                     
-8 >                                                       primarySkillA
-9 >                                                                             , 
-10>                                                                               secondarySkillA
-1->Emitted(78, 5) Source(71, 6) + SourceIndex(0)
-2 >Emitted(78, 23) Source(71, 52) + SourceIndex(0)
-3 >Emitted(78, 25) Source(71, 11) + SourceIndex(0)
-4 >Emitted(78, 40) Source(71, 17) + SourceIndex(0)
-5 >Emitted(78, 42) Source(71, 19) + SourceIndex(0)
-6 >Emitted(78, 54) Source(71, 51) + SourceIndex(0)
-7 >Emitted(78, 56) Source(71, 20) + SourceIndex(0)
-8 >Emitted(78, 78) Source(71, 33) + SourceIndex(0)
-9 >Emitted(78, 80) Source(71, 35) + SourceIndex(0)
-10>Emitted(78, 104) Source(71, 50) + SourceIndex(0)
+2 >    
+3 >        [nameMA, [primarySkillA, secondarySkillA]]
+4 >                      
+5 >                        nameMA
+6 >                                       , 
+7 >                                         [primarySkillA, secondarySkillA]
+8 >                                                     
+9 >                                                       primarySkillA
+10>                                                                             , 
+11>                                                                               secondarySkillA
+1->Emitted(78, 5) Source(71, 10) + SourceIndex(0)
+2 >Emitted(78, 9) Source(71, 10) + SourceIndex(0)
+3 >Emitted(78, 23) Source(71, 52) + SourceIndex(0)
+4 >Emitted(78, 25) Source(71, 11) + SourceIndex(0)
+5 >Emitted(78, 40) Source(71, 17) + SourceIndex(0)
+6 >Emitted(78, 42) Source(71, 19) + SourceIndex(0)
+7 >Emitted(78, 54) Source(71, 51) + SourceIndex(0)
+8 >Emitted(78, 56) Source(71, 20) + SourceIndex(0)
+9 >Emitted(78, 78) Source(71, 33) + SourceIndex(0)
+10>Emitted(78, 80) Source(71, 35) + SourceIndex(0)
+11>Emitted(78, 104) Source(71, 50) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -1994,8 +1994,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
-17>                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2012,7 +2011,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(81, 1) Source(74, 1) + SourceIndex(0)
 2 >Emitted(81, 4) Source(74, 4) + SourceIndex(0)
 3 >Emitted(81, 5) Source(74, 5) + SourceIndex(0)
@@ -2028,39 +2026,41 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(81, 69) Source(74, 82) + SourceIndex(0)
 14>Emitted(81, 71) Source(74, 56) + SourceIndex(0)
 15>Emitted(81, 76) Source(74, 82) + SourceIndex(0)
-16>Emitted(81, 77) Source(74, 83) + SourceIndex(0)
 ---
 >>>    var _21 = _20[_19], nameMA = _21[0], _22 = _21[1], primarySkillA = _22[0], secondarySkillA = _22[1];
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^^
-5 >                                       ^^
-6 >                                         ^^^^^^^^^^^^
-7 >                                                     ^^
-8 >                                                       ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                             ^^
-10>                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^^
+6 >                                       ^^
+7 >                                         ^^^^^^^^^^^^
+8 >                                                     ^^
+9 >                                                       ^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                             ^^
+11>                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [nameMA, [primarySkillA, secondarySkillA]]
-3 >                      
-4 >                        nameMA
-5 >                                       , 
-6 >                                         [primarySkillA, secondarySkillA]
-7 >                                                     
-8 >                                                       primarySkillA
-9 >                                                                             , 
-10>                                                                               secondarySkillA
-1->Emitted(82, 5) Source(74, 6) + SourceIndex(0)
-2 >Emitted(82, 23) Source(74, 52) + SourceIndex(0)
-3 >Emitted(82, 25) Source(74, 11) + SourceIndex(0)
-4 >Emitted(82, 40) Source(74, 17) + SourceIndex(0)
-5 >Emitted(82, 42) Source(74, 19) + SourceIndex(0)
-6 >Emitted(82, 54) Source(74, 51) + SourceIndex(0)
-7 >Emitted(82, 56) Source(74, 20) + SourceIndex(0)
-8 >Emitted(82, 78) Source(74, 33) + SourceIndex(0)
-9 >Emitted(82, 80) Source(74, 35) + SourceIndex(0)
-10>Emitted(82, 104) Source(74, 50) + SourceIndex(0)
+2 >    
+3 >        [nameMA, [primarySkillA, secondarySkillA]]
+4 >                      
+5 >                        nameMA
+6 >                                       , 
+7 >                                         [primarySkillA, secondarySkillA]
+8 >                                                     
+9 >                                                       primarySkillA
+10>                                                                             , 
+11>                                                                               secondarySkillA
+1->Emitted(82, 5) Source(74, 10) + SourceIndex(0)
+2 >Emitted(82, 9) Source(74, 10) + SourceIndex(0)
+3 >Emitted(82, 23) Source(74, 52) + SourceIndex(0)
+4 >Emitted(82, 25) Source(74, 11) + SourceIndex(0)
+5 >Emitted(82, 40) Source(74, 17) + SourceIndex(0)
+6 >Emitted(82, 42) Source(74, 19) + SourceIndex(0)
+7 >Emitted(82, 54) Source(74, 51) + SourceIndex(0)
+8 >Emitted(82, 56) Source(74, 20) + SourceIndex(0)
+9 >Emitted(82, 78) Source(74, 33) + SourceIndex(0)
+10>Emitted(82, 80) Source(74, 35) + SourceIndex(0)
+11>Emitted(82, 104) Source(74, 50) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2108,8 +2108,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^->
 1->
   >
   >
@@ -2123,7 +2122,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(85, 1) Source(78, 1) + SourceIndex(0)
 2 >Emitted(85, 4) Source(78, 4) + SourceIndex(0)
 3 >Emitted(85, 5) Source(78, 5) + SourceIndex(0)
@@ -2135,27 +2133,29 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(85, 59) Source(78, 45) + SourceIndex(0)
 10>Emitted(85, 61) Source(78, 39) + SourceIndex(0)
 11>Emitted(85, 66) Source(78, 45) + SourceIndex(0)
-12>Emitted(85, 67) Source(78, 46) + SourceIndex(0)
 ---
 >>>    var _24 = robots_4[_23], numberA3 = _24[0], robotAInfo = _24.slice(1);
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^^
-4 >                             ^^^^^^^^^^^^^^^^^
-5 >                                              ^^
-6 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
+4 >                           ^^
+5 >                             ^^^^^^^^^^^^^^^^^
+6 >                                              ^^
+7 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA3, ...robotAInfo]
-3 >                           
-4 >                             numberA3
-5 >                                              , 
-6 >                                                ...robotAInfo
-1->Emitted(86, 5) Source(78, 6) + SourceIndex(0)
-2 >Emitted(86, 28) Source(78, 35) + SourceIndex(0)
-3 >Emitted(86, 30) Source(78, 11) + SourceIndex(0)
-4 >Emitted(86, 47) Source(78, 19) + SourceIndex(0)
-5 >Emitted(86, 49) Source(78, 21) + SourceIndex(0)
-6 >Emitted(86, 74) Source(78, 34) + SourceIndex(0)
+2 >    
+3 >        [numberA3, ...robotAInfo]
+4 >                           
+5 >                             numberA3
+6 >                                              , 
+7 >                                                ...robotAInfo
+1->Emitted(86, 5) Source(78, 10) + SourceIndex(0)
+2 >Emitted(86, 9) Source(78, 10) + SourceIndex(0)
+3 >Emitted(86, 28) Source(78, 35) + SourceIndex(0)
+4 >Emitted(86, 30) Source(78, 11) + SourceIndex(0)
+5 >Emitted(86, 47) Source(78, 19) + SourceIndex(0)
+6 >Emitted(86, 49) Source(78, 21) + SourceIndex(0)
+7 >Emitted(86, 74) Source(78, 34) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2205,8 +2205,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^->
+14>                                                            ^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2221,7 +2220,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(89, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(89, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(89, 5) Source(81, 5) + SourceIndex(0)
@@ -2235,27 +2233,29 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(89, 54) Source(81, 50) + SourceIndex(0)
 12>Emitted(89, 56) Source(81, 39) + SourceIndex(0)
 13>Emitted(89, 61) Source(81, 50) + SourceIndex(0)
-14>Emitted(89, 62) Source(81, 51) + SourceIndex(0)
 ---
 >>>    var _27 = _26[_25], numberA3 = _27[0], robotAInfo = _27.slice(1);
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^^^^
-5 >                                         ^^
-6 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^^^^
+6 >                                         ^^
+7 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA3, ...robotAInfo]
-3 >                      
-4 >                        numberA3
-5 >                                         , 
-6 >                                           ...robotAInfo
-1->Emitted(90, 5) Source(81, 6) + SourceIndex(0)
-2 >Emitted(90, 23) Source(81, 35) + SourceIndex(0)
-3 >Emitted(90, 25) Source(81, 11) + SourceIndex(0)
-4 >Emitted(90, 42) Source(81, 19) + SourceIndex(0)
-5 >Emitted(90, 44) Source(81, 21) + SourceIndex(0)
-6 >Emitted(90, 69) Source(81, 34) + SourceIndex(0)
+2 >    
+3 >        [numberA3, ...robotAInfo]
+4 >                      
+5 >                        numberA3
+6 >                                         , 
+7 >                                           ...robotAInfo
+1->Emitted(90, 5) Source(81, 10) + SourceIndex(0)
+2 >Emitted(90, 9) Source(81, 10) + SourceIndex(0)
+3 >Emitted(90, 23) Source(81, 35) + SourceIndex(0)
+4 >Emitted(90, 25) Source(81, 11) + SourceIndex(0)
+5 >Emitted(90, 42) Source(81, 19) + SourceIndex(0)
+6 >Emitted(90, 44) Source(81, 21) + SourceIndex(0)
+7 >Emitted(90, 69) Source(81, 34) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2307,8 +2307,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
-17>                                                                  ^^^^->
+16>                                                                 ^^^^^->
 1->
   >
 2 >for
@@ -2325,7 +2324,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(93, 1) Source(84, 1) + SourceIndex(0)
 2 >Emitted(93, 4) Source(84, 4) + SourceIndex(0)
 3 >Emitted(93, 5) Source(84, 5) + SourceIndex(0)
@@ -2341,27 +2339,29 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(93, 59) Source(84, 55) + SourceIndex(0)
 14>Emitted(93, 61) Source(84, 39) + SourceIndex(0)
 15>Emitted(93, 66) Source(84, 55) + SourceIndex(0)
-16>Emitted(93, 67) Source(84, 56) + SourceIndex(0)
 ---
 >>>    var _30 = _29[_28], numberA3 = _30[0], robotAInfo = _30.slice(1);
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^^^^
-5 >                                         ^^
-6 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^^^^
+6 >                                         ^^
+7 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA3, ...robotAInfo]
-3 >                      
-4 >                        numberA3
-5 >                                         , 
-6 >                                           ...robotAInfo
-1->Emitted(94, 5) Source(84, 6) + SourceIndex(0)
-2 >Emitted(94, 23) Source(84, 35) + SourceIndex(0)
-3 >Emitted(94, 25) Source(84, 11) + SourceIndex(0)
-4 >Emitted(94, 42) Source(84, 19) + SourceIndex(0)
-5 >Emitted(94, 44) Source(84, 21) + SourceIndex(0)
-6 >Emitted(94, 69) Source(84, 34) + SourceIndex(0)
+2 >    
+3 >        [numberA3, ...robotAInfo]
+4 >                      
+5 >                        numberA3
+6 >                                         , 
+7 >                                           ...robotAInfo
+1->Emitted(94, 5) Source(84, 10) + SourceIndex(0)
+2 >Emitted(94, 9) Source(84, 10) + SourceIndex(0)
+3 >Emitted(94, 23) Source(84, 35) + SourceIndex(0)
+4 >Emitted(94, 25) Source(84, 11) + SourceIndex(0)
+5 >Emitted(94, 42) Source(84, 19) + SourceIndex(0)
+6 >Emitted(94, 44) Source(84, 21) + SourceIndex(0)
+7 >Emitted(94, 69) Source(84, 34) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2409,7 +2409,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
 1->
   >
 2 >for
@@ -2422,7 +2421,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(97, 1) Source(87, 1) + SourceIndex(0)
 2 >Emitted(97, 4) Source(87, 4) + SourceIndex(0)
 3 >Emitted(97, 5) Source(87, 5) + SourceIndex(0)
@@ -2434,15 +2432,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 9 >Emitted(97, 74) Source(87, 45) + SourceIndex(0)
 10>Emitted(97, 76) Source(87, 34) + SourceIndex(0)
 11>Emitted(97, 81) Source(87, 45) + SourceIndex(0)
-12>Emitted(97, 82) Source(87, 46) + SourceIndex(0)
 ---
 >>>    var multiRobotAInfo = multiRobots_4[_31].slice(0);
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    ...multiRobotAInfo
+2 >    
+3 >        ...multiRobotAInfo
 1 >Emitted(98, 5) Source(87, 11) + SourceIndex(0)
-2 >Emitted(98, 54) Source(87, 29) + SourceIndex(0)
+2 >Emitted(98, 9) Source(87, 11) + SourceIndex(0)
+3 >Emitted(98, 54) Source(87, 29) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
@@ -2492,7 +2492,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
 1->
   >
 2 >for
@@ -2507,7 +2506,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(101, 1) Source(90, 1) + SourceIndex(0)
 2 >Emitted(101, 4) Source(90, 4) + SourceIndex(0)
 3 >Emitted(101, 5) Source(90, 5) + SourceIndex(0)
@@ -2521,15 +2519,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 11>Emitted(101, 59) Source(90, 50) + SourceIndex(0)
 12>Emitted(101, 61) Source(90, 34) + SourceIndex(0)
 13>Emitted(101, 66) Source(90, 50) + SourceIndex(0)
-14>Emitted(101, 67) Source(90, 51) + SourceIndex(0)
 ---
 >>>    var multiRobotAInfo = _33[_32].slice(0);
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    ...multiRobotAInfo
+2 >    
+3 >        ...multiRobotAInfo
 1 >Emitted(102, 5) Source(90, 11) + SourceIndex(0)
-2 >Emitted(102, 44) Source(90, 29) + SourceIndex(0)
+2 >Emitted(102, 9) Source(90, 11) + SourceIndex(0)
+3 >Emitted(102, 44) Source(90, 29) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
@@ -2581,7 +2581,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
 1->
   >
 2 >for
@@ -2598,7 +2597,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(105, 1) Source(93, 1) + SourceIndex(0)
 2 >Emitted(105, 4) Source(93, 4) + SourceIndex(0)
 3 >Emitted(105, 5) Source(93, 5) + SourceIndex(0)
@@ -2614,15 +2612,17 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern.ts
 13>Emitted(105, 69) Source(93, 60) + SourceIndex(0)
 14>Emitted(105, 71) Source(93, 34) + SourceIndex(0)
 15>Emitted(105, 76) Source(93, 60) + SourceIndex(0)
-16>Emitted(105, 77) Source(93, 61) + SourceIndex(0)
 ---
 >>>    var multiRobotAInfo = _35[_34].slice(0);
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    ...multiRobotAInfo
+2 >    
+3 >        ...multiRobotAInfo
 1 >Emitted(106, 5) Source(93, 11) + SourceIndex(0)
-2 >Emitted(106, 44) Source(93, 29) + SourceIndex(0)
+2 >Emitted(106, 9) Source(93, 11) + SourceIndex(0)
+3 >Emitted(106, 44) Source(93, 29) + SourceIndex(0)
 ---
 >>>    console.log(multiRobotAInfo);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.js.map
index cae221df0f2..1a42ddf3907 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfArrayBindingPattern2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPattern2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AAEtG,GAAG,CAAC,CAAc,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAApB,iBAAS,EAAN,aAAK;IACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAc,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAzB,WAAS,EAAN,aAAK;IACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAc,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA9B,WAAS,EAAN,aAAK;IACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyC,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAApD,sBAAoC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAAyC,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAAzD,WAAoC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAAyC,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,CAAC;IAAnE,WAAoC,EAAjC,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAc,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAnB,yBAAO;IACT,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAc,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAxB,mBAAO;IACT,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAc,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA7B,mBAAO;IACT,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAY,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAtB,4BAAK;IACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA3B,iBAAK;IACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,CAAC;IAArC,iBAAK;IACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAAgC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAtC,iBAA2B,EAA1B,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAgC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA3C,WAA2B,EAA1B,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAgC,UAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,eAAgB,EAAhB,IAAgB,CAAC;IAAhD,aAA2B,EAA1B,iBAAQ,EAAE,eAAM,EAAE,gBAAO;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA+C,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAA1D,wBAA0C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA+C,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAA/D,cAA0C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA+C,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAAzE,cAA0C,EAAzC,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAA8B,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAApC,mBAAyB,EAAxB,iBAAQ,EAAE,yBAAa;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA8B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAAzC,cAAyB,EAAxB,iBAAQ,EAAE,yBAAa;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA8B,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAA9C,cAAyB,EAAxB,iBAAQ,EAAE,yBAAa;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAyB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAAnC,6CAAkB;IACpB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAAyB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAxC,mCAAkB;IACpB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAAyB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAAlD,mCAAkB;IACpB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPattern2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AAEtG,GAAG,CAAC,CAAc,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;uBAAhB,aAAK;IACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAc,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;iBAArB,aAAK;IACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAc,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB;iBAA1B,aAAK;IACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyC,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;4BAAhD,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAAyC,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;iBAArD,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAAyC,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B;iBAA/D,UAAgC,EAA/B,qBAAa,EAAE,uBAAe;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAc,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAlB,yBAAO;IACT,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAc,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAvB,mBAAO;IACT,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAc,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB;IAA5B,mBAAO;IACT,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAY,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAArB,4BAAK;IACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAA1B,iBAAK;IACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B;IAApC,iBAAK;IACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAAgC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;uBAApC,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAgC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;iBAAzC,gBAAQ,EAAE,cAAM,EAAE,eAAO;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAAgC,UAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,eAAgB,EAAhB,IAAgB;mBAA9C,iBAAQ,EAAE,eAAM,EAAE,gBAAO;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA+C,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;8BAAxD,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA+C,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;oBAA7D,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA+C,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;oBAAvE,eAAM,EAAE,YAAgC,EAA/B,sBAAa,EAAE,wBAAe;IACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAA8B,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;yBAAlC,iBAAQ,EAAE,yBAAa;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA8B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;oBAAvC,iBAAQ,EAAE,yBAAa;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA8B,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;oBAA5C,iBAAQ,EAAE,yBAAa;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAyB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IAAlC,6CAAkB;IACpB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAAyB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAAvC,mCAAkB;IACpB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC;AACD,GAAG,CAAC,CAAyB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;IAAjD,mCAAkB;IACpB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;CAChC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.sourcemap.txt
index 72970488233..f670f9eda1f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.sourcemap.txt
@@ -444,7 +444,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -458,7 +457,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(17, 1) Source(26, 1) + SourceIndex(0)
 2 >Emitted(17, 4) Source(26, 4) + SourceIndex(0)
 3 >Emitted(17, 5) Source(26, 5) + SourceIndex(0)
@@ -470,21 +468,14 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(17, 57) Source(26, 25) + SourceIndex(0)
 10>Emitted(17, 59) Source(26, 19) + SourceIndex(0)
 11>Emitted(17, 63) Source(26, 25) + SourceIndex(0)
-12>Emitted(17, 64) Source(26, 26) + SourceIndex(0)
 ---
 >>>    _a = robots_1[_i], nameA = _a[1];
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^
-4 >                       ^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^^^^^^^
+2 >                       ^^^^^^^^^^^^^
 1 >
-2 >    [, nameA]
-3 >                     
-4 >                       nameA
-1 >Emitted(18, 5) Source(26, 6) + SourceIndex(0)
-2 >Emitted(18, 22) Source(26, 15) + SourceIndex(0)
-3 >Emitted(18, 24) Source(26, 9) + SourceIndex(0)
-4 >Emitted(18, 37) Source(26, 14) + SourceIndex(0)
+2 >                       nameA
+1 >Emitted(18, 24) Source(26, 9) + SourceIndex(0)
+2 >Emitted(18, 37) Source(26, 14) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -534,7 +525,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -549,7 +539,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(21, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(29, 5) + SourceIndex(0)
@@ -563,21 +552,14 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(21, 50) Source(29, 30) + SourceIndex(0)
 12>Emitted(21, 52) Source(29, 19) + SourceIndex(0)
 13>Emitted(21, 56) Source(29, 30) + SourceIndex(0)
-14>Emitted(21, 57) Source(29, 31) + SourceIndex(0)
 ---
 >>>    _d = _c[_b], nameA = _d[1];
-1 >^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^^^^
 1 >
-2 >    [, nameA]
-3 >               
-4 >                 nameA
-1 >Emitted(22, 5) Source(29, 6) + SourceIndex(0)
-2 >Emitted(22, 16) Source(29, 15) + SourceIndex(0)
-3 >Emitted(22, 18) Source(29, 9) + SourceIndex(0)
-4 >Emitted(22, 31) Source(29, 14) + SourceIndex(0)
+2 >                 nameA
+1 >Emitted(22, 18) Source(29, 9) + SourceIndex(0)
+2 >Emitted(22, 31) Source(29, 14) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -629,7 +611,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                        ^^^^^^^^^^^^^^
 14>                                                      ^^
 15>                                                        ^^^^
-16>                                                            ^
 1->
   >
 2 >for
@@ -646,7 +627,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                        [robotA, robotB]
 14>                                                      
 15>                                                        [robotA, robotB]
-16>                                                            )
 1->Emitted(25, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(25, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(25, 5) Source(32, 5) + SourceIndex(0)
@@ -662,21 +642,14 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(25, 55) Source(32, 35) + SourceIndex(0)
 14>Emitted(25, 57) Source(32, 19) + SourceIndex(0)
 15>Emitted(25, 61) Source(32, 35) + SourceIndex(0)
-16>Emitted(25, 62) Source(32, 36) + SourceIndex(0)
 ---
 >>>    _g = _f[_e], nameA = _g[1];
-1 >^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^^^^
 1 >
-2 >    [, nameA]
-3 >               
-4 >                 nameA
-1 >Emitted(26, 5) Source(32, 6) + SourceIndex(0)
-2 >Emitted(26, 16) Source(32, 15) + SourceIndex(0)
-3 >Emitted(26, 18) Source(32, 9) + SourceIndex(0)
-4 >Emitted(26, 31) Source(32, 14) + SourceIndex(0)
+2 >                 nameA
+1 >Emitted(26, 18) Source(32, 9) + SourceIndex(0)
+2 >Emitted(26, 31) Source(32, 14) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -724,8 +697,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -738,7 +710,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(29, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(29, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(29, 5) Source(35, 5) + SourceIndex(0)
@@ -750,33 +721,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(29, 72) Source(35, 57) + SourceIndex(0)
 10>Emitted(29, 74) Source(35, 46) + SourceIndex(0)
 11>Emitted(29, 78) Source(35, 57) + SourceIndex(0)
-12>Emitted(29, 79) Source(35, 58) + SourceIndex(0)
 ---
 >>>    _j = multiRobots_1[_h], _k = _j[1], primarySkillA = _k[0], secondarySkillA = _k[1];
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^
-4 >                            ^^^^^^^^^^
-5 >                                      ^^
-6 >                                        ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                             ^^
-8 >                                                               ^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                            ^^^^^^^^^^
+3 >                                      ^^
+4 >                                        ^^^^^^^^^^^^^^^^^^^^^
+5 >                                                             ^^
+6 >                                                               ^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, [primarySkillA, secondarySkillA]]
-3 >                          
-4 >                            [primarySkillA, secondarySkillA]
-5 >                                      
-6 >                                        primarySkillA
-7 >                                                             , 
-8 >                                                               secondarySkillA
-1->Emitted(30, 5) Source(35, 6) + SourceIndex(0)
-2 >Emitted(30, 27) Source(35, 42) + SourceIndex(0)
-3 >Emitted(30, 29) Source(35, 9) + SourceIndex(0)
-4 >Emitted(30, 39) Source(35, 41) + SourceIndex(0)
-5 >Emitted(30, 41) Source(35, 10) + SourceIndex(0)
-6 >Emitted(30, 62) Source(35, 23) + SourceIndex(0)
-7 >Emitted(30, 64) Source(35, 25) + SourceIndex(0)
-8 >Emitted(30, 87) Source(35, 40) + SourceIndex(0)
+2 >                            [primarySkillA, secondarySkillA]
+3 >                                      
+4 >                                        primarySkillA
+5 >                                                             , 
+6 >                                                               secondarySkillA
+1->Emitted(30, 29) Source(35, 9) + SourceIndex(0)
+2 >Emitted(30, 39) Source(35, 41) + SourceIndex(0)
+3 >Emitted(30, 41) Source(35, 10) + SourceIndex(0)
+4 >Emitted(30, 62) Source(35, 23) + SourceIndex(0)
+5 >Emitted(30, 64) Source(35, 25) + SourceIndex(0)
+6 >Emitted(30, 87) Source(35, 40) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -826,8 +790,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -842,7 +805,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(33, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(38, 5) + SourceIndex(0)
@@ -856,33 +818,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(33, 55) Source(38, 62) + SourceIndex(0)
 12>Emitted(33, 57) Source(38, 46) + SourceIndex(0)
 13>Emitted(33, 61) Source(38, 62) + SourceIndex(0)
-14>Emitted(33, 62) Source(38, 63) + SourceIndex(0)
 ---
 >>>    _o = _m[_l], _p = _o[1], primarySkillA = _p[0], secondarySkillA = _p[1];
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^
-5 >                           ^^
-6 >                             ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                  ^^
-8 >                                                    ^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^
+5 >                                                  ^^
+6 >                                                    ^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, [primarySkillA, secondarySkillA]]
-3 >               
-4 >                 [primarySkillA, secondarySkillA]
-5 >                           
-6 >                             primarySkillA
-7 >                                                  , 
-8 >                                                    secondarySkillA
-1->Emitted(34, 5) Source(38, 6) + SourceIndex(0)
-2 >Emitted(34, 16) Source(38, 42) + SourceIndex(0)
-3 >Emitted(34, 18) Source(38, 9) + SourceIndex(0)
-4 >Emitted(34, 28) Source(38, 41) + SourceIndex(0)
-5 >Emitted(34, 30) Source(38, 10) + SourceIndex(0)
-6 >Emitted(34, 51) Source(38, 23) + SourceIndex(0)
-7 >Emitted(34, 53) Source(38, 25) + SourceIndex(0)
-8 >Emitted(34, 76) Source(38, 40) + SourceIndex(0)
+2 >                 [primarySkillA, secondarySkillA]
+3 >                           
+4 >                             primarySkillA
+5 >                                                  , 
+6 >                                                    secondarySkillA
+1->Emitted(34, 18) Source(38, 9) + SourceIndex(0)
+2 >Emitted(34, 28) Source(38, 41) + SourceIndex(0)
+3 >Emitted(34, 30) Source(38, 10) + SourceIndex(0)
+4 >Emitted(34, 51) Source(38, 23) + SourceIndex(0)
+5 >Emitted(34, 53) Source(38, 25) + SourceIndex(0)
+6 >Emitted(34, 76) Source(38, 40) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -934,8 +889,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                  ^^^^^^^^^^^^^^
 14>                                                                ^^
 15>                                                                  ^^^^
-16>                                                                      ^
-17>                                                                       ^^^^^^->
+16>                                                                      ^^^^^^^->
 1->
   >
 2 >for
@@ -952,7 +906,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                  [multiRobotA, multiRobotB]
 14>                                                                
 15>                                                                  [multiRobotA, multiRobotB]
-16>                                                                      )
 1->Emitted(37, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(41, 5) + SourceIndex(0)
@@ -968,33 +921,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(37, 65) Source(41, 72) + SourceIndex(0)
 14>Emitted(37, 67) Source(41, 46) + SourceIndex(0)
 15>Emitted(37, 71) Source(41, 72) + SourceIndex(0)
-16>Emitted(37, 72) Source(41, 73) + SourceIndex(0)
 ---
 >>>    _s = _r[_q], _t = _s[1], primarySkillA = _t[0], secondarySkillA = _t[1];
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^
-5 >                           ^^
-6 >                             ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                  ^^
-8 >                                                    ^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^
+5 >                                                  ^^
+6 >                                                    ^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, [primarySkillA, secondarySkillA]]
-3 >               
-4 >                 [primarySkillA, secondarySkillA]
-5 >                           
-6 >                             primarySkillA
-7 >                                                  , 
-8 >                                                    secondarySkillA
-1->Emitted(38, 5) Source(41, 6) + SourceIndex(0)
-2 >Emitted(38, 16) Source(41, 42) + SourceIndex(0)
-3 >Emitted(38, 18) Source(41, 9) + SourceIndex(0)
-4 >Emitted(38, 28) Source(41, 41) + SourceIndex(0)
-5 >Emitted(38, 30) Source(41, 10) + SourceIndex(0)
-6 >Emitted(38, 51) Source(41, 23) + SourceIndex(0)
-7 >Emitted(38, 53) Source(41, 25) + SourceIndex(0)
-8 >Emitted(38, 76) Source(41, 40) + SourceIndex(0)
+2 >                 [primarySkillA, secondarySkillA]
+3 >                           
+4 >                             primarySkillA
+5 >                                                  , 
+6 >                                                    secondarySkillA
+1->Emitted(38, 18) Source(41, 9) + SourceIndex(0)
+2 >Emitted(38, 28) Source(41, 41) + SourceIndex(0)
+3 >Emitted(38, 30) Source(41, 10) + SourceIndex(0)
+4 >Emitted(38, 51) Source(41, 23) + SourceIndex(0)
+5 >Emitted(38, 53) Source(41, 25) + SourceIndex(0)
+6 >Emitted(38, 76) Source(41, 40) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -1042,7 +988,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -1056,7 +1001,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(41, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(41, 4) Source(45, 4) + SourceIndex(0)
 3 >Emitted(41, 5) Source(45, 5) + SourceIndex(0)
@@ -1068,7 +1012,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(41, 57) Source(45, 25) + SourceIndex(0)
 10>Emitted(41, 59) Source(45, 19) + SourceIndex(0)
 11>Emitted(41, 63) Source(45, 25) + SourceIndex(0)
-12>Emitted(41, 64) Source(45, 26) + SourceIndex(0)
 ---
 >>>    numberB = robots_2[_u][0];
 1 >^^^^
@@ -1126,7 +1069,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -1141,7 +1083,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(45, 1) Source(48, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(48, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(48, 5) + SourceIndex(0)
@@ -1155,7 +1096,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(45, 50) Source(48, 30) + SourceIndex(0)
 12>Emitted(45, 52) Source(48, 19) + SourceIndex(0)
 13>Emitted(45, 56) Source(48, 30) + SourceIndex(0)
-14>Emitted(45, 57) Source(48, 31) + SourceIndex(0)
 ---
 >>>    numberB = _w[_v][0];
 1 >^^^^
@@ -1216,7 +1156,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                        ^^^^^^^^^^^^^^
 14>                                                      ^^
 15>                                                        ^^^^
-16>                                                            ^
 1->
   >
 2 >for
@@ -1233,7 +1172,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                        [robotA, robotB]
 14>                                                      
 15>                                                        [robotA, robotB]
-16>                                                            )
 1->Emitted(49, 1) Source(51, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(51, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(51, 5) + SourceIndex(0)
@@ -1249,7 +1187,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(49, 55) Source(51, 35) + SourceIndex(0)
 14>Emitted(49, 57) Source(51, 19) + SourceIndex(0)
 15>Emitted(49, 61) Source(51, 35) + SourceIndex(0)
-16>Emitted(49, 62) Source(51, 36) + SourceIndex(0)
 ---
 >>>    numberB = _y[_x][0];
 1 >^^^^
@@ -1306,7 +1243,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
 1->
   >
 2 >for
@@ -1319,7 +1255,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(53, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(53, 4) Source(54, 4) + SourceIndex(0)
 3 >Emitted(53, 5) Source(54, 5) + SourceIndex(0)
@@ -1331,7 +1266,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(53, 72) Source(54, 28) + SourceIndex(0)
 10>Emitted(53, 74) Source(54, 17) + SourceIndex(0)
 11>Emitted(53, 78) Source(54, 28) + SourceIndex(0)
-12>Emitted(53, 79) Source(54, 29) + SourceIndex(0)
 ---
 >>>    nameB = multiRobots_2[_z][0];
 1 >^^^^
@@ -1389,7 +1323,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
 1->
   >
 2 >for
@@ -1404,7 +1337,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(57, 1) Source(57, 1) + SourceIndex(0)
 2 >Emitted(57, 4) Source(57, 4) + SourceIndex(0)
 3 >Emitted(57, 5) Source(57, 5) + SourceIndex(0)
@@ -1418,7 +1350,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(57, 55) Source(57, 33) + SourceIndex(0)
 12>Emitted(57, 57) Source(57, 17) + SourceIndex(0)
 13>Emitted(57, 61) Source(57, 33) + SourceIndex(0)
-14>Emitted(57, 62) Source(57, 34) + SourceIndex(0)
 ---
 >>>    nameB = _1[_0][0];
 1 >^^^^
@@ -1479,7 +1410,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                  ^^^^^^^^^^^^^^
 14>                                                                ^^
 15>                                                                  ^^^^
-16>                                                                      ^
 1->
   >
 2 >for
@@ -1496,7 +1426,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                  [multiRobotA, multiRobotB]
 14>                                                                
 15>                                                                  [multiRobotA, multiRobotB]
-16>                                                                      )
 1->Emitted(61, 1) Source(60, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(60, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(60, 5) + SourceIndex(0)
@@ -1512,7 +1441,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(61, 65) Source(60, 43) + SourceIndex(0)
 14>Emitted(61, 67) Source(60, 17) + SourceIndex(0)
 15>Emitted(61, 71) Source(60, 43) + SourceIndex(0)
-16>Emitted(61, 72) Source(60, 44) + SourceIndex(0)
 ---
 >>>    nameB = _3[_2][0];
 1 >^^^^
@@ -1569,8 +1497,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^^^^^^^^->
+12>                                                              ^^^^^^^^^^^^->
 1->
   >
   >
@@ -1584,7 +1511,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(65, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(65, 4) Source(64, 4) + SourceIndex(0)
 3 >Emitted(65, 5) Source(64, 5) + SourceIndex(0)
@@ -1596,33 +1522,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(65, 57) Source(64, 43) + SourceIndex(0)
 10>Emitted(65, 59) Source(64, 37) + SourceIndex(0)
 11>Emitted(65, 63) Source(64, 43) + SourceIndex(0)
-12>Emitted(65, 64) Source(64, 44) + SourceIndex(0)
 ---
 >>>    _5 = robots_3[_4], numberA2 = _5[0], nameA2 = _5[1], skillA2 = _5[2];
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^
-4 >                       ^^^^^^^^^^^^^^^^
-5 >                                       ^^
-6 >                                         ^^^^^^^^^^^^^^
-7 >                                                       ^^
-8 >                                                         ^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^
+2 >                       ^^^^^^^^^^^^^^^^
+3 >                                       ^^
+4 >                                         ^^^^^^^^^^^^^^
+5 >                                                       ^^
+6 >                                                         ^^^^^^^^^^^^^^^
 1->
-2 >    [numberA2, nameA2, skillA2]
-3 >                     
-4 >                       numberA2
-5 >                                       , 
-6 >                                         nameA2
-7 >                                                       , 
-8 >                                                         skillA2
-1->Emitted(66, 5) Source(64, 6) + SourceIndex(0)
-2 >Emitted(66, 22) Source(64, 33) + SourceIndex(0)
-3 >Emitted(66, 24) Source(64, 7) + SourceIndex(0)
-4 >Emitted(66, 40) Source(64, 15) + SourceIndex(0)
-5 >Emitted(66, 42) Source(64, 17) + SourceIndex(0)
-6 >Emitted(66, 56) Source(64, 23) + SourceIndex(0)
-7 >Emitted(66, 58) Source(64, 25) + SourceIndex(0)
-8 >Emitted(66, 73) Source(64, 32) + SourceIndex(0)
+2 >                       numberA2
+3 >                                       , 
+4 >                                         nameA2
+5 >                                                       , 
+6 >                                                         skillA2
+1->Emitted(66, 24) Source(64, 7) + SourceIndex(0)
+2 >Emitted(66, 40) Source(64, 15) + SourceIndex(0)
+3 >Emitted(66, 42) Source(64, 17) + SourceIndex(0)
+4 >Emitted(66, 56) Source(64, 23) + SourceIndex(0)
+5 >Emitted(66, 58) Source(64, 25) + SourceIndex(0)
+6 >Emitted(66, 73) Source(64, 32) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1672,8 +1591,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^^^^^^^->
+14>                                                       ^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1688,7 +1606,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(69, 1) Source(67, 1) + SourceIndex(0)
 2 >Emitted(69, 4) Source(67, 4) + SourceIndex(0)
 3 >Emitted(69, 5) Source(67, 5) + SourceIndex(0)
@@ -1702,33 +1619,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(69, 50) Source(67, 48) + SourceIndex(0)
 12>Emitted(69, 52) Source(67, 37) + SourceIndex(0)
 13>Emitted(69, 56) Source(67, 48) + SourceIndex(0)
-14>Emitted(69, 57) Source(67, 49) + SourceIndex(0)
 ---
 >>>    _8 = _7[_6], numberA2 = _8[0], nameA2 = _8[1], skillA2 = _8[2];
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^^^^^^^
-5 >                                 ^^
-6 >                                   ^^^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^^^^^^^
+3 >                                 ^^
+4 >                                   ^^^^^^^^^^^^^^
+5 >                                                 ^^
+6 >                                                   ^^^^^^^^^^^^^^^
 1->
-2 >    [numberA2, nameA2, skillA2]
-3 >               
-4 >                 numberA2
-5 >                                 , 
-6 >                                   nameA2
-7 >                                                 , 
-8 >                                                   skillA2
-1->Emitted(70, 5) Source(67, 6) + SourceIndex(0)
-2 >Emitted(70, 16) Source(67, 33) + SourceIndex(0)
-3 >Emitted(70, 18) Source(67, 7) + SourceIndex(0)
-4 >Emitted(70, 34) Source(67, 15) + SourceIndex(0)
-5 >Emitted(70, 36) Source(67, 17) + SourceIndex(0)
-6 >Emitted(70, 50) Source(67, 23) + SourceIndex(0)
-7 >Emitted(70, 52) Source(67, 25) + SourceIndex(0)
-8 >Emitted(70, 67) Source(67, 32) + SourceIndex(0)
+2 >                 numberA2
+3 >                                 , 
+4 >                                   nameA2
+5 >                                                 , 
+6 >                                                   skillA2
+1->Emitted(70, 18) Source(67, 7) + SourceIndex(0)
+2 >Emitted(70, 34) Source(67, 15) + SourceIndex(0)
+3 >Emitted(70, 36) Source(67, 17) + SourceIndex(0)
+4 >Emitted(70, 50) Source(67, 23) + SourceIndex(0)
+5 >Emitted(70, 52) Source(67, 25) + SourceIndex(0)
+6 >Emitted(70, 67) Source(67, 32) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1780,8 +1690,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                         ^^^^^^^^^^^^^^^
 14>                                                        ^^
 15>                                                          ^^^^
-16>                                                              ^
-17>                                                               ^^^^^^^^^^->
+16>                                                              ^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1798,7 +1707,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                         [robotA, robotB]
 14>                                                        
 15>                                                          [robotA, robotB]
-16>                                                              )
 1->Emitted(73, 1) Source(70, 1) + SourceIndex(0)
 2 >Emitted(73, 4) Source(70, 4) + SourceIndex(0)
 3 >Emitted(73, 5) Source(70, 5) + SourceIndex(0)
@@ -1814,33 +1722,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(73, 57) Source(70, 53) + SourceIndex(0)
 14>Emitted(73, 59) Source(70, 37) + SourceIndex(0)
 15>Emitted(73, 63) Source(70, 53) + SourceIndex(0)
-16>Emitted(73, 64) Source(70, 54) + SourceIndex(0)
 ---
 >>>    _11 = _10[_9], numberA2 = _11[0], nameA2 = _11[1], skillA2 = _11[2];
-1->^^^^
-2 >    ^^^^^^^^^^^^^
-3 >                 ^^
-4 >                   ^^^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^
-7 >                                                     ^^
-8 >                                                       ^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^
+2 >                   ^^^^^^^^^^^^^^^^^
+3 >                                    ^^
+4 >                                      ^^^^^^^^^^^^^^^
+5 >                                                     ^^
+6 >                                                       ^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA2, nameA2, skillA2]
-3 >                 
-4 >                   numberA2
-5 >                                    , 
-6 >                                      nameA2
-7 >                                                     , 
-8 >                                                       skillA2
-1->Emitted(74, 5) Source(70, 6) + SourceIndex(0)
-2 >Emitted(74, 18) Source(70, 33) + SourceIndex(0)
-3 >Emitted(74, 20) Source(70, 7) + SourceIndex(0)
-4 >Emitted(74, 37) Source(70, 15) + SourceIndex(0)
-5 >Emitted(74, 39) Source(70, 17) + SourceIndex(0)
-6 >Emitted(74, 54) Source(70, 23) + SourceIndex(0)
-7 >Emitted(74, 56) Source(70, 25) + SourceIndex(0)
-8 >Emitted(74, 72) Source(70, 32) + SourceIndex(0)
+2 >                   numberA2
+3 >                                    , 
+4 >                                      nameA2
+5 >                                                     , 
+6 >                                                       skillA2
+1->Emitted(74, 20) Source(70, 7) + SourceIndex(0)
+2 >Emitted(74, 37) Source(70, 15) + SourceIndex(0)
+3 >Emitted(74, 39) Source(70, 17) + SourceIndex(0)
+4 >Emitted(74, 54) Source(70, 23) + SourceIndex(0)
+5 >Emitted(74, 56) Source(70, 25) + SourceIndex(0)
+6 >Emitted(74, 72) Source(70, 32) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1888,8 +1789,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1902,7 +1802,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(77, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(73, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(73, 5) + SourceIndex(0)
@@ -1914,39 +1813,32 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(77, 74) Source(73, 63) + SourceIndex(0)
 10>Emitted(77, 76) Source(73, 52) + SourceIndex(0)
 11>Emitted(77, 81) Source(73, 63) + SourceIndex(0)
-12>Emitted(77, 82) Source(73, 64) + SourceIndex(0)
 ---
 >>>    _13 = multiRobots_3[_12], nameMA = _13[0], _14 = _13[1], primarySkillA = _14[0], secondarySkillA = _14[1];
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                            ^^
-4 >                              ^^^^^^^^^^^^^^^
-5 >                                             ^^
-6 >                                               ^^^^^^^^^^^^
-7 >                                                           ^^
-8 >                                                             ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                   ^^
-10>                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                              ^^^^^^^^^^^^^^^
+3 >                                             ^^
+4 >                                               ^^^^^^^^^^^^
+5 >                                                           ^^
+6 >                                                             ^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                                   ^^
+8 >                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [nameMA, [primarySkillA, secondarySkillA]]
-3 >                            
-4 >                              nameMA
-5 >                                             , 
-6 >                                               [primarySkillA, secondarySkillA]
-7 >                                                           
-8 >                                                             primarySkillA
-9 >                                                                                   , 
-10>                                                                                     secondarySkillA
-1->Emitted(78, 5) Source(73, 6) + SourceIndex(0)
-2 >Emitted(78, 29) Source(73, 48) + SourceIndex(0)
-3 >Emitted(78, 31) Source(73, 7) + SourceIndex(0)
-4 >Emitted(78, 46) Source(73, 13) + SourceIndex(0)
-5 >Emitted(78, 48) Source(73, 15) + SourceIndex(0)
-6 >Emitted(78, 60) Source(73, 47) + SourceIndex(0)
-7 >Emitted(78, 62) Source(73, 16) + SourceIndex(0)
-8 >Emitted(78, 84) Source(73, 29) + SourceIndex(0)
-9 >Emitted(78, 86) Source(73, 31) + SourceIndex(0)
-10>Emitted(78, 110) Source(73, 46) + SourceIndex(0)
+2 >                              nameMA
+3 >                                             , 
+4 >                                               [primarySkillA, secondarySkillA]
+5 >                                                           
+6 >                                                             primarySkillA
+7 >                                                                                   , 
+8 >                                                                                     secondarySkillA
+1->Emitted(78, 31) Source(73, 7) + SourceIndex(0)
+2 >Emitted(78, 46) Source(73, 13) + SourceIndex(0)
+3 >Emitted(78, 48) Source(73, 15) + SourceIndex(0)
+4 >Emitted(78, 60) Source(73, 47) + SourceIndex(0)
+5 >Emitted(78, 62) Source(73, 16) + SourceIndex(0)
+6 >Emitted(78, 84) Source(73, 29) + SourceIndex(0)
+7 >Emitted(78, 86) Source(73, 31) + SourceIndex(0)
+8 >Emitted(78, 110) Source(73, 46) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -1996,8 +1888,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2012,7 +1903,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(81, 1) Source(76, 1) + SourceIndex(0)
 2 >Emitted(81, 4) Source(76, 4) + SourceIndex(0)
 3 >Emitted(81, 5) Source(76, 5) + SourceIndex(0)
@@ -2026,39 +1916,32 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(81, 59) Source(76, 68) + SourceIndex(0)
 12>Emitted(81, 61) Source(76, 52) + SourceIndex(0)
 13>Emitted(81, 66) Source(76, 68) + SourceIndex(0)
-14>Emitted(81, 67) Source(76, 69) + SourceIndex(0)
 ---
 >>>    _17 = _16[_15], nameMA = _17[0], _18 = _17[1], primarySkillA = _18[0], secondarySkillA = _18[1];
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^
-5 >                                   ^^
-6 >                                     ^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                         ^^
-10>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^
+3 >                                   ^^
+4 >                                     ^^^^^^^^^^^^
+5 >                                                 ^^
+6 >                                                   ^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                         ^^
+8 >                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [nameMA, [primarySkillA, secondarySkillA]]
-3 >                  
-4 >                    nameMA
-5 >                                   , 
-6 >                                     [primarySkillA, secondarySkillA]
-7 >                                                 
-8 >                                                   primarySkillA
-9 >                                                                         , 
-10>                                                                           secondarySkillA
-1->Emitted(82, 5) Source(76, 6) + SourceIndex(0)
-2 >Emitted(82, 19) Source(76, 48) + SourceIndex(0)
-3 >Emitted(82, 21) Source(76, 7) + SourceIndex(0)
-4 >Emitted(82, 36) Source(76, 13) + SourceIndex(0)
-5 >Emitted(82, 38) Source(76, 15) + SourceIndex(0)
-6 >Emitted(82, 50) Source(76, 47) + SourceIndex(0)
-7 >Emitted(82, 52) Source(76, 16) + SourceIndex(0)
-8 >Emitted(82, 74) Source(76, 29) + SourceIndex(0)
-9 >Emitted(82, 76) Source(76, 31) + SourceIndex(0)
-10>Emitted(82, 100) Source(76, 46) + SourceIndex(0)
+2 >                    nameMA
+3 >                                   , 
+4 >                                     [primarySkillA, secondarySkillA]
+5 >                                                 
+6 >                                                   primarySkillA
+7 >                                                                         , 
+8 >                                                                           secondarySkillA
+1->Emitted(82, 21) Source(76, 7) + SourceIndex(0)
+2 >Emitted(82, 36) Source(76, 13) + SourceIndex(0)
+3 >Emitted(82, 38) Source(76, 15) + SourceIndex(0)
+4 >Emitted(82, 50) Source(76, 47) + SourceIndex(0)
+5 >Emitted(82, 52) Source(76, 16) + SourceIndex(0)
+6 >Emitted(82, 74) Source(76, 29) + SourceIndex(0)
+7 >Emitted(82, 76) Source(76, 31) + SourceIndex(0)
+8 >Emitted(82, 100) Source(76, 46) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2110,8 +1993,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
-17>                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2128,7 +2010,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(85, 1) Source(79, 1) + SourceIndex(0)
 2 >Emitted(85, 4) Source(79, 4) + SourceIndex(0)
 3 >Emitted(85, 5) Source(79, 5) + SourceIndex(0)
@@ -2144,39 +2025,32 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(85, 69) Source(79, 78) + SourceIndex(0)
 14>Emitted(85, 71) Source(79, 52) + SourceIndex(0)
 15>Emitted(85, 76) Source(79, 78) + SourceIndex(0)
-16>Emitted(85, 77) Source(79, 79) + SourceIndex(0)
 ---
 >>>    _21 = _20[_19], nameMA = _21[0], _22 = _21[1], primarySkillA = _22[0], secondarySkillA = _22[1];
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^
-5 >                                   ^^
-6 >                                     ^^^^^^^^^^^^
-7 >                                                 ^^
-8 >                                                   ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                         ^^
-10>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^
+3 >                                   ^^
+4 >                                     ^^^^^^^^^^^^
+5 >                                                 ^^
+6 >                                                   ^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                         ^^
+8 >                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [nameMA, [primarySkillA, secondarySkillA]]
-3 >                  
-4 >                    nameMA
-5 >                                   , 
-6 >                                     [primarySkillA, secondarySkillA]
-7 >                                                 
-8 >                                                   primarySkillA
-9 >                                                                         , 
-10>                                                                           secondarySkillA
-1->Emitted(86, 5) Source(79, 6) + SourceIndex(0)
-2 >Emitted(86, 19) Source(79, 48) + SourceIndex(0)
-3 >Emitted(86, 21) Source(79, 7) + SourceIndex(0)
-4 >Emitted(86, 36) Source(79, 13) + SourceIndex(0)
-5 >Emitted(86, 38) Source(79, 15) + SourceIndex(0)
-6 >Emitted(86, 50) Source(79, 47) + SourceIndex(0)
-7 >Emitted(86, 52) Source(79, 16) + SourceIndex(0)
-8 >Emitted(86, 74) Source(79, 29) + SourceIndex(0)
-9 >Emitted(86, 76) Source(79, 31) + SourceIndex(0)
-10>Emitted(86, 100) Source(79, 46) + SourceIndex(0)
+2 >                    nameMA
+3 >                                   , 
+4 >                                     [primarySkillA, secondarySkillA]
+5 >                                                 
+6 >                                                   primarySkillA
+7 >                                                                         , 
+8 >                                                                           secondarySkillA
+1->Emitted(86, 21) Source(79, 7) + SourceIndex(0)
+2 >Emitted(86, 36) Source(79, 13) + SourceIndex(0)
+3 >Emitted(86, 38) Source(79, 15) + SourceIndex(0)
+4 >Emitted(86, 50) Source(79, 47) + SourceIndex(0)
+5 >Emitted(86, 52) Source(79, 16) + SourceIndex(0)
+6 >Emitted(86, 74) Source(79, 29) + SourceIndex(0)
+7 >Emitted(86, 76) Source(79, 31) + SourceIndex(0)
+8 >Emitted(86, 100) Source(79, 46) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2224,8 +2098,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^->
+12>                                                                 ^^^^^^->
 1->
   >
   >
@@ -2239,7 +2112,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(89, 1) Source(83, 1) + SourceIndex(0)
 2 >Emitted(89, 4) Source(83, 4) + SourceIndex(0)
 3 >Emitted(89, 5) Source(83, 5) + SourceIndex(0)
@@ -2251,27 +2123,20 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(89, 59) Source(83, 41) + SourceIndex(0)
 10>Emitted(89, 61) Source(83, 35) + SourceIndex(0)
 11>Emitted(89, 66) Source(83, 41) + SourceIndex(0)
-12>Emitted(89, 67) Source(83, 42) + SourceIndex(0)
 ---
 >>>    _24 = robots_4[_23], numberA3 = _24[0], robotAInfo = _24.slice(1);
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^
-5 >                                          ^^
-6 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                         ^^^^^^^^^^^^^^^^^
+3 >                                          ^^
+4 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA3, ...robotAInfo]
-3 >                       
-4 >                         numberA3
-5 >                                          , 
-6 >                                            ...robotAInfo
-1->Emitted(90, 5) Source(83, 6) + SourceIndex(0)
-2 >Emitted(90, 24) Source(83, 31) + SourceIndex(0)
-3 >Emitted(90, 26) Source(83, 7) + SourceIndex(0)
-4 >Emitted(90, 43) Source(83, 15) + SourceIndex(0)
-5 >Emitted(90, 45) Source(83, 17) + SourceIndex(0)
-6 >Emitted(90, 70) Source(83, 30) + SourceIndex(0)
+2 >                         numberA3
+3 >                                          , 
+4 >                                            ...robotAInfo
+1->Emitted(90, 26) Source(83, 7) + SourceIndex(0)
+2 >Emitted(90, 43) Source(83, 15) + SourceIndex(0)
+3 >Emitted(90, 45) Source(83, 17) + SourceIndex(0)
+4 >Emitted(90, 70) Source(83, 30) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2321,8 +2186,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^->
+14>                                                            ^^^^^^->
 1->
   >
 2 >for
@@ -2337,7 +2201,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(93, 1) Source(86, 1) + SourceIndex(0)
 2 >Emitted(93, 4) Source(86, 4) + SourceIndex(0)
 3 >Emitted(93, 5) Source(86, 5) + SourceIndex(0)
@@ -2351,27 +2214,20 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(93, 54) Source(86, 46) + SourceIndex(0)
 12>Emitted(93, 56) Source(86, 35) + SourceIndex(0)
 13>Emitted(93, 61) Source(86, 46) + SourceIndex(0)
-14>Emitted(93, 62) Source(86, 47) + SourceIndex(0)
 ---
 >>>    _27 = _26[_25], numberA3 = _27[0], robotAInfo = _27.slice(1);
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^^
+3 >                                     ^^
+4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA3, ...robotAInfo]
-3 >                  
-4 >                    numberA3
-5 >                                     , 
-6 >                                       ...robotAInfo
-1->Emitted(94, 5) Source(86, 6) + SourceIndex(0)
-2 >Emitted(94, 19) Source(86, 31) + SourceIndex(0)
-3 >Emitted(94, 21) Source(86, 7) + SourceIndex(0)
-4 >Emitted(94, 38) Source(86, 15) + SourceIndex(0)
-5 >Emitted(94, 40) Source(86, 17) + SourceIndex(0)
-6 >Emitted(94, 65) Source(86, 30) + SourceIndex(0)
+2 >                    numberA3
+3 >                                     , 
+4 >                                       ...robotAInfo
+1->Emitted(94, 21) Source(86, 7) + SourceIndex(0)
+2 >Emitted(94, 38) Source(86, 15) + SourceIndex(0)
+3 >Emitted(94, 40) Source(86, 17) + SourceIndex(0)
+4 >Emitted(94, 65) Source(86, 30) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2423,7 +2279,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
+16>                                                                 ^->
 1->
   >
 2 >for
@@ -2440,7 +2296,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(97, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(97, 4) Source(89, 4) + SourceIndex(0)
 3 >Emitted(97, 5) Source(89, 5) + SourceIndex(0)
@@ -2456,27 +2311,20 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(97, 59) Source(89, 51) + SourceIndex(0)
 14>Emitted(97, 61) Source(89, 35) + SourceIndex(0)
 15>Emitted(97, 66) Source(89, 51) + SourceIndex(0)
-16>Emitted(97, 67) Source(89, 52) + SourceIndex(0)
 ---
 >>>    _30 = _29[_28], numberA3 = _30[0], robotAInfo = _30.slice(1);
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-2 >    [numberA3, ...robotAInfo]
-3 >                  
-4 >                    numberA3
-5 >                                     , 
-6 >                                       ...robotAInfo
-1 >Emitted(98, 5) Source(89, 6) + SourceIndex(0)
-2 >Emitted(98, 19) Source(89, 31) + SourceIndex(0)
-3 >Emitted(98, 21) Source(89, 7) + SourceIndex(0)
-4 >Emitted(98, 38) Source(89, 15) + SourceIndex(0)
-5 >Emitted(98, 40) Source(89, 17) + SourceIndex(0)
-6 >Emitted(98, 65) Source(89, 30) + SourceIndex(0)
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^^
+3 >                                     ^^
+4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >                    numberA3
+3 >                                     , 
+4 >                                       ...robotAInfo
+1->Emitted(98, 21) Source(89, 7) + SourceIndex(0)
+2 >Emitted(98, 38) Source(89, 15) + SourceIndex(0)
+3 >Emitted(98, 40) Source(89, 17) + SourceIndex(0)
+4 >Emitted(98, 65) Source(89, 30) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2524,7 +2372,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
 1->
   >
 2 >for
@@ -2537,7 +2384,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(101, 1) Source(92, 1) + SourceIndex(0)
 2 >Emitted(101, 4) Source(92, 4) + SourceIndex(0)
 3 >Emitted(101, 5) Source(92, 5) + SourceIndex(0)
@@ -2549,7 +2395,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 9 >Emitted(101, 74) Source(92, 41) + SourceIndex(0)
 10>Emitted(101, 76) Source(92, 30) + SourceIndex(0)
 11>Emitted(101, 81) Source(92, 41) + SourceIndex(0)
-12>Emitted(101, 82) Source(92, 42) + SourceIndex(0)
 ---
 >>>    multiRobotAInfo = multiRobots_4[_31].slice(0);
 1 >^^^^
@@ -2607,7 +2452,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
 1->
   >
 2 >for
@@ -2622,7 +2466,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(105, 1) Source(95, 1) + SourceIndex(0)
 2 >Emitted(105, 4) Source(95, 4) + SourceIndex(0)
 3 >Emitted(105, 5) Source(95, 5) + SourceIndex(0)
@@ -2636,7 +2479,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 11>Emitted(105, 59) Source(95, 46) + SourceIndex(0)
 12>Emitted(105, 61) Source(95, 30) + SourceIndex(0)
 13>Emitted(105, 66) Source(95, 46) + SourceIndex(0)
-14>Emitted(105, 67) Source(95, 47) + SourceIndex(0)
 ---
 >>>    multiRobotAInfo = _33[_32].slice(0);
 1 >^^^^
@@ -2696,7 +2538,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
 1->
   >
 2 >for
@@ -2713,7 +2554,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(109, 1) Source(98, 1) + SourceIndex(0)
 2 >Emitted(109, 4) Source(98, 4) + SourceIndex(0)
 3 >Emitted(109, 5) Source(98, 5) + SourceIndex(0)
@@ -2729,7 +2569,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPattern2.ts
 13>Emitted(109, 69) Source(98, 56) + SourceIndex(0)
 14>Emitted(109, 71) Source(98, 30) + SourceIndex(0)
 15>Emitted(109, 76) Source(98, 56) + SourceIndex(0)
-16>Emitted(109, 77) Source(98, 57) + SourceIndex(0)
 ---
 >>>    multiRobotAInfo = _35[_34].slice(0);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js.map
index 4d12f811df1..69f896d1274 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAA6B,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAnC,qBAAwB,EAAjB,UAAgB,EAAhB,qCAAgB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6B,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAxC,eAAwB,EAAjB,UAAgB,EAAhB,qCAAgB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6B,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA7C,eAAwB,EAAjB,UAAgB,EAAhB,qCAAgB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAGyB,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAHpC,0BAGoB,EAHb,UAGY,EAHZ,8CAGY,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAHzC,eAGoB,EAHb,UAGY,EAHZ,8CAGY,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,CAAC;IAHnD,eAGoB,EAHb,UAGY,EAHZ,8CAGY,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAuB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAxB,wBAAY,EAAZ,iCAAY;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAuB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA7B,mBAAY,EAAZ,mCAAY;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAuB,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAlC,qBAAY,EAAZ,mCAAY;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAA2B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAAjC,+BAAgB,EAAhB,uCAAgB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA2B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAtC,qBAAgB,EAAhB,uCAAgB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA2B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAAhD,qBAAgB,EAAhB,uCAAgB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAA8D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAApE,uBAAyD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAAzE,kBAAyD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA8D,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAA9E,kBAAyD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAHpC,4BAGoB,EAHf,YAAiB,EAAjB,wCAAiB,EAAE,YAGL,EAHK,iDAGL,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAHzC,kBAGoB,EAHf,YAAiB,EAAjB,wCAAiB,EAAE,YAGL,EAHK,iDAGL,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAHnD,kBAGoB,EAHf,YAAiB,EAAjB,wCAAiB,EAAE,YAGL,EAHK,iDAGL,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAAuC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAA7C,uBAAkC,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAAlD,kBAAkC,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAvD,kBAAkC,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAA6B,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAA9B,IAAA,iBAAoB,EAAjB,UAAgB,EAAhB,qCAAgB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6B,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAnC,IAAA,WAAoB,EAAjB,UAAgB,EAAhB,qCAAgB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6B,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB;IAAxC,IAAA,WAAoB,EAAjB,UAAgB,EAAhB,qCAAgB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAGyB,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAH/B,IAAA,sBAGgB,EAHb,UAGY,EAHZ,8CAGY,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAHpC,IAAA,WAGgB,EAHb,UAGY,EAHZ,8CAGY,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B;IAH9C,IAAA,WAGgB,EAHb,UAGY,EAHZ,8CAGY,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAuB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAvB,IAAA,oBAAY,EAAZ,iCAAY;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAuB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAA5B,IAAA,eAAY,EAAZ,mCAAY;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAuB,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;IAAjC,IAAA,iBAAY,EAAZ,mCAAY;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAA2B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IAAhC,IAAA,2BAAgB,EAAhB,uCAAgB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA2B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAArC,IAAA,iBAAgB,EAAhB,uCAAgB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA2B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;IAA/C,IAAA,iBAAgB,EAAhB,uCAAgB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAA8D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;IAA/D,IAAA,mBAAqD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;IAApE,IAAA,cAAqD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA8D,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;IAAzE,IAAA,cAAqD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IAH/B,IAAA,wBAGgB,EAHf,YAAiB,EAAjB,wCAAiB,EAAE,YAGL,EAHK,iDAGL,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAHpC,IAAA,cAGgB,EAHf,YAAiB,EAAjB,wCAAiB,EAAE,YAGL,EAHK,iDAGL,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;IAH9C,IAAA,cAGgB,EAHf,YAAiB,EAAjB,wCAAiB,EAAE,YAGL,EAHK,iDAGL,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAAuC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;IAAxC,IAAA,mBAA8B,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;IAA7C,IAAA,cAA8B,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;IAAlD,IAAA,cAA8B,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.sourcemap.txt
index de9a60de903..d59dc00248d 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.sourcemap.txt
@@ -332,8 +332,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^^^^^^^^^^^^->
+12>                                                              ^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -347,7 +346,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(13, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(13, 4) Source(21, 4) + SourceIndex(0)
 3 >Emitted(13, 5) Source(21, 5) + SourceIndex(0)
@@ -359,27 +357,29 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(13, 57) Source(21, 40) + SourceIndex(0)
 10>Emitted(13, 59) Source(21, 34) + SourceIndex(0)
 11>Emitted(13, 63) Source(21, 40) + SourceIndex(0)
-12>Emitted(13, 64) Source(21, 41) + SourceIndex(0)
 ---
 >>>    var _a = robots_1[_i], _b = _a[1], nameA = _b === void 0 ? "noName" : _b;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^
+6 >                                     ^^
+7 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, nameA = "noName"]
-3 >                         
-4 >                           nameA = "noName"
-5 >                                     
-6 >                                       nameA = "noName"
-1->Emitted(14, 5) Source(21, 6) + SourceIndex(0)
-2 >Emitted(14, 26) Source(21, 30) + SourceIndex(0)
-3 >Emitted(14, 28) Source(21, 13) + SourceIndex(0)
-4 >Emitted(14, 38) Source(21, 29) + SourceIndex(0)
-5 >Emitted(14, 40) Source(21, 13) + SourceIndex(0)
-6 >Emitted(14, 77) Source(21, 29) + SourceIndex(0)
+2 >    
+3 >        [, nameA = "noName"]
+4 >                         
+5 >                           nameA = "noName"
+6 >                                     
+7 >                                       nameA = "noName"
+1->Emitted(14, 5) Source(21, 10) + SourceIndex(0)
+2 >Emitted(14, 9) Source(21, 10) + SourceIndex(0)
+3 >Emitted(14, 26) Source(21, 30) + SourceIndex(0)
+4 >Emitted(14, 28) Source(21, 13) + SourceIndex(0)
+5 >Emitted(14, 38) Source(21, 29) + SourceIndex(0)
+6 >Emitted(14, 40) Source(21, 13) + SourceIndex(0)
+7 >Emitted(14, 77) Source(21, 29) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -429,8 +429,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^^^^^^^^^^^->
+14>                                                       ^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -445,7 +444,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(17, 1) Source(24, 1) + SourceIndex(0)
 2 >Emitted(17, 4) Source(24, 4) + SourceIndex(0)
 3 >Emitted(17, 5) Source(24, 5) + SourceIndex(0)
@@ -459,27 +457,29 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(17, 50) Source(24, 45) + SourceIndex(0)
 12>Emitted(17, 52) Source(24, 34) + SourceIndex(0)
 13>Emitted(17, 56) Source(24, 45) + SourceIndex(0)
-14>Emitted(17, 57) Source(24, 46) + SourceIndex(0)
 ---
 >>>    var _e = _d[_c], _f = _e[1], nameA = _f === void 0 ? "noName" : _f;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, nameA = "noName"]
-3 >                   
-4 >                     nameA = "noName"
-5 >                               
-6 >                                 nameA = "noName"
-1->Emitted(18, 5) Source(24, 6) + SourceIndex(0)
-2 >Emitted(18, 20) Source(24, 30) + SourceIndex(0)
-3 >Emitted(18, 22) Source(24, 13) + SourceIndex(0)
-4 >Emitted(18, 32) Source(24, 29) + SourceIndex(0)
-5 >Emitted(18, 34) Source(24, 13) + SourceIndex(0)
-6 >Emitted(18, 71) Source(24, 29) + SourceIndex(0)
+2 >    
+3 >        [, nameA = "noName"]
+4 >                   
+5 >                     nameA = "noName"
+6 >                               
+7 >                                 nameA = "noName"
+1->Emitted(18, 5) Source(24, 10) + SourceIndex(0)
+2 >Emitted(18, 9) Source(24, 10) + SourceIndex(0)
+3 >Emitted(18, 20) Source(24, 30) + SourceIndex(0)
+4 >Emitted(18, 22) Source(24, 13) + SourceIndex(0)
+5 >Emitted(18, 32) Source(24, 29) + SourceIndex(0)
+6 >Emitted(18, 34) Source(24, 13) + SourceIndex(0)
+7 >Emitted(18, 71) Source(24, 29) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -531,8 +531,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                        ^^^^^^^^^^^^^^
 14>                                                      ^^
 15>                                                        ^^^^
-16>                                                            ^
-17>                                                             ^^^^^^^^^^^->
+16>                                                            ^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -549,7 +548,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                        [robotA, robotB]
 14>                                                      
 15>                                                        [robotA, robotB]
-16>                                                            )
 1->Emitted(21, 1) Source(27, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(27, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(27, 5) + SourceIndex(0)
@@ -565,27 +563,29 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(21, 55) Source(27, 50) + SourceIndex(0)
 14>Emitted(21, 57) Source(27, 34) + SourceIndex(0)
 15>Emitted(21, 61) Source(27, 50) + SourceIndex(0)
-16>Emitted(21, 62) Source(27, 51) + SourceIndex(0)
 ---
 >>>    var _j = _h[_g], _k = _j[1], nameA = _k === void 0 ? "noName" : _k;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, nameA = "noName"]
-3 >                   
-4 >                     nameA = "noName"
-5 >                               
-6 >                                 nameA = "noName"
-1->Emitted(22, 5) Source(27, 6) + SourceIndex(0)
-2 >Emitted(22, 20) Source(27, 30) + SourceIndex(0)
-3 >Emitted(22, 22) Source(27, 13) + SourceIndex(0)
-4 >Emitted(22, 32) Source(27, 29) + SourceIndex(0)
-5 >Emitted(22, 34) Source(27, 13) + SourceIndex(0)
-6 >Emitted(22, 71) Source(27, 29) + SourceIndex(0)
+2 >    
+3 >        [, nameA = "noName"]
+4 >                   
+5 >                     nameA = "noName"
+6 >                               
+7 >                                 nameA = "noName"
+1->Emitted(22, 5) Source(27, 10) + SourceIndex(0)
+2 >Emitted(22, 9) Source(27, 10) + SourceIndex(0)
+3 >Emitted(22, 20) Source(27, 30) + SourceIndex(0)
+4 >Emitted(22, 22) Source(27, 13) + SourceIndex(0)
+5 >Emitted(22, 32) Source(27, 29) + SourceIndex(0)
+6 >Emitted(22, 34) Source(27, 13) + SourceIndex(0)
+7 >Emitted(22, 71) Source(27, 29) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -633,8 +633,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -650,7 +649,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(25, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(25, 4) Source(30, 4) + SourceIndex(0)
 3 >Emitted(25, 5) Source(30, 5) + SourceIndex(0)
@@ -662,61 +660,63 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(25, 72) Source(33, 41) + SourceIndex(0)
 10>Emitted(25, 74) Source(33, 30) + SourceIndex(0)
 11>Emitted(25, 78) Source(33, 41) + SourceIndex(0)
-12>Emitted(25, 79) Source(33, 42) + SourceIndex(0)
 ---
 >>>    var _m = multiRobots_1[_l], _o = _m[1], _p = _o === void 0 ? ["skill1", "skill2"] : _o, _q = _p[0], primarySkillA = _q === void 0 ? "primary" : _q, _r = _p[1], secondarySkillA = _r === void 0 ? "secondary" : _r;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                              ^^
-4 >                                ^^^^^^^^^^
-5 >                                          ^^
-6 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                          ^^
-8 >                                                                                            ^^^^^^^^^^
-9 >                                                                                                      ^^
-10>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                      ^^
-12>                                                                                                                                                        ^^^^^^^^^^
-13>                                                                                                                                                                  ^^
-14>                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^
+4 >                              ^^
+5 >                                ^^^^^^^^^^
+6 >                                          ^^
+7 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                                          ^^
+9 >                                                                                            ^^^^^^^^^^
+10>                                                                                                      ^^
+11>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                      ^^
+13>                                                                                                                                                        ^^^^^^^^^^
+14>                                                                                                                                                                  ^^
+15>                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                              
-4 >                                [
+2 >    
+3 >        [, [
+  >            primarySkillA = "primary",
+  >            secondarySkillA = "secondary"
+  >        ] = ["skill1", "skill2"]]
+4 >                              
+5 >                                [
   >                                    primarySkillA = "primary",
   >                                    secondarySkillA = "secondary"
   >                                ] = ["skill1", "skill2"]
-5 >                                          
-6 >                                            [
+6 >                                          
+7 >                                            [
   >                                                primarySkillA = "primary",
   >                                                secondarySkillA = "secondary"
   >                                            ] = ["skill1", "skill2"]
-7 >                                                                                          
-8 >                                                                                            primarySkillA = "primary"
-9 >                                                                                                      
-10>                                                                                                        primarySkillA = "primary"
-11>                                                                                                                                                      ,
+8 >                                                                                          
+9 >                                                                                            primarySkillA = "primary"
+10>                                                                                                      
+11>                                                                                                        primarySkillA = "primary"
+12>                                                                                                                                                      ,
   >                                                                                                                                                          
-12>                                                                                                                                                        secondarySkillA = "secondary"
-13>                                                                                                                                                                  
-14>                                                                                                                                                                    secondarySkillA = "secondary"
-1->Emitted(26, 5) Source(30, 6) + SourceIndex(0)
-2 >Emitted(26, 31) Source(33, 26) + SourceIndex(0)
-3 >Emitted(26, 33) Source(30, 13) + SourceIndex(0)
-4 >Emitted(26, 43) Source(33, 25) + SourceIndex(0)
-5 >Emitted(26, 45) Source(30, 13) + SourceIndex(0)
-6 >Emitted(26, 91) Source(33, 25) + SourceIndex(0)
-7 >Emitted(26, 93) Source(31, 5) + SourceIndex(0)
-8 >Emitted(26, 103) Source(31, 30) + SourceIndex(0)
-9 >Emitted(26, 105) Source(31, 5) + SourceIndex(0)
-10>Emitted(26, 151) Source(31, 30) + SourceIndex(0)
-11>Emitted(26, 153) Source(32, 5) + SourceIndex(0)
-12>Emitted(26, 163) Source(32, 34) + SourceIndex(0)
-13>Emitted(26, 165) Source(32, 5) + SourceIndex(0)
-14>Emitted(26, 215) Source(32, 34) + SourceIndex(0)
+13>                                                                                                                                                        secondarySkillA = "secondary"
+14>                                                                                                                                                                  
+15>                                                                                                                                                                    secondarySkillA = "secondary"
+1->Emitted(26, 5) Source(30, 10) + SourceIndex(0)
+2 >Emitted(26, 9) Source(30, 10) + SourceIndex(0)
+3 >Emitted(26, 31) Source(33, 26) + SourceIndex(0)
+4 >Emitted(26, 33) Source(30, 13) + SourceIndex(0)
+5 >Emitted(26, 43) Source(33, 25) + SourceIndex(0)
+6 >Emitted(26, 45) Source(30, 13) + SourceIndex(0)
+7 >Emitted(26, 91) Source(33, 25) + SourceIndex(0)
+8 >Emitted(26, 93) Source(31, 5) + SourceIndex(0)
+9 >Emitted(26, 103) Source(31, 30) + SourceIndex(0)
+10>Emitted(26, 105) Source(31, 5) + SourceIndex(0)
+11>Emitted(26, 151) Source(31, 30) + SourceIndex(0)
+12>Emitted(26, 153) Source(32, 5) + SourceIndex(0)
+13>Emitted(26, 163) Source(32, 34) + SourceIndex(0)
+14>Emitted(26, 165) Source(32, 5) + SourceIndex(0)
+15>Emitted(26, 215) Source(32, 34) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -767,8 +767,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -786,7 +785,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(29, 1) Source(36, 1) + SourceIndex(0)
 2 >Emitted(29, 4) Source(36, 4) + SourceIndex(0)
 3 >Emitted(29, 5) Source(36, 5) + SourceIndex(0)
@@ -800,61 +798,63 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(29, 55) Source(39, 46) + SourceIndex(0)
 12>Emitted(29, 57) Source(39, 30) + SourceIndex(0)
 13>Emitted(29, 61) Source(39, 46) + SourceIndex(0)
-14>Emitted(29, 62) Source(39, 47) + SourceIndex(0)
 ---
 >>>    var _u = _t[_s], _v = _u[1], _w = _v === void 0 ? ["skill1", "skill2"] : _v, _x = _w[0], primarySkillA = _x === void 0 ? "primary" : _x, _y = _w[1], secondarySkillA = _y === void 0 ? "secondary" : _y;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^
-9 >                                                                                           ^^
-10>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                           ^^
-12>                                                                                                                                             ^^^^^^^^^^
-13>                                                                                                                                                       ^^
-14>                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                               ^^
+9 >                                                                                 ^^^^^^^^^^
+10>                                                                                           ^^
+11>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                           ^^
+13>                                                                                                                                             ^^^^^^^^^^
+14>                                                                                                                                                       ^^
+15>                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                   
-4 >                     [
+2 >    
+3 >        [, [
+  >            primarySkillA = "primary",
+  >            secondarySkillA = "secondary"
+  >        ] = ["skill1", "skill2"]]
+4 >                   
+5 >                     [
   >                         primarySkillA = "primary",
   >                         secondarySkillA = "secondary"
   >                     ] = ["skill1", "skill2"]
-5 >                               
-6 >                                 [
+6 >                               
+7 >                                 [
   >                                     primarySkillA = "primary",
   >                                     secondarySkillA = "secondary"
   >                                 ] = ["skill1", "skill2"]
-7 >                                                                               
-8 >                                                                                 primarySkillA = "primary"
-9 >                                                                                           
-10>                                                                                             primarySkillA = "primary"
-11>                                                                                                                                           ,
+8 >                                                                               
+9 >                                                                                 primarySkillA = "primary"
+10>                                                                                           
+11>                                                                                             primarySkillA = "primary"
+12>                                                                                                                                           ,
   >                                                                                                                                               
-12>                                                                                                                                             secondarySkillA = "secondary"
-13>                                                                                                                                                       
-14>                                                                                                                                                         secondarySkillA = "secondary"
-1->Emitted(30, 5) Source(36, 6) + SourceIndex(0)
-2 >Emitted(30, 20) Source(39, 26) + SourceIndex(0)
-3 >Emitted(30, 22) Source(36, 13) + SourceIndex(0)
-4 >Emitted(30, 32) Source(39, 25) + SourceIndex(0)
-5 >Emitted(30, 34) Source(36, 13) + SourceIndex(0)
-6 >Emitted(30, 80) Source(39, 25) + SourceIndex(0)
-7 >Emitted(30, 82) Source(37, 5) + SourceIndex(0)
-8 >Emitted(30, 92) Source(37, 30) + SourceIndex(0)
-9 >Emitted(30, 94) Source(37, 5) + SourceIndex(0)
-10>Emitted(30, 140) Source(37, 30) + SourceIndex(0)
-11>Emitted(30, 142) Source(38, 5) + SourceIndex(0)
-12>Emitted(30, 152) Source(38, 34) + SourceIndex(0)
-13>Emitted(30, 154) Source(38, 5) + SourceIndex(0)
-14>Emitted(30, 204) Source(38, 34) + SourceIndex(0)
+13>                                                                                                                                             secondarySkillA = "secondary"
+14>                                                                                                                                                       
+15>                                                                                                                                                         secondarySkillA = "secondary"
+1->Emitted(30, 5) Source(36, 10) + SourceIndex(0)
+2 >Emitted(30, 9) Source(36, 10) + SourceIndex(0)
+3 >Emitted(30, 20) Source(39, 26) + SourceIndex(0)
+4 >Emitted(30, 22) Source(36, 13) + SourceIndex(0)
+5 >Emitted(30, 32) Source(39, 25) + SourceIndex(0)
+6 >Emitted(30, 34) Source(36, 13) + SourceIndex(0)
+7 >Emitted(30, 80) Source(39, 25) + SourceIndex(0)
+8 >Emitted(30, 82) Source(37, 5) + SourceIndex(0)
+9 >Emitted(30, 92) Source(37, 30) + SourceIndex(0)
+10>Emitted(30, 94) Source(37, 5) + SourceIndex(0)
+11>Emitted(30, 140) Source(37, 30) + SourceIndex(0)
+12>Emitted(30, 142) Source(38, 5) + SourceIndex(0)
+13>Emitted(30, 152) Source(38, 34) + SourceIndex(0)
+14>Emitted(30, 154) Source(38, 5) + SourceIndex(0)
+15>Emitted(30, 204) Source(38, 34) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -907,8 +907,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                  ^^^^^^^^^^^^^^
 14>                                                                ^^
 15>                                                                  ^^^^
-16>                                                                      ^
-17>                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -928,7 +927,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                  [multiRobotA, multiRobotB]
 14>                                                                
 15>                                                                  [multiRobotA, multiRobotB]
-16>                                                                      )
 1->Emitted(33, 1) Source(42, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(42, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(42, 5) + SourceIndex(0)
@@ -944,61 +942,63 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(33, 65) Source(45, 56) + SourceIndex(0)
 14>Emitted(33, 67) Source(45, 30) + SourceIndex(0)
 15>Emitted(33, 71) Source(45, 56) + SourceIndex(0)
-16>Emitted(33, 72) Source(45, 57) + SourceIndex(0)
 ---
 >>>    var _1 = _0[_z], _2 = _1[1], _3 = _2 === void 0 ? ["skill1", "skill2"] : _2, _4 = _3[0], primarySkillA = _4 === void 0 ? "primary" : _4, _5 = _3[1], secondarySkillA = _5 === void 0 ? "secondary" : _5;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^
-5 >                               ^^
-6 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^
-9 >                                                                                           ^^
-10>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                           ^^
-12>                                                                                                                                             ^^^^^^^^^^
-13>                                                                                                                                                       ^^
-14>                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^
+6 >                               ^^
+7 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                               ^^
+9 >                                                                                 ^^^^^^^^^^
+10>                                                                                           ^^
+11>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                           ^^
+13>                                                                                                                                             ^^^^^^^^^^
+14>                                                                                                                                                       ^^
+15>                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [, [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                   
-4 >                     [
+2 >    
+3 >        [, [
+  >            primarySkillA = "primary",
+  >            secondarySkillA = "secondary"
+  >        ] = ["skill1", "skill2"]]
+4 >                   
+5 >                     [
   >                         primarySkillA = "primary",
   >                         secondarySkillA = "secondary"
   >                     ] = ["skill1", "skill2"]
-5 >                               
-6 >                                 [
+6 >                               
+7 >                                 [
   >                                     primarySkillA = "primary",
   >                                     secondarySkillA = "secondary"
   >                                 ] = ["skill1", "skill2"]
-7 >                                                                               
-8 >                                                                                 primarySkillA = "primary"
-9 >                                                                                           
-10>                                                                                             primarySkillA = "primary"
-11>                                                                                                                                           ,
+8 >                                                                               
+9 >                                                                                 primarySkillA = "primary"
+10>                                                                                           
+11>                                                                                             primarySkillA = "primary"
+12>                                                                                                                                           ,
   >                                                                                                                                               
-12>                                                                                                                                             secondarySkillA = "secondary"
-13>                                                                                                                                                       
-14>                                                                                                                                                         secondarySkillA = "secondary"
-1->Emitted(34, 5) Source(42, 6) + SourceIndex(0)
-2 >Emitted(34, 20) Source(45, 26) + SourceIndex(0)
-3 >Emitted(34, 22) Source(42, 13) + SourceIndex(0)
-4 >Emitted(34, 32) Source(45, 25) + SourceIndex(0)
-5 >Emitted(34, 34) Source(42, 13) + SourceIndex(0)
-6 >Emitted(34, 80) Source(45, 25) + SourceIndex(0)
-7 >Emitted(34, 82) Source(43, 5) + SourceIndex(0)
-8 >Emitted(34, 92) Source(43, 30) + SourceIndex(0)
-9 >Emitted(34, 94) Source(43, 5) + SourceIndex(0)
-10>Emitted(34, 140) Source(43, 30) + SourceIndex(0)
-11>Emitted(34, 142) Source(44, 5) + SourceIndex(0)
-12>Emitted(34, 152) Source(44, 34) + SourceIndex(0)
-13>Emitted(34, 154) Source(44, 5) + SourceIndex(0)
-14>Emitted(34, 204) Source(44, 34) + SourceIndex(0)
+13>                                                                                                                                             secondarySkillA = "secondary"
+14>                                                                                                                                                       
+15>                                                                                                                                                         secondarySkillA = "secondary"
+1->Emitted(34, 5) Source(42, 10) + SourceIndex(0)
+2 >Emitted(34, 9) Source(42, 10) + SourceIndex(0)
+3 >Emitted(34, 20) Source(45, 26) + SourceIndex(0)
+4 >Emitted(34, 22) Source(42, 13) + SourceIndex(0)
+5 >Emitted(34, 32) Source(45, 25) + SourceIndex(0)
+6 >Emitted(34, 34) Source(42, 13) + SourceIndex(0)
+7 >Emitted(34, 80) Source(45, 25) + SourceIndex(0)
+8 >Emitted(34, 82) Source(43, 5) + SourceIndex(0)
+9 >Emitted(34, 92) Source(43, 30) + SourceIndex(0)
+10>Emitted(34, 94) Source(43, 5) + SourceIndex(0)
+11>Emitted(34, 140) Source(43, 30) + SourceIndex(0)
+12>Emitted(34, 142) Source(44, 5) + SourceIndex(0)
+13>Emitted(34, 152) Source(44, 34) + SourceIndex(0)
+14>Emitted(34, 154) Source(44, 5) + SourceIndex(0)
+15>Emitted(34, 204) Source(44, 34) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -1047,8 +1047,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^->
+12>                                                              ^^^->
 1->
   >
   >
@@ -1062,7 +1061,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(37, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(49, 5) + SourceIndex(0)
@@ -1074,21 +1072,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(37, 57) Source(49, 34) + SourceIndex(0)
 10>Emitted(37, 59) Source(49, 28) + SourceIndex(0)
 11>Emitted(37, 63) Source(49, 34) + SourceIndex(0)
-12>Emitted(37, 64) Source(49, 35) + SourceIndex(0)
 ---
 >>>    var _7 = robots_2[_6][0], numberB = _7 === void 0 ? -1 : _7;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                            ^^
-4 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^
+4 >                            ^^
+5 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    numberB = -1
-3 >                            
-4 >                              numberB = -1
+2 >    
+3 >        numberB = -1
+4 >                            
+5 >                              numberB = -1
 1->Emitted(38, 5) Source(49, 11) + SourceIndex(0)
-2 >Emitted(38, 29) Source(49, 23) + SourceIndex(0)
-3 >Emitted(38, 31) Source(49, 11) + SourceIndex(0)
-4 >Emitted(38, 64) Source(49, 23) + SourceIndex(0)
+2 >Emitted(38, 9) Source(49, 11) + SourceIndex(0)
+3 >Emitted(38, 29) Source(49, 23) + SourceIndex(0)
+4 >Emitted(38, 31) Source(49, 11) + SourceIndex(0)
+5 >Emitted(38, 64) Source(49, 23) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1138,8 +1138,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^->
+14>                                                       ^^^^^^^->
 1->
   >
 2 >for
@@ -1154,7 +1153,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(41, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(41, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(41, 5) Source(52, 5) + SourceIndex(0)
@@ -1168,21 +1166,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(41, 50) Source(52, 39) + SourceIndex(0)
 12>Emitted(41, 52) Source(52, 28) + SourceIndex(0)
 13>Emitted(41, 56) Source(52, 39) + SourceIndex(0)
-14>Emitted(41, 57) Source(52, 40) + SourceIndex(0)
 ---
 >>>    var _10 = _9[_8][0], numberB = _10 === void 0 ? -1 : _10;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    numberB = -1
-3 >                       
-4 >                         numberB = -1
+2 >    
+3 >        numberB = -1
+4 >                       
+5 >                         numberB = -1
 1->Emitted(42, 5) Source(52, 11) + SourceIndex(0)
-2 >Emitted(42, 24) Source(52, 23) + SourceIndex(0)
-3 >Emitted(42, 26) Source(52, 11) + SourceIndex(0)
-4 >Emitted(42, 61) Source(52, 23) + SourceIndex(0)
+2 >Emitted(42, 9) Source(52, 11) + SourceIndex(0)
+3 >Emitted(42, 24) Source(52, 23) + SourceIndex(0)
+4 >Emitted(42, 26) Source(52, 11) + SourceIndex(0)
+5 >Emitted(42, 61) Source(52, 23) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1234,7 +1234,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
 1->
   >
 2 >for
@@ -1251,7 +1250,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(45, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(55, 5) + SourceIndex(0)
@@ -1267,21 +1265,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(45, 59) Source(55, 44) + SourceIndex(0)
 14>Emitted(45, 61) Source(55, 28) + SourceIndex(0)
 15>Emitted(45, 66) Source(55, 44) + SourceIndex(0)
-16>Emitted(45, 67) Source(55, 45) + SourceIndex(0)
 ---
 >>>    var _13 = _12[_11][0], numberB = _13 === void 0 ? -1 : _13;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    numberB = -1
-3 >                         
-4 >                           numberB = -1
+2 >    
+3 >        numberB = -1
+4 >                         
+5 >                           numberB = -1
 1 >Emitted(46, 5) Source(55, 11) + SourceIndex(0)
-2 >Emitted(46, 26) Source(55, 23) + SourceIndex(0)
-3 >Emitted(46, 28) Source(55, 11) + SourceIndex(0)
-4 >Emitted(46, 63) Source(55, 23) + SourceIndex(0)
+2 >Emitted(46, 9) Source(55, 11) + SourceIndex(0)
+3 >Emitted(46, 26) Source(55, 23) + SourceIndex(0)
+4 >Emitted(46, 28) Source(55, 11) + SourceIndex(0)
+5 >Emitted(46, 63) Source(55, 23) + SourceIndex(0)
 ---
 >>>    console.log(numberB);
 1 >^^^^
@@ -1329,7 +1329,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
 1->
   >
 2 >for
@@ -1342,7 +1341,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(49, 1) Source(58, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(58, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(58, 5) + SourceIndex(0)
@@ -1354,21 +1352,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(49, 74) Source(58, 43) + SourceIndex(0)
 10>Emitted(49, 76) Source(58, 32) + SourceIndex(0)
 11>Emitted(49, 81) Source(58, 43) + SourceIndex(0)
-12>Emitted(49, 82) Source(58, 44) + SourceIndex(0)
 ---
 >>>    var _15 = multiRobots_2[_14][0], nameB = _15 === void 0 ? "noName" : _15;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                   ^^
-4 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                   ^^
+5 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    nameB = "noName"
-3 >                                   
-4 >                                     nameB = "noName"
+2 >    
+3 >        nameB = "noName"
+4 >                                   
+5 >                                     nameB = "noName"
 1 >Emitted(50, 5) Source(58, 11) + SourceIndex(0)
-2 >Emitted(50, 36) Source(58, 27) + SourceIndex(0)
-3 >Emitted(50, 38) Source(58, 11) + SourceIndex(0)
-4 >Emitted(50, 77) Source(58, 27) + SourceIndex(0)
+2 >Emitted(50, 9) Source(58, 11) + SourceIndex(0)
+3 >Emitted(50, 36) Source(58, 27) + SourceIndex(0)
+4 >Emitted(50, 38) Source(58, 11) + SourceIndex(0)
+5 >Emitted(50, 77) Source(58, 27) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1418,8 +1418,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^->
+14>                                                                 ^^^->
 1->
   >
 2 >for
@@ -1434,7 +1433,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(53, 1) Source(61, 1) + SourceIndex(0)
 2 >Emitted(53, 4) Source(61, 4) + SourceIndex(0)
 3 >Emitted(53, 5) Source(61, 5) + SourceIndex(0)
@@ -1448,21 +1446,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(53, 59) Source(61, 48) + SourceIndex(0)
 12>Emitted(53, 61) Source(61, 32) + SourceIndex(0)
 13>Emitted(53, 66) Source(61, 48) + SourceIndex(0)
-14>Emitted(53, 67) Source(61, 49) + SourceIndex(0)
 ---
 >>>    var _18 = _17[_16][0], nameB = _18 === void 0 ? "noName" : _18;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    nameB = "noName"
-3 >                         
-4 >                           nameB = "noName"
+2 >    
+3 >        nameB = "noName"
+4 >                         
+5 >                           nameB = "noName"
 1->Emitted(54, 5) Source(61, 11) + SourceIndex(0)
-2 >Emitted(54, 26) Source(61, 27) + SourceIndex(0)
-3 >Emitted(54, 28) Source(61, 11) + SourceIndex(0)
-4 >Emitted(54, 67) Source(61, 27) + SourceIndex(0)
+2 >Emitted(54, 9) Source(61, 11) + SourceIndex(0)
+3 >Emitted(54, 26) Source(61, 27) + SourceIndex(0)
+4 >Emitted(54, 28) Source(61, 11) + SourceIndex(0)
+5 >Emitted(54, 67) Source(61, 27) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1514,7 +1514,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
 1->
   >
 2 >for
@@ -1531,7 +1530,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(57, 1) Source(64, 1) + SourceIndex(0)
 2 >Emitted(57, 4) Source(64, 4) + SourceIndex(0)
 3 >Emitted(57, 5) Source(64, 5) + SourceIndex(0)
@@ -1547,21 +1545,23 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(57, 69) Source(64, 58) + SourceIndex(0)
 14>Emitted(57, 71) Source(64, 32) + SourceIndex(0)
 15>Emitted(57, 76) Source(64, 58) + SourceIndex(0)
-16>Emitted(57, 77) Source(64, 59) + SourceIndex(0)
 ---
 >>>    var _21 = _20[_19][0], nameB = _21 === void 0 ? "noName" : _21;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    nameB = "noName"
-3 >                         
-4 >                           nameB = "noName"
+2 >    
+3 >        nameB = "noName"
+4 >                         
+5 >                           nameB = "noName"
 1 >Emitted(58, 5) Source(64, 11) + SourceIndex(0)
-2 >Emitted(58, 26) Source(64, 27) + SourceIndex(0)
-3 >Emitted(58, 28) Source(64, 11) + SourceIndex(0)
-4 >Emitted(58, 67) Source(64, 27) + SourceIndex(0)
+2 >Emitted(58, 9) Source(64, 11) + SourceIndex(0)
+3 >Emitted(58, 26) Source(64, 27) + SourceIndex(0)
+4 >Emitted(58, 28) Source(64, 11) + SourceIndex(0)
+5 >Emitted(58, 67) Source(64, 27) + SourceIndex(0)
 ---
 >>>    console.log(nameB);
 1 >^^^^
@@ -1609,8 +1609,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1624,7 +1623,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(61, 1) Source(68, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(68, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(68, 5) + SourceIndex(0)
@@ -1636,51 +1634,53 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(61, 59) Source(68, 73) + SourceIndex(0)
 10>Emitted(61, 61) Source(68, 67) + SourceIndex(0)
 11>Emitted(61, 66) Source(68, 73) + SourceIndex(0)
-12>Emitted(61, 67) Source(68, 74) + SourceIndex(0)
 ---
 >>>    var _23 = robots_3[_22], _24 = _23[0], numberA2 = _24 === void 0 ? -1 : _24, _25 = _23[1], nameA2 = _25 === void 0 ? "noName" : _25, _26 = _23[2], skillA2 = _26 === void 0 ? "skill" : _26;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^^
-4 >                             ^^^^^^^^^^^^
-5 >                                         ^^
-6 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^^^
-9 >                                                                                             ^^
-10>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                       ^^
-12>                                                                                                                                         ^^^^^^^^^^^^
-13>                                                                                                                                                     ^^
-14>                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
+4 >                           ^^
+5 >                             ^^^^^^^^^^^^
+6 >                                         ^^
+7 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                               ^^
+9 >                                                                                 ^^^^^^^^^^^^
+10>                                                                                             ^^
+11>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                       ^^
+13>                                                                                                                                         ^^^^^^^^^^^^
+14>                                                                                                                                                     ^^
+15>                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
-3 >                           
-4 >                             numberA2 = -1
-5 >                                         
-6 >                                           numberA2 = -1
-7 >                                                                               , 
-8 >                                                                                 nameA2 = "noName"
-9 >                                                                                             
-10>                                                                                               nameA2 = "noName"
-11>                                                                                                                                       , 
-12>                                                                                                                                         skillA2 = "skill"
-13>                                                                                                                                                     
-14>                                                                                                                                                       skillA2 = "skill"
-1->Emitted(62, 5) Source(68, 6) + SourceIndex(0)
-2 >Emitted(62, 28) Source(68, 63) + SourceIndex(0)
-3 >Emitted(62, 30) Source(68, 11) + SourceIndex(0)
-4 >Emitted(62, 42) Source(68, 24) + SourceIndex(0)
-5 >Emitted(62, 44) Source(68, 11) + SourceIndex(0)
-6 >Emitted(62, 80) Source(68, 24) + SourceIndex(0)
-7 >Emitted(62, 82) Source(68, 26) + SourceIndex(0)
-8 >Emitted(62, 94) Source(68, 43) + SourceIndex(0)
-9 >Emitted(62, 96) Source(68, 26) + SourceIndex(0)
-10>Emitted(62, 136) Source(68, 43) + SourceIndex(0)
-11>Emitted(62, 138) Source(68, 45) + SourceIndex(0)
-12>Emitted(62, 150) Source(68, 62) + SourceIndex(0)
-13>Emitted(62, 152) Source(68, 45) + SourceIndex(0)
-14>Emitted(62, 192) Source(68, 62) + SourceIndex(0)
+2 >    
+3 >        [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
+4 >                           
+5 >                             numberA2 = -1
+6 >                                         
+7 >                                           numberA2 = -1
+8 >                                                                               , 
+9 >                                                                                 nameA2 = "noName"
+10>                                                                                             
+11>                                                                                               nameA2 = "noName"
+12>                                                                                                                                       , 
+13>                                                                                                                                         skillA2 = "skill"
+14>                                                                                                                                                     
+15>                                                                                                                                                       skillA2 = "skill"
+1->Emitted(62, 5) Source(68, 10) + SourceIndex(0)
+2 >Emitted(62, 9) Source(68, 10) + SourceIndex(0)
+3 >Emitted(62, 28) Source(68, 63) + SourceIndex(0)
+4 >Emitted(62, 30) Source(68, 11) + SourceIndex(0)
+5 >Emitted(62, 42) Source(68, 24) + SourceIndex(0)
+6 >Emitted(62, 44) Source(68, 11) + SourceIndex(0)
+7 >Emitted(62, 80) Source(68, 24) + SourceIndex(0)
+8 >Emitted(62, 82) Source(68, 26) + SourceIndex(0)
+9 >Emitted(62, 94) Source(68, 43) + SourceIndex(0)
+10>Emitted(62, 96) Source(68, 26) + SourceIndex(0)
+11>Emitted(62, 136) Source(68, 43) + SourceIndex(0)
+12>Emitted(62, 138) Source(68, 45) + SourceIndex(0)
+13>Emitted(62, 150) Source(68, 62) + SourceIndex(0)
+14>Emitted(62, 152) Source(68, 45) + SourceIndex(0)
+15>Emitted(62, 192) Source(68, 62) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1730,8 +1730,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1746,7 +1745,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(65, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(65, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(65, 5) Source(71, 5) + SourceIndex(0)
@@ -1760,51 +1758,53 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(65, 54) Source(71, 78) + SourceIndex(0)
 12>Emitted(65, 56) Source(71, 67) + SourceIndex(0)
 13>Emitted(65, 61) Source(71, 78) + SourceIndex(0)
-14>Emitted(65, 62) Source(71, 79) + SourceIndex(0)
 ---
 >>>    var _29 = _28[_27], _30 = _29[0], numberA2 = _30 === void 0 ? -1 : _30, _31 = _29[1], nameA2 = _31 === void 0 ? "noName" : _31, _32 = _29[2], skillA2 = _32 === void 0 ? "skill" : _32;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^
-9 >                                                                                        ^^
-10>                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                  ^^
-12>                                                                                                                                    ^^^^^^^^^^^^
-13>                                                                                                                                                ^^
-14>                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                          ^^
+9 >                                                                            ^^^^^^^^^^^^
+10>                                                                                        ^^
+11>                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                  ^^
+13>                                                                                                                                    ^^^^^^^^^^^^
+14>                                                                                                                                                ^^
+15>                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
-3 >                      
-4 >                        numberA2 = -1
-5 >                                    
-6 >                                      numberA2 = -1
-7 >                                                                          , 
-8 >                                                                            nameA2 = "noName"
-9 >                                                                                        
-10>                                                                                          nameA2 = "noName"
-11>                                                                                                                                  , 
-12>                                                                                                                                    skillA2 = "skill"
-13>                                                                                                                                                
-14>                                                                                                                                                  skillA2 = "skill"
-1->Emitted(66, 5) Source(71, 6) + SourceIndex(0)
-2 >Emitted(66, 23) Source(71, 63) + SourceIndex(0)
-3 >Emitted(66, 25) Source(71, 11) + SourceIndex(0)
-4 >Emitted(66, 37) Source(71, 24) + SourceIndex(0)
-5 >Emitted(66, 39) Source(71, 11) + SourceIndex(0)
-6 >Emitted(66, 75) Source(71, 24) + SourceIndex(0)
-7 >Emitted(66, 77) Source(71, 26) + SourceIndex(0)
-8 >Emitted(66, 89) Source(71, 43) + SourceIndex(0)
-9 >Emitted(66, 91) Source(71, 26) + SourceIndex(0)
-10>Emitted(66, 131) Source(71, 43) + SourceIndex(0)
-11>Emitted(66, 133) Source(71, 45) + SourceIndex(0)
-12>Emitted(66, 145) Source(71, 62) + SourceIndex(0)
-13>Emitted(66, 147) Source(71, 45) + SourceIndex(0)
-14>Emitted(66, 187) Source(71, 62) + SourceIndex(0)
+2 >    
+3 >        [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
+4 >                      
+5 >                        numberA2 = -1
+6 >                                    
+7 >                                      numberA2 = -1
+8 >                                                                          , 
+9 >                                                                            nameA2 = "noName"
+10>                                                                                        
+11>                                                                                          nameA2 = "noName"
+12>                                                                                                                                  , 
+13>                                                                                                                                    skillA2 = "skill"
+14>                                                                                                                                                
+15>                                                                                                                                                  skillA2 = "skill"
+1->Emitted(66, 5) Source(71, 10) + SourceIndex(0)
+2 >Emitted(66, 9) Source(71, 10) + SourceIndex(0)
+3 >Emitted(66, 23) Source(71, 63) + SourceIndex(0)
+4 >Emitted(66, 25) Source(71, 11) + SourceIndex(0)
+5 >Emitted(66, 37) Source(71, 24) + SourceIndex(0)
+6 >Emitted(66, 39) Source(71, 11) + SourceIndex(0)
+7 >Emitted(66, 75) Source(71, 24) + SourceIndex(0)
+8 >Emitted(66, 77) Source(71, 26) + SourceIndex(0)
+9 >Emitted(66, 89) Source(71, 43) + SourceIndex(0)
+10>Emitted(66, 91) Source(71, 26) + SourceIndex(0)
+11>Emitted(66, 131) Source(71, 43) + SourceIndex(0)
+12>Emitted(66, 133) Source(71, 45) + SourceIndex(0)
+13>Emitted(66, 145) Source(71, 62) + SourceIndex(0)
+14>Emitted(66, 147) Source(71, 45) + SourceIndex(0)
+15>Emitted(66, 187) Source(71, 62) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1856,8 +1856,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
-17>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1874,7 +1873,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(69, 1) Source(74, 1) + SourceIndex(0)
 2 >Emitted(69, 4) Source(74, 4) + SourceIndex(0)
 3 >Emitted(69, 5) Source(74, 5) + SourceIndex(0)
@@ -1890,51 +1888,53 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(69, 59) Source(74, 83) + SourceIndex(0)
 14>Emitted(69, 61) Source(74, 67) + SourceIndex(0)
 15>Emitted(69, 66) Source(74, 83) + SourceIndex(0)
-16>Emitted(69, 67) Source(74, 84) + SourceIndex(0)
 ---
 >>>    var _35 = _34[_33], _36 = _35[0], numberA2 = _36 === void 0 ? -1 : _36, _37 = _35[1], nameA2 = _37 === void 0 ? "noName" : _37, _38 = _35[2], skillA2 = _38 === void 0 ? "skill" : _38;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^
-9 >                                                                                        ^^
-10>                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                  ^^
-12>                                                                                                                                    ^^^^^^^^^^^^
-13>                                                                                                                                                ^^
-14>                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                          ^^
+9 >                                                                            ^^^^^^^^^^^^
+10>                                                                                        ^^
+11>                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                  ^^
+13>                                                                                                                                    ^^^^^^^^^^^^
+14>                                                                                                                                                ^^
+15>                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
-3 >                      
-4 >                        numberA2 = -1
-5 >                                    
-6 >                                      numberA2 = -1
-7 >                                                                          , 
-8 >                                                                            nameA2 = "noName"
-9 >                                                                                        
-10>                                                                                          nameA2 = "noName"
-11>                                                                                                                                  , 
-12>                                                                                                                                    skillA2 = "skill"
-13>                                                                                                                                                
-14>                                                                                                                                                  skillA2 = "skill"
-1->Emitted(70, 5) Source(74, 6) + SourceIndex(0)
-2 >Emitted(70, 23) Source(74, 63) + SourceIndex(0)
-3 >Emitted(70, 25) Source(74, 11) + SourceIndex(0)
-4 >Emitted(70, 37) Source(74, 24) + SourceIndex(0)
-5 >Emitted(70, 39) Source(74, 11) + SourceIndex(0)
-6 >Emitted(70, 75) Source(74, 24) + SourceIndex(0)
-7 >Emitted(70, 77) Source(74, 26) + SourceIndex(0)
-8 >Emitted(70, 89) Source(74, 43) + SourceIndex(0)
-9 >Emitted(70, 91) Source(74, 26) + SourceIndex(0)
-10>Emitted(70, 131) Source(74, 43) + SourceIndex(0)
-11>Emitted(70, 133) Source(74, 45) + SourceIndex(0)
-12>Emitted(70, 145) Source(74, 62) + SourceIndex(0)
-13>Emitted(70, 147) Source(74, 45) + SourceIndex(0)
-14>Emitted(70, 187) Source(74, 62) + SourceIndex(0)
+2 >    
+3 >        [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
+4 >                      
+5 >                        numberA2 = -1
+6 >                                    
+7 >                                      numberA2 = -1
+8 >                                                                          , 
+9 >                                                                            nameA2 = "noName"
+10>                                                                                        
+11>                                                                                          nameA2 = "noName"
+12>                                                                                                                                  , 
+13>                                                                                                                                    skillA2 = "skill"
+14>                                                                                                                                                
+15>                                                                                                                                                  skillA2 = "skill"
+1->Emitted(70, 5) Source(74, 10) + SourceIndex(0)
+2 >Emitted(70, 9) Source(74, 10) + SourceIndex(0)
+3 >Emitted(70, 23) Source(74, 63) + SourceIndex(0)
+4 >Emitted(70, 25) Source(74, 11) + SourceIndex(0)
+5 >Emitted(70, 37) Source(74, 24) + SourceIndex(0)
+6 >Emitted(70, 39) Source(74, 11) + SourceIndex(0)
+7 >Emitted(70, 75) Source(74, 24) + SourceIndex(0)
+8 >Emitted(70, 77) Source(74, 26) + SourceIndex(0)
+9 >Emitted(70, 89) Source(74, 43) + SourceIndex(0)
+10>Emitted(70, 91) Source(74, 26) + SourceIndex(0)
+11>Emitted(70, 131) Source(74, 43) + SourceIndex(0)
+12>Emitted(70, 133) Source(74, 45) + SourceIndex(0)
+13>Emitted(70, 145) Source(74, 62) + SourceIndex(0)
+14>Emitted(70, 147) Source(74, 45) + SourceIndex(0)
+15>Emitted(70, 187) Source(74, 62) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1982,8 +1982,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1999,7 +1998,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(73, 1) Source(77, 1) + SourceIndex(0)
 2 >Emitted(73, 4) Source(77, 4) + SourceIndex(0)
 3 >Emitted(73, 5) Source(77, 5) + SourceIndex(0)
@@ -2011,73 +2009,75 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(73, 74) Source(80, 41) + SourceIndex(0)
 10>Emitted(73, 76) Source(80, 30) + SourceIndex(0)
 11>Emitted(73, 81) Source(80, 41) + SourceIndex(0)
-12>Emitted(73, 82) Source(80, 42) + SourceIndex(0)
 ---
 >>>    var _40 = multiRobots_3[_39], _41 = _40[0], nameMA = _41 === void 0 ? "noName" : _41, _42 = _40[1], _43 = _42 === void 0 ? ["skill1", "skill2"] : _42, _44 = _43[0], primarySkillA = _44 === void 0 ? "primary" : _44, _45 = _43[1], secondarySkillA = _45 === void 0 ? "secondary" : _45;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                ^^
-4 >                                  ^^^^^^^^^^^^
-5 >                                              ^^
-6 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                        ^^
-8 >                                                                                          ^^^^^^^^^^^^
-9 >                                                                                                      ^^
-10>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                         ^^
-12>                                                                                                                                                           ^^^^^^^^^^^^
-13>                                                                                                                                                                       ^^
-14>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                         ^^
-16>                                                                                                                                                                                                                           ^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                       ^^
-18>                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                ^^
+5 >                                  ^^^^^^^^^^^^
+6 >                                              ^^
+7 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                                        ^^
+9 >                                                                                          ^^^^^^^^^^^^
+10>                                                                                                      ^^
+11>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                         ^^
+13>                                                                                                                                                           ^^^^^^^^^^^^
+14>                                                                                                                                                                       ^^
+15>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                         ^^
+17>                                                                                                                                                                                                                           ^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                       ^^
+19>                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [nameMA = "noName", [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                                
-4 >                                  nameMA = "noName"
-5 >                                              
-6 >                                                nameMA = "noName"
-7 >                                                                                        , 
-8 >                                                                                          [
+2 >    
+3 >        [nameMA = "noName", [
+  >            primarySkillA = "primary",
+  >            secondarySkillA = "secondary"
+  >        ] = ["skill1", "skill2"]]
+4 >                                
+5 >                                  nameMA = "noName"
+6 >                                              
+7 >                                                nameMA = "noName"
+8 >                                                                                        , 
+9 >                                                                                          [
   >                                                                                              primarySkillA = "primary",
   >                                                                                              secondarySkillA = "secondary"
   >                                                                                          ] = ["skill1", "skill2"]
-9 >                                                                                                      
-10>                                                                                                        [
+10>                                                                                                      
+11>                                                                                                        [
   >                                                                                                            primarySkillA = "primary",
   >                                                                                                            secondarySkillA = "secondary"
   >                                                                                                        ] = ["skill1", "skill2"]
-11>                                                                                                                                                         
-12>                                                                                                                                                           primarySkillA = "primary"
-13>                                                                                                                                                                       
-14>                                                                                                                                                                         primarySkillA = "primary"
-15>                                                                                                                                                                                                                         ,
+12>                                                                                                                                                         
+13>                                                                                                                                                           primarySkillA = "primary"
+14>                                                                                                                                                                       
+15>                                                                                                                                                                         primarySkillA = "primary"
+16>                                                                                                                                                                                                                         ,
   >                                                                                                                                                                                                                             
-16>                                                                                                                                                                                                                           secondarySkillA = "secondary"
-17>                                                                                                                                                                                                                                       
-18>                                                                                                                                                                                                                                         secondarySkillA = "secondary"
-1->Emitted(74, 5) Source(77, 6) + SourceIndex(0)
-2 >Emitted(74, 33) Source(80, 26) + SourceIndex(0)
-3 >Emitted(74, 35) Source(77, 11) + SourceIndex(0)
-4 >Emitted(74, 47) Source(77, 28) + SourceIndex(0)
-5 >Emitted(74, 49) Source(77, 11) + SourceIndex(0)
-6 >Emitted(74, 89) Source(77, 28) + SourceIndex(0)
-7 >Emitted(74, 91) Source(77, 30) + SourceIndex(0)
-8 >Emitted(74, 103) Source(80, 25) + SourceIndex(0)
-9 >Emitted(74, 105) Source(77, 30) + SourceIndex(0)
-10>Emitted(74, 154) Source(80, 25) + SourceIndex(0)
-11>Emitted(74, 156) Source(78, 5) + SourceIndex(0)
-12>Emitted(74, 168) Source(78, 30) + SourceIndex(0)
-13>Emitted(74, 170) Source(78, 5) + SourceIndex(0)
-14>Emitted(74, 218) Source(78, 30) + SourceIndex(0)
-15>Emitted(74, 220) Source(79, 5) + SourceIndex(0)
-16>Emitted(74, 232) Source(79, 34) + SourceIndex(0)
-17>Emitted(74, 234) Source(79, 5) + SourceIndex(0)
-18>Emitted(74, 286) Source(79, 34) + SourceIndex(0)
+17>                                                                                                                                                                                                                           secondarySkillA = "secondary"
+18>                                                                                                                                                                                                                                       
+19>                                                                                                                                                                                                                                         secondarySkillA = "secondary"
+1->Emitted(74, 5) Source(77, 10) + SourceIndex(0)
+2 >Emitted(74, 9) Source(77, 10) + SourceIndex(0)
+3 >Emitted(74, 33) Source(80, 26) + SourceIndex(0)
+4 >Emitted(74, 35) Source(77, 11) + SourceIndex(0)
+5 >Emitted(74, 47) Source(77, 28) + SourceIndex(0)
+6 >Emitted(74, 49) Source(77, 11) + SourceIndex(0)
+7 >Emitted(74, 89) Source(77, 28) + SourceIndex(0)
+8 >Emitted(74, 91) Source(77, 30) + SourceIndex(0)
+9 >Emitted(74, 103) Source(80, 25) + SourceIndex(0)
+10>Emitted(74, 105) Source(77, 30) + SourceIndex(0)
+11>Emitted(74, 154) Source(80, 25) + SourceIndex(0)
+12>Emitted(74, 156) Source(78, 5) + SourceIndex(0)
+13>Emitted(74, 168) Source(78, 30) + SourceIndex(0)
+14>Emitted(74, 170) Source(78, 5) + SourceIndex(0)
+15>Emitted(74, 218) Source(78, 30) + SourceIndex(0)
+16>Emitted(74, 220) Source(79, 5) + SourceIndex(0)
+17>Emitted(74, 232) Source(79, 34) + SourceIndex(0)
+18>Emitted(74, 234) Source(79, 5) + SourceIndex(0)
+19>Emitted(74, 286) Source(79, 34) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2128,8 +2128,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2147,7 +2146,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(77, 1) Source(83, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(83, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(83, 5) + SourceIndex(0)
@@ -2161,73 +2159,75 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(77, 59) Source(86, 46) + SourceIndex(0)
 12>Emitted(77, 61) Source(86, 30) + SourceIndex(0)
 13>Emitted(77, 66) Source(86, 46) + SourceIndex(0)
-14>Emitted(77, 67) Source(86, 47) + SourceIndex(0)
 ---
 >>>    var _48 = _47[_46], _49 = _48[0], nameMA = _49 === void 0 ? "noName" : _49, _50 = _48[1], _51 = _50 === void 0 ? ["skill1", "skill2"] : _50, _52 = _51[0], primarySkillA = _52 === void 0 ? "primary" : _52, _53 = _51[1], secondarySkillA = _53 === void 0 ? "secondary" : _53;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                              ^^
-8 >                                                                                ^^^^^^^^^^^^
-9 >                                                                                            ^^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                               ^^
-12>                                                                                                                                                 ^^^^^^^^^^^^
-13>                                                                                                                                                             ^^
-14>                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                               ^^
-16>                                                                                                                                                                                                                 ^^^^^^^^^^^^
-17>                                                                                                                                                                                                                             ^^
-18>                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                              ^^
+9 >                                                                                ^^^^^^^^^^^^
+10>                                                                                            ^^
+11>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                               ^^
+13>                                                                                                                                                 ^^^^^^^^^^^^
+14>                                                                                                                                                             ^^
+15>                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                               ^^
+17>                                                                                                                                                                                                                 ^^^^^^^^^^^^
+18>                                                                                                                                                                                                                             ^^
+19>                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [nameMA = "noName", [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                      
-4 >                        nameMA = "noName"
-5 >                                    
-6 >                                      nameMA = "noName"
-7 >                                                                              , 
-8 >                                                                                [
+2 >    
+3 >        [nameMA = "noName", [
+  >            primarySkillA = "primary",
+  >            secondarySkillA = "secondary"
+  >        ] = ["skill1", "skill2"]]
+4 >                      
+5 >                        nameMA = "noName"
+6 >                                    
+7 >                                      nameMA = "noName"
+8 >                                                                              , 
+9 >                                                                                [
   >                                                                                    primarySkillA = "primary",
   >                                                                                    secondarySkillA = "secondary"
   >                                                                                ] = ["skill1", "skill2"]
-9 >                                                                                            
-10>                                                                                              [
+10>                                                                                            
+11>                                                                                              [
   >                                                                                                  primarySkillA = "primary",
   >                                                                                                  secondarySkillA = "secondary"
   >                                                                                              ] = ["skill1", "skill2"]
-11>                                                                                                                                               
-12>                                                                                                                                                 primarySkillA = "primary"
-13>                                                                                                                                                             
-14>                                                                                                                                                               primarySkillA = "primary"
-15>                                                                                                                                                                                                               ,
+12>                                                                                                                                               
+13>                                                                                                                                                 primarySkillA = "primary"
+14>                                                                                                                                                             
+15>                                                                                                                                                               primarySkillA = "primary"
+16>                                                                                                                                                                                                               ,
   >                                                                                                                                                                                                                   
-16>                                                                                                                                                                                                                 secondarySkillA = "secondary"
-17>                                                                                                                                                                                                                             
-18>                                                                                                                                                                                                                               secondarySkillA = "secondary"
-1->Emitted(78, 5) Source(83, 6) + SourceIndex(0)
-2 >Emitted(78, 23) Source(86, 26) + SourceIndex(0)
-3 >Emitted(78, 25) Source(83, 11) + SourceIndex(0)
-4 >Emitted(78, 37) Source(83, 28) + SourceIndex(0)
-5 >Emitted(78, 39) Source(83, 11) + SourceIndex(0)
-6 >Emitted(78, 79) Source(83, 28) + SourceIndex(0)
-7 >Emitted(78, 81) Source(83, 30) + SourceIndex(0)
-8 >Emitted(78, 93) Source(86, 25) + SourceIndex(0)
-9 >Emitted(78, 95) Source(83, 30) + SourceIndex(0)
-10>Emitted(78, 144) Source(86, 25) + SourceIndex(0)
-11>Emitted(78, 146) Source(84, 5) + SourceIndex(0)
-12>Emitted(78, 158) Source(84, 30) + SourceIndex(0)
-13>Emitted(78, 160) Source(84, 5) + SourceIndex(0)
-14>Emitted(78, 208) Source(84, 30) + SourceIndex(0)
-15>Emitted(78, 210) Source(85, 5) + SourceIndex(0)
-16>Emitted(78, 222) Source(85, 34) + SourceIndex(0)
-17>Emitted(78, 224) Source(85, 5) + SourceIndex(0)
-18>Emitted(78, 276) Source(85, 34) + SourceIndex(0)
+17>                                                                                                                                                                                                                 secondarySkillA = "secondary"
+18>                                                                                                                                                                                                                             
+19>                                                                                                                                                                                                                               secondarySkillA = "secondary"
+1->Emitted(78, 5) Source(83, 10) + SourceIndex(0)
+2 >Emitted(78, 9) Source(83, 10) + SourceIndex(0)
+3 >Emitted(78, 23) Source(86, 26) + SourceIndex(0)
+4 >Emitted(78, 25) Source(83, 11) + SourceIndex(0)
+5 >Emitted(78, 37) Source(83, 28) + SourceIndex(0)
+6 >Emitted(78, 39) Source(83, 11) + SourceIndex(0)
+7 >Emitted(78, 79) Source(83, 28) + SourceIndex(0)
+8 >Emitted(78, 81) Source(83, 30) + SourceIndex(0)
+9 >Emitted(78, 93) Source(86, 25) + SourceIndex(0)
+10>Emitted(78, 95) Source(83, 30) + SourceIndex(0)
+11>Emitted(78, 144) Source(86, 25) + SourceIndex(0)
+12>Emitted(78, 146) Source(84, 5) + SourceIndex(0)
+13>Emitted(78, 158) Source(84, 30) + SourceIndex(0)
+14>Emitted(78, 160) Source(84, 5) + SourceIndex(0)
+15>Emitted(78, 208) Source(84, 30) + SourceIndex(0)
+16>Emitted(78, 210) Source(85, 5) + SourceIndex(0)
+17>Emitted(78, 222) Source(85, 34) + SourceIndex(0)
+18>Emitted(78, 224) Source(85, 5) + SourceIndex(0)
+19>Emitted(78, 276) Source(85, 34) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2280,8 +2280,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
-17>                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2301,7 +2300,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(81, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(81, 4) Source(89, 4) + SourceIndex(0)
 3 >Emitted(81, 5) Source(89, 5) + SourceIndex(0)
@@ -2317,73 +2315,75 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(81, 69) Source(92, 56) + SourceIndex(0)
 14>Emitted(81, 71) Source(92, 30) + SourceIndex(0)
 15>Emitted(81, 76) Source(92, 56) + SourceIndex(0)
-16>Emitted(81, 77) Source(92, 57) + SourceIndex(0)
 ---
 >>>    var _56 = _55[_54], _57 = _56[0], nameMA = _57 === void 0 ? "noName" : _57, _58 = _56[1], _59 = _58 === void 0 ? ["skill1", "skill2"] : _58, _60 = _59[0], primarySkillA = _60 === void 0 ? "primary" : _60, _61 = _59[1], secondarySkillA = _61 === void 0 ? "secondary" : _61;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                              ^^
-8 >                                                                                ^^^^^^^^^^^^
-9 >                                                                                            ^^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                               ^^
-12>                                                                                                                                                 ^^^^^^^^^^^^
-13>                                                                                                                                                             ^^
-14>                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                               ^^
-16>                                                                                                                                                                                                                 ^^^^^^^^^^^^
-17>                                                                                                                                                                                                                             ^^
-18>                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                              ^^
+9 >                                                                                ^^^^^^^^^^^^
+10>                                                                                            ^^
+11>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                               ^^
+13>                                                                                                                                                 ^^^^^^^^^^^^
+14>                                                                                                                                                             ^^
+15>                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                               ^^
+17>                                                                                                                                                                                                                 ^^^^^^^^^^^^
+18>                                                                                                                                                                                                                             ^^
+19>                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [nameMA = "noName", [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                      
-4 >                        nameMA = "noName"
-5 >                                    
-6 >                                      nameMA = "noName"
-7 >                                                                              , 
-8 >                                                                                [
+2 >    
+3 >        [nameMA = "noName", [
+  >            primarySkillA = "primary",
+  >            secondarySkillA = "secondary"
+  >        ] = ["skill1", "skill2"]]
+4 >                      
+5 >                        nameMA = "noName"
+6 >                                    
+7 >                                      nameMA = "noName"
+8 >                                                                              , 
+9 >                                                                                [
   >                                                                                    primarySkillA = "primary",
   >                                                                                    secondarySkillA = "secondary"
   >                                                                                ] = ["skill1", "skill2"]
-9 >                                                                                            
-10>                                                                                              [
+10>                                                                                            
+11>                                                                                              [
   >                                                                                                  primarySkillA = "primary",
   >                                                                                                  secondarySkillA = "secondary"
   >                                                                                              ] = ["skill1", "skill2"]
-11>                                                                                                                                               
-12>                                                                                                                                                 primarySkillA = "primary"
-13>                                                                                                                                                             
-14>                                                                                                                                                               primarySkillA = "primary"
-15>                                                                                                                                                                                                               ,
+12>                                                                                                                                               
+13>                                                                                                                                                 primarySkillA = "primary"
+14>                                                                                                                                                             
+15>                                                                                                                                                               primarySkillA = "primary"
+16>                                                                                                                                                                                                               ,
   >                                                                                                                                                                                                                   
-16>                                                                                                                                                                                                                 secondarySkillA = "secondary"
-17>                                                                                                                                                                                                                             
-18>                                                                                                                                                                                                                               secondarySkillA = "secondary"
-1->Emitted(82, 5) Source(89, 6) + SourceIndex(0)
-2 >Emitted(82, 23) Source(92, 26) + SourceIndex(0)
-3 >Emitted(82, 25) Source(89, 11) + SourceIndex(0)
-4 >Emitted(82, 37) Source(89, 28) + SourceIndex(0)
-5 >Emitted(82, 39) Source(89, 11) + SourceIndex(0)
-6 >Emitted(82, 79) Source(89, 28) + SourceIndex(0)
-7 >Emitted(82, 81) Source(89, 30) + SourceIndex(0)
-8 >Emitted(82, 93) Source(92, 25) + SourceIndex(0)
-9 >Emitted(82, 95) Source(89, 30) + SourceIndex(0)
-10>Emitted(82, 144) Source(92, 25) + SourceIndex(0)
-11>Emitted(82, 146) Source(90, 5) + SourceIndex(0)
-12>Emitted(82, 158) Source(90, 30) + SourceIndex(0)
-13>Emitted(82, 160) Source(90, 5) + SourceIndex(0)
-14>Emitted(82, 208) Source(90, 30) + SourceIndex(0)
-15>Emitted(82, 210) Source(91, 5) + SourceIndex(0)
-16>Emitted(82, 222) Source(91, 34) + SourceIndex(0)
-17>Emitted(82, 224) Source(91, 5) + SourceIndex(0)
-18>Emitted(82, 276) Source(91, 34) + SourceIndex(0)
+17>                                                                                                                                                                                                                 secondarySkillA = "secondary"
+18>                                                                                                                                                                                                                             
+19>                                                                                                                                                                                                                               secondarySkillA = "secondary"
+1->Emitted(82, 5) Source(89, 10) + SourceIndex(0)
+2 >Emitted(82, 9) Source(89, 10) + SourceIndex(0)
+3 >Emitted(82, 23) Source(92, 26) + SourceIndex(0)
+4 >Emitted(82, 25) Source(89, 11) + SourceIndex(0)
+5 >Emitted(82, 37) Source(89, 28) + SourceIndex(0)
+6 >Emitted(82, 39) Source(89, 11) + SourceIndex(0)
+7 >Emitted(82, 79) Source(89, 28) + SourceIndex(0)
+8 >Emitted(82, 81) Source(89, 30) + SourceIndex(0)
+9 >Emitted(82, 93) Source(92, 25) + SourceIndex(0)
+10>Emitted(82, 95) Source(89, 30) + SourceIndex(0)
+11>Emitted(82, 144) Source(92, 25) + SourceIndex(0)
+12>Emitted(82, 146) Source(90, 5) + SourceIndex(0)
+13>Emitted(82, 158) Source(90, 30) + SourceIndex(0)
+14>Emitted(82, 160) Source(90, 5) + SourceIndex(0)
+15>Emitted(82, 208) Source(90, 30) + SourceIndex(0)
+16>Emitted(82, 210) Source(91, 5) + SourceIndex(0)
+17>Emitted(82, 222) Source(91, 34) + SourceIndex(0)
+18>Emitted(82, 224) Source(91, 5) + SourceIndex(0)
+19>Emitted(82, 276) Source(91, 34) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2432,8 +2432,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -2447,7 +2446,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(85, 1) Source(96, 1) + SourceIndex(0)
 2 >Emitted(85, 4) Source(96, 4) + SourceIndex(0)
 3 >Emitted(85, 5) Source(96, 5) + SourceIndex(0)
@@ -2459,33 +2457,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(85, 59) Source(96, 50) + SourceIndex(0)
 10>Emitted(85, 61) Source(96, 44) + SourceIndex(0)
 11>Emitted(85, 66) Source(96, 50) + SourceIndex(0)
-12>Emitted(85, 67) Source(96, 51) + SourceIndex(0)
 ---
 >>>    var _63 = robots_4[_62], _64 = _63[0], numberA3 = _64 === void 0 ? -1 : _64, robotAInfo = _63.slice(1);
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^^
-4 >                             ^^^^^^^^^^^^
-5 >                                         ^^
-6 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
+4 >                           ^^
+5 >                             ^^^^^^^^^^^^
+6 >                                         ^^
+7 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                               ^^
+9 >                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA3 = -1, ...robotAInfo]
-3 >                           
-4 >                             numberA3 = -1
-5 >                                         
-6 >                                           numberA3 = -1
-7 >                                                                               , 
-8 >                                                                                 ...robotAInfo
-1->Emitted(86, 5) Source(96, 6) + SourceIndex(0)
-2 >Emitted(86, 28) Source(96, 40) + SourceIndex(0)
-3 >Emitted(86, 30) Source(96, 11) + SourceIndex(0)
-4 >Emitted(86, 42) Source(96, 24) + SourceIndex(0)
-5 >Emitted(86, 44) Source(96, 11) + SourceIndex(0)
-6 >Emitted(86, 80) Source(96, 24) + SourceIndex(0)
-7 >Emitted(86, 82) Source(96, 26) + SourceIndex(0)
-8 >Emitted(86, 107) Source(96, 39) + SourceIndex(0)
+2 >    
+3 >        [numberA3 = -1, ...robotAInfo]
+4 >                           
+5 >                             numberA3 = -1
+6 >                                         
+7 >                                           numberA3 = -1
+8 >                                                                               , 
+9 >                                                                                 ...robotAInfo
+1->Emitted(86, 5) Source(96, 10) + SourceIndex(0)
+2 >Emitted(86, 9) Source(96, 10) + SourceIndex(0)
+3 >Emitted(86, 28) Source(96, 40) + SourceIndex(0)
+4 >Emitted(86, 30) Source(96, 11) + SourceIndex(0)
+5 >Emitted(86, 42) Source(96, 24) + SourceIndex(0)
+6 >Emitted(86, 44) Source(96, 11) + SourceIndex(0)
+7 >Emitted(86, 80) Source(96, 24) + SourceIndex(0)
+8 >Emitted(86, 82) Source(96, 26) + SourceIndex(0)
+9 >Emitted(86, 107) Source(96, 39) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2535,8 +2535,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2551,7 +2550,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(89, 1) Source(99, 1) + SourceIndex(0)
 2 >Emitted(89, 4) Source(99, 4) + SourceIndex(0)
 3 >Emitted(89, 5) Source(99, 5) + SourceIndex(0)
@@ -2565,33 +2563,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(89, 54) Source(99, 55) + SourceIndex(0)
 12>Emitted(89, 56) Source(99, 44) + SourceIndex(0)
 13>Emitted(89, 61) Source(99, 55) + SourceIndex(0)
-14>Emitted(89, 62) Source(99, 56) + SourceIndex(0)
 ---
 >>>    var _67 = _66[_65], _68 = _67[0], numberA3 = _68 === void 0 ? -1 : _68, robotAInfo = _67.slice(1);
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                          ^^
+9 >                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA3 = -1, ...robotAInfo]
-3 >                      
-4 >                        numberA3 = -1
-5 >                                    
-6 >                                      numberA3 = -1
-7 >                                                                          , 
-8 >                                                                            ...robotAInfo
-1->Emitted(90, 5) Source(99, 6) + SourceIndex(0)
-2 >Emitted(90, 23) Source(99, 40) + SourceIndex(0)
-3 >Emitted(90, 25) Source(99, 11) + SourceIndex(0)
-4 >Emitted(90, 37) Source(99, 24) + SourceIndex(0)
-5 >Emitted(90, 39) Source(99, 11) + SourceIndex(0)
-6 >Emitted(90, 75) Source(99, 24) + SourceIndex(0)
-7 >Emitted(90, 77) Source(99, 26) + SourceIndex(0)
-8 >Emitted(90, 102) Source(99, 39) + SourceIndex(0)
+2 >    
+3 >        [numberA3 = -1, ...robotAInfo]
+4 >                      
+5 >                        numberA3 = -1
+6 >                                    
+7 >                                      numberA3 = -1
+8 >                                                                          , 
+9 >                                                                            ...robotAInfo
+1->Emitted(90, 5) Source(99, 10) + SourceIndex(0)
+2 >Emitted(90, 9) Source(99, 10) + SourceIndex(0)
+3 >Emitted(90, 23) Source(99, 40) + SourceIndex(0)
+4 >Emitted(90, 25) Source(99, 11) + SourceIndex(0)
+5 >Emitted(90, 37) Source(99, 24) + SourceIndex(0)
+6 >Emitted(90, 39) Source(99, 11) + SourceIndex(0)
+7 >Emitted(90, 75) Source(99, 24) + SourceIndex(0)
+8 >Emitted(90, 77) Source(99, 26) + SourceIndex(0)
+9 >Emitted(90, 102) Source(99, 39) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2643,8 +2643,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
-17>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2661,7 +2660,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(93, 1) Source(102, 1) + SourceIndex(0)
 2 >Emitted(93, 4) Source(102, 4) + SourceIndex(0)
 3 >Emitted(93, 5) Source(102, 5) + SourceIndex(0)
@@ -2677,33 +2675,35 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(93, 59) Source(102, 60) + SourceIndex(0)
 14>Emitted(93, 61) Source(102, 44) + SourceIndex(0)
 15>Emitted(93, 66) Source(102, 60) + SourceIndex(0)
-16>Emitted(93, 67) Source(102, 61) + SourceIndex(0)
 ---
 >>>    var _71 = _70[_69], _72 = _71[0], numberA3 = _72 === void 0 ? -1 : _72, robotAInfo = _71.slice(1);
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                          ^^
+9 >                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let [numberA3 = -1, ...robotAInfo]
-3 >                      
-4 >                        numberA3 = -1
-5 >                                    
-6 >                                      numberA3 = -1
-7 >                                                                          , 
-8 >                                                                            ...robotAInfo
-1->Emitted(94, 5) Source(102, 6) + SourceIndex(0)
-2 >Emitted(94, 23) Source(102, 40) + SourceIndex(0)
-3 >Emitted(94, 25) Source(102, 11) + SourceIndex(0)
-4 >Emitted(94, 37) Source(102, 24) + SourceIndex(0)
-5 >Emitted(94, 39) Source(102, 11) + SourceIndex(0)
-6 >Emitted(94, 75) Source(102, 24) + SourceIndex(0)
-7 >Emitted(94, 77) Source(102, 26) + SourceIndex(0)
-8 >Emitted(94, 102) Source(102, 39) + SourceIndex(0)
+2 >    
+3 >        [numberA3 = -1, ...robotAInfo]
+4 >                      
+5 >                        numberA3 = -1
+6 >                                    
+7 >                                      numberA3 = -1
+8 >                                                                          , 
+9 >                                                                            ...robotAInfo
+1->Emitted(94, 5) Source(102, 10) + SourceIndex(0)
+2 >Emitted(94, 9) Source(102, 10) + SourceIndex(0)
+3 >Emitted(94, 23) Source(102, 40) + SourceIndex(0)
+4 >Emitted(94, 25) Source(102, 11) + SourceIndex(0)
+5 >Emitted(94, 37) Source(102, 24) + SourceIndex(0)
+6 >Emitted(94, 39) Source(102, 11) + SourceIndex(0)
+7 >Emitted(94, 75) Source(102, 24) + SourceIndex(0)
+8 >Emitted(94, 77) Source(102, 26) + SourceIndex(0)
+9 >Emitted(94, 102) Source(102, 39) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js.map
index ccee72c33bf..f0224061c2b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AAEtG,GAAG,CAAC,CAAyB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAA/B,iBAAoB,EAAjB,UAAgB,EAAhB,qCAAgB;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAApC,WAAoB,EAAjB,UAAgB,EAAhB,qCAAgB;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyB,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAAzC,WAAoB,EAAjB,UAAgB,EAAhB,qCAAgB;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAGyB,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAHpC,sBAGoB,EAHjB,UAGgB,EAHhB,8CAGgB,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAHzC,WAGoB,EAHjB,UAGgB,EAHhB,8CAGgB,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B,CAAC;IAHnD,WAGoB,EAHjB,UAGgB,EAHhB,8CAGgB,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAmB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAxB,oBAAY,EAAZ,iCAAY;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAmB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA7B,eAAY,EAAZ,mCAAY;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAmB,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAlC,iBAAY,EAAZ,mCAAY;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAuB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAAjC,2BAAgB,EAAhB,uCAAgB;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAtC,iBAAgB,EAAhB,uCAAgB;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAAhD,iBAAgB,EAAhB,uCAAgB;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAA0D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAAhE,mBAAqD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA0D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAArE,cAAqD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA0D,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAA1E,cAAqD,EAApD,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAHpC,wBAGoB,EAHnB,YAAiB,EAAjB,wCAAiB,EAAE,YAGD,EAHC,iDAGD,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAHzC,cAGoB,EAHnB,YAAiB,EAAjB,wCAAiB,EAAE,YAGD,EAHC,iDAGD,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,CAAC;IAHnD,cAGoB,EAHnB,YAAiB,EAAjB,wCAAiB,EAAE,YAGD,EAHC,iDAGD,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAAmC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAAzC,mBAA8B,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAmC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAA9C,cAA8B,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAmC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAnD,cAA8B,EAA7B,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AAEtG,GAAG,CAAC,CAAyB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;uBAA3B,UAAgB,EAAhB,qCAAgB;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;iBAAhC,UAAgB,EAAhB,qCAAgB;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyB,UAAgB,EAAhB,MAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,cAAgB,EAAhB,IAAgB;iBAArC,UAAgB,EAAhB,qCAAgB;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAGyB,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;4BAHhC,UAGgB,EAHhB,8CAGgB,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;iBAHrC,UAGgB,EAHhB,8CAGgB,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AACD,GAAG,CAAC,CAGyB,UAA0B,EAA1B,MAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,cAA0B,EAA1B,IAA0B;iBAH/C,UAGgB,EAHhB,8CAGgB,EAFpB,UAAyB,EAAzB,8CAAyB,EACzB,UAA6B,EAA7B,kDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;CAC9B;AAED,GAAG,CAAC,CAAmB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAvB,oBAAY,EAAZ,iCAAY;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAmB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAA5B,eAAY,EAAZ,mCAAY;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAmB,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;IAAjC,iBAAY,EAAZ,mCAAY;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACxB;AACD,GAAG,CAAC,CAAuB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IAAhC,2BAAgB,EAAhB,uCAAgB;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAArC,iBAAgB,EAAhB,uCAAgB;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;IAA/C,iBAAgB,EAAhB,uCAAgB;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAA0D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;yBAA9D,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA0D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;oBAAnE,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAA0D,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;oBAAxE,YAAa,EAAb,oCAAa,EAAE,YAAiB,EAAjB,wCAAiB,EAAE,YAAiB,EAAjB,wCAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;8BAHlC,YAAiB,EAAjB,wCAAiB,EAAE,YAGD,EAHC,iDAGD,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;oBAHvC,YAAiB,EAAjB,wCAAiB,EAAE,YAGD,EAHC,iDAGD,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AACD,GAAG,CAAC,CAGyB,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B;oBAHjD,YAAiB,EAAjB,wCAAiB,EAAE,YAGD,EAHC,iDAGD,EAFpB,YAAyB,EAAzB,gDAAyB,EACzB,YAA6B,EAA7B,oDAA6B;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB;AAED,GAAG,CAAC,CAAmC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;yBAAvC,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAmC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;oBAA5C,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAmC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB;oBAAjD,YAAa,EAAb,oCAAa,EAAE,yBAAa;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.sourcemap.txt
index dc11eb52da9..f9ab0c470e7 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.sourcemap.txt
@@ -444,8 +444,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^^^^^^^^->
+12>                                                              ^^^^^^^^^^^^->
 1->
   >
   >
@@ -459,7 +458,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(17, 1) Source(26, 1) + SourceIndex(0)
 2 >Emitted(17, 4) Source(26, 4) + SourceIndex(0)
 3 >Emitted(17, 5) Source(26, 5) + SourceIndex(0)
@@ -471,27 +469,20 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(17, 57) Source(26, 36) + SourceIndex(0)
 10>Emitted(17, 59) Source(26, 30) + SourceIndex(0)
 11>Emitted(17, 63) Source(26, 36) + SourceIndex(0)
-12>Emitted(17, 64) Source(26, 37) + SourceIndex(0)
 ---
 >>>    _a = robots_1[_i], _b = _a[1], nameA = _b === void 0 ? "noName" : _b;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^
-4 >                       ^^^^^^^^^^
-5 >                                 ^^
-6 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^
+2 >                       ^^^^^^^^^^
+3 >                                 ^^
+4 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, nameA = "noName"]
-3 >                     
-4 >                       nameA = "noName"
-5 >                                 
-6 >                                   nameA = "noName"
-1->Emitted(18, 5) Source(26, 6) + SourceIndex(0)
-2 >Emitted(18, 22) Source(26, 26) + SourceIndex(0)
-3 >Emitted(18, 24) Source(26, 9) + SourceIndex(0)
-4 >Emitted(18, 34) Source(26, 25) + SourceIndex(0)
-5 >Emitted(18, 36) Source(26, 9) + SourceIndex(0)
-6 >Emitted(18, 73) Source(26, 25) + SourceIndex(0)
+2 >                       nameA = "noName"
+3 >                                 
+4 >                                   nameA = "noName"
+1->Emitted(18, 24) Source(26, 9) + SourceIndex(0)
+2 >Emitted(18, 34) Source(26, 25) + SourceIndex(0)
+3 >Emitted(18, 36) Source(26, 9) + SourceIndex(0)
+4 >Emitted(18, 73) Source(26, 25) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -541,8 +532,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^^^^^^^->
+14>                                                       ^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -557,7 +547,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(21, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(21, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(21, 5) Source(29, 5) + SourceIndex(0)
@@ -571,27 +560,20 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(21, 50) Source(29, 41) + SourceIndex(0)
 12>Emitted(21, 52) Source(29, 30) + SourceIndex(0)
 13>Emitted(21, 56) Source(29, 41) + SourceIndex(0)
-14>Emitted(21, 57) Source(29, 42) + SourceIndex(0)
 ---
 >>>    _e = _d[_c], _f = _e[1], nameA = _f === void 0 ? "noName" : _f;
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^
-5 >                           ^^
-6 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, nameA = "noName"]
-3 >               
-4 >                 nameA = "noName"
-5 >                           
-6 >                             nameA = "noName"
-1->Emitted(22, 5) Source(29, 6) + SourceIndex(0)
-2 >Emitted(22, 16) Source(29, 26) + SourceIndex(0)
-3 >Emitted(22, 18) Source(29, 9) + SourceIndex(0)
-4 >Emitted(22, 28) Source(29, 25) + SourceIndex(0)
-5 >Emitted(22, 30) Source(29, 9) + SourceIndex(0)
-6 >Emitted(22, 67) Source(29, 25) + SourceIndex(0)
+2 >                 nameA = "noName"
+3 >                           
+4 >                             nameA = "noName"
+1->Emitted(22, 18) Source(29, 9) + SourceIndex(0)
+2 >Emitted(22, 28) Source(29, 25) + SourceIndex(0)
+3 >Emitted(22, 30) Source(29, 9) + SourceIndex(0)
+4 >Emitted(22, 67) Source(29, 25) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -643,8 +625,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                        ^^^^^^^^^^^^^^
 14>                                                      ^^
 15>                                                        ^^^^
-16>                                                            ^
-17>                                                             ^^^^^^^->
+16>                                                            ^^^^^^^^->
 1->
   >
 2 >for
@@ -661,7 +642,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                        [robotA, robotB]
 14>                                                      
 15>                                                        [robotA, robotB]
-16>                                                            )
 1->Emitted(25, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(25, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(25, 5) Source(32, 5) + SourceIndex(0)
@@ -677,27 +657,20 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(25, 55) Source(32, 46) + SourceIndex(0)
 14>Emitted(25, 57) Source(32, 30) + SourceIndex(0)
 15>Emitted(25, 61) Source(32, 46) + SourceIndex(0)
-16>Emitted(25, 62) Source(32, 47) + SourceIndex(0)
 ---
 >>>    _j = _h[_g], _k = _j[1], nameA = _k === void 0 ? "noName" : _k;
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^
-5 >                           ^^
-6 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, nameA = "noName"]
-3 >               
-4 >                 nameA = "noName"
-5 >                           
-6 >                             nameA = "noName"
-1->Emitted(26, 5) Source(32, 6) + SourceIndex(0)
-2 >Emitted(26, 16) Source(32, 26) + SourceIndex(0)
-3 >Emitted(26, 18) Source(32, 9) + SourceIndex(0)
-4 >Emitted(26, 28) Source(32, 25) + SourceIndex(0)
-5 >Emitted(26, 30) Source(32, 9) + SourceIndex(0)
-6 >Emitted(26, 67) Source(32, 25) + SourceIndex(0)
+2 >                 nameA = "noName"
+3 >                           
+4 >                             nameA = "noName"
+1->Emitted(26, 18) Source(32, 9) + SourceIndex(0)
+2 >Emitted(26, 28) Source(32, 25) + SourceIndex(0)
+3 >Emitted(26, 30) Source(32, 9) + SourceIndex(0)
+4 >Emitted(26, 67) Source(32, 25) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -745,8 +718,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -762,7 +734,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(29, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(29, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(29, 5) Source(35, 5) + SourceIndex(0)
@@ -774,61 +745,51 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(29, 72) Source(38, 41) + SourceIndex(0)
 10>Emitted(29, 74) Source(38, 30) + SourceIndex(0)
 11>Emitted(29, 78) Source(38, 41) + SourceIndex(0)
-12>Emitted(29, 79) Source(38, 42) + SourceIndex(0)
 ---
 >>>    _m = multiRobots_1[_l], _o = _m[1], _p = _o === void 0 ? ["skill1", "skill2"] : _o, _q = _p[0], primarySkillA = _q === void 0 ? "primary" : _q, _r = _p[1], secondarySkillA = _r === void 0 ? "secondary" : _r;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^
-4 >                            ^^^^^^^^^^
-5 >                                      ^^
-6 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                      ^^
-8 >                                                                                        ^^^^^^^^^^
-9 >                                                                                                  ^^
-10>                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                  ^^
-12>                                                                                                                                                    ^^^^^^^^^^
-13>                                                                                                                                                              ^^
-14>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                            ^^^^^^^^^^
+3 >                                      ^^
+4 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                                      ^^
+6 >                                                                                        ^^^^^^^^^^
+7 >                                                                                                  ^^
+8 >                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                  ^^
+10>                                                                                                                                                    ^^^^^^^^^^
+11>                                                                                                                                                              ^^
+12>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                          
-4 >                            [
+2 >                            [
   >                                primarySkillA = "primary",
   >                                secondarySkillA = "secondary"
   >                            ] = ["skill1", "skill2"]
-5 >                                      
-6 >                                        [
+3 >                                      
+4 >                                        [
   >                                            primarySkillA = "primary",
   >                                            secondarySkillA = "secondary"
   >                                        ] = ["skill1", "skill2"]
-7 >                                                                                      
-8 >                                                                                        primarySkillA = "primary"
-9 >                                                                                                  
-10>                                                                                                    primarySkillA = "primary"
-11>                                                                                                                                                  ,
+5 >                                                                                      
+6 >                                                                                        primarySkillA = "primary"
+7 >                                                                                                  
+8 >                                                                                                    primarySkillA = "primary"
+9 >                                                                                                                                                  ,
   >                                                                                                                                                      
-12>                                                                                                                                                    secondarySkillA = "secondary"
-13>                                                                                                                                                              
-14>                                                                                                                                                                secondarySkillA = "secondary"
-1->Emitted(30, 5) Source(35, 6) + SourceIndex(0)
-2 >Emitted(30, 27) Source(38, 26) + SourceIndex(0)
-3 >Emitted(30, 29) Source(35, 9) + SourceIndex(0)
-4 >Emitted(30, 39) Source(38, 25) + SourceIndex(0)
-5 >Emitted(30, 41) Source(35, 9) + SourceIndex(0)
-6 >Emitted(30, 87) Source(38, 25) + SourceIndex(0)
-7 >Emitted(30, 89) Source(36, 5) + SourceIndex(0)
-8 >Emitted(30, 99) Source(36, 30) + SourceIndex(0)
-9 >Emitted(30, 101) Source(36, 5) + SourceIndex(0)
-10>Emitted(30, 147) Source(36, 30) + SourceIndex(0)
-11>Emitted(30, 149) Source(37, 5) + SourceIndex(0)
-12>Emitted(30, 159) Source(37, 34) + SourceIndex(0)
-13>Emitted(30, 161) Source(37, 5) + SourceIndex(0)
-14>Emitted(30, 211) Source(37, 34) + SourceIndex(0)
+10>                                                                                                                                                    secondarySkillA = "secondary"
+11>                                                                                                                                                              
+12>                                                                                                                                                                secondarySkillA = "secondary"
+1->Emitted(30, 29) Source(35, 9) + SourceIndex(0)
+2 >Emitted(30, 39) Source(38, 25) + SourceIndex(0)
+3 >Emitted(30, 41) Source(35, 9) + SourceIndex(0)
+4 >Emitted(30, 87) Source(38, 25) + SourceIndex(0)
+5 >Emitted(30, 89) Source(36, 5) + SourceIndex(0)
+6 >Emitted(30, 99) Source(36, 30) + SourceIndex(0)
+7 >Emitted(30, 101) Source(36, 5) + SourceIndex(0)
+8 >Emitted(30, 147) Source(36, 30) + SourceIndex(0)
+9 >Emitted(30, 149) Source(37, 5) + SourceIndex(0)
+10>Emitted(30, 159) Source(37, 34) + SourceIndex(0)
+11>Emitted(30, 161) Source(37, 5) + SourceIndex(0)
+12>Emitted(30, 211) Source(37, 34) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -879,8 +840,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -898,7 +858,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(33, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(33, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(33, 5) Source(41, 5) + SourceIndex(0)
@@ -912,61 +871,51 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(33, 55) Source(44, 46) + SourceIndex(0)
 12>Emitted(33, 57) Source(44, 30) + SourceIndex(0)
 13>Emitted(33, 61) Source(44, 46) + SourceIndex(0)
-14>Emitted(33, 62) Source(44, 47) + SourceIndex(0)
 ---
 >>>    _u = _t[_s], _v = _u[1], _w = _v === void 0 ? ["skill1", "skill2"] : _v, _x = _w[0], primarySkillA = _x === void 0 ? "primary" : _x, _y = _w[1], secondarySkillA = _y === void 0 ? "secondary" : _y;
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^
-5 >                           ^^
-6 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^
-9 >                                                                                       ^^
-10>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                       ^^
-12>                                                                                                                                         ^^^^^^^^^^
-13>                                                                                                                                                   ^^
-14>                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^
+7 >                                                                                       ^^
+8 >                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                       ^^
+10>                                                                                                                                         ^^^^^^^^^^
+11>                                                                                                                                                   ^^
+12>                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >               
-4 >                 [
+2 >                 [
   >                     primarySkillA = "primary",
   >                     secondarySkillA = "secondary"
   >                 ] = ["skill1", "skill2"]
-5 >                           
-6 >                             [
+3 >                           
+4 >                             [
   >                                 primarySkillA = "primary",
   >                                 secondarySkillA = "secondary"
   >                             ] = ["skill1", "skill2"]
-7 >                                                                           
-8 >                                                                             primarySkillA = "primary"
-9 >                                                                                       
-10>                                                                                         primarySkillA = "primary"
-11>                                                                                                                                       ,
+5 >                                                                           
+6 >                                                                             primarySkillA = "primary"
+7 >                                                                                       
+8 >                                                                                         primarySkillA = "primary"
+9 >                                                                                                                                       ,
   >                                                                                                                                           
-12>                                                                                                                                         secondarySkillA = "secondary"
-13>                                                                                                                                                   
-14>                                                                                                                                                     secondarySkillA = "secondary"
-1->Emitted(34, 5) Source(41, 6) + SourceIndex(0)
-2 >Emitted(34, 16) Source(44, 26) + SourceIndex(0)
-3 >Emitted(34, 18) Source(41, 9) + SourceIndex(0)
-4 >Emitted(34, 28) Source(44, 25) + SourceIndex(0)
-5 >Emitted(34, 30) Source(41, 9) + SourceIndex(0)
-6 >Emitted(34, 76) Source(44, 25) + SourceIndex(0)
-7 >Emitted(34, 78) Source(42, 5) + SourceIndex(0)
-8 >Emitted(34, 88) Source(42, 30) + SourceIndex(0)
-9 >Emitted(34, 90) Source(42, 5) + SourceIndex(0)
-10>Emitted(34, 136) Source(42, 30) + SourceIndex(0)
-11>Emitted(34, 138) Source(43, 5) + SourceIndex(0)
-12>Emitted(34, 148) Source(43, 34) + SourceIndex(0)
-13>Emitted(34, 150) Source(43, 5) + SourceIndex(0)
-14>Emitted(34, 200) Source(43, 34) + SourceIndex(0)
+10>                                                                                                                                         secondarySkillA = "secondary"
+11>                                                                                                                                                   
+12>                                                                                                                                                     secondarySkillA = "secondary"
+1->Emitted(34, 18) Source(41, 9) + SourceIndex(0)
+2 >Emitted(34, 28) Source(44, 25) + SourceIndex(0)
+3 >Emitted(34, 30) Source(41, 9) + SourceIndex(0)
+4 >Emitted(34, 76) Source(44, 25) + SourceIndex(0)
+5 >Emitted(34, 78) Source(42, 5) + SourceIndex(0)
+6 >Emitted(34, 88) Source(42, 30) + SourceIndex(0)
+7 >Emitted(34, 90) Source(42, 5) + SourceIndex(0)
+8 >Emitted(34, 136) Source(42, 30) + SourceIndex(0)
+9 >Emitted(34, 138) Source(43, 5) + SourceIndex(0)
+10>Emitted(34, 148) Source(43, 34) + SourceIndex(0)
+11>Emitted(34, 150) Source(43, 5) + SourceIndex(0)
+12>Emitted(34, 200) Source(43, 34) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -1019,8 +968,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                  ^^^^^^^^^^^^^^
 14>                                                                ^^
 15>                                                                  ^^^^
-16>                                                                      ^
-17>                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1040,7 +988,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                  [multiRobotA, multiRobotB]
 14>                                                                
 15>                                                                  [multiRobotA, multiRobotB]
-16>                                                                      )
 1->Emitted(37, 1) Source(47, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(47, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(47, 5) + SourceIndex(0)
@@ -1056,61 +1003,51 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(37, 65) Source(50, 56) + SourceIndex(0)
 14>Emitted(37, 67) Source(50, 30) + SourceIndex(0)
 15>Emitted(37, 71) Source(50, 56) + SourceIndex(0)
-16>Emitted(37, 72) Source(50, 57) + SourceIndex(0)
 ---
 >>>    _1 = _0[_z], _2 = _1[1], _3 = _2 === void 0 ? ["skill1", "skill2"] : _2, _4 = _3[0], primarySkillA = _4 === void 0 ? "primary" : _4, _5 = _3[1], secondarySkillA = _5 === void 0 ? "secondary" : _5;
-1->^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^
-5 >                           ^^
-6 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^
-9 >                                                                                       ^^
-10>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                       ^^
-12>                                                                                                                                         ^^^^^^^^^^
-13>                                                                                                                                                   ^^
-14>                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^
+3 >                           ^^
+4 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^
+7 >                                                                                       ^^
+8 >                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                       ^^
+10>                                                                                                                                         ^^^^^^^^^^
+11>                                                                                                                                                   ^^
+12>                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [, [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >               
-4 >                 [
+2 >                 [
   >                     primarySkillA = "primary",
   >                     secondarySkillA = "secondary"
   >                 ] = ["skill1", "skill2"]
-5 >                           
-6 >                             [
+3 >                           
+4 >                             [
   >                                 primarySkillA = "primary",
   >                                 secondarySkillA = "secondary"
   >                             ] = ["skill1", "skill2"]
-7 >                                                                           
-8 >                                                                             primarySkillA = "primary"
-9 >                                                                                       
-10>                                                                                         primarySkillA = "primary"
-11>                                                                                                                                       ,
+5 >                                                                           
+6 >                                                                             primarySkillA = "primary"
+7 >                                                                                       
+8 >                                                                                         primarySkillA = "primary"
+9 >                                                                                                                                       ,
   >                                                                                                                                           
-12>                                                                                                                                         secondarySkillA = "secondary"
-13>                                                                                                                                                   
-14>                                                                                                                                                     secondarySkillA = "secondary"
-1->Emitted(38, 5) Source(47, 6) + SourceIndex(0)
-2 >Emitted(38, 16) Source(50, 26) + SourceIndex(0)
-3 >Emitted(38, 18) Source(47, 9) + SourceIndex(0)
-4 >Emitted(38, 28) Source(50, 25) + SourceIndex(0)
-5 >Emitted(38, 30) Source(47, 9) + SourceIndex(0)
-6 >Emitted(38, 76) Source(50, 25) + SourceIndex(0)
-7 >Emitted(38, 78) Source(48, 5) + SourceIndex(0)
-8 >Emitted(38, 88) Source(48, 30) + SourceIndex(0)
-9 >Emitted(38, 90) Source(48, 5) + SourceIndex(0)
-10>Emitted(38, 136) Source(48, 30) + SourceIndex(0)
-11>Emitted(38, 138) Source(49, 5) + SourceIndex(0)
-12>Emitted(38, 148) Source(49, 34) + SourceIndex(0)
-13>Emitted(38, 150) Source(49, 5) + SourceIndex(0)
-14>Emitted(38, 200) Source(49, 34) + SourceIndex(0)
+10>                                                                                                                                         secondarySkillA = "secondary"
+11>                                                                                                                                                   
+12>                                                                                                                                                     secondarySkillA = "secondary"
+1->Emitted(38, 18) Source(47, 9) + SourceIndex(0)
+2 >Emitted(38, 28) Source(50, 25) + SourceIndex(0)
+3 >Emitted(38, 30) Source(47, 9) + SourceIndex(0)
+4 >Emitted(38, 76) Source(50, 25) + SourceIndex(0)
+5 >Emitted(38, 78) Source(48, 5) + SourceIndex(0)
+6 >Emitted(38, 88) Source(48, 30) + SourceIndex(0)
+7 >Emitted(38, 90) Source(48, 5) + SourceIndex(0)
+8 >Emitted(38, 136) Source(48, 30) + SourceIndex(0)
+9 >Emitted(38, 138) Source(49, 5) + SourceIndex(0)
+10>Emitted(38, 148) Source(49, 34) + SourceIndex(0)
+11>Emitted(38, 150) Source(49, 5) + SourceIndex(0)
+12>Emitted(38, 200) Source(49, 34) + SourceIndex(0)
 ---
 >>>    console.log(primarySkillA);
 1 >^^^^
@@ -1159,7 +1096,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -1173,7 +1109,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(41, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(41, 4) Source(54, 4) + SourceIndex(0)
 3 >Emitted(41, 5) Source(54, 5) + SourceIndex(0)
@@ -1185,7 +1120,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(41, 57) Source(54, 30) + SourceIndex(0)
 10>Emitted(41, 59) Source(54, 24) + SourceIndex(0)
 11>Emitted(41, 63) Source(54, 30) + SourceIndex(0)
-12>Emitted(41, 64) Source(54, 31) + SourceIndex(0)
 ---
 >>>    _7 = robots_2[_6][0], numberB = _7 === void 0 ? -1 : _7;
 1 >^^^^
@@ -1249,8 +1183,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^->
+14>                                                       ^^^->
 1->
   >
 2 >for
@@ -1265,7 +1198,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(45, 1) Source(57, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(57, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(57, 5) + SourceIndex(0)
@@ -1279,7 +1211,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(45, 50) Source(57, 35) + SourceIndex(0)
 12>Emitted(45, 52) Source(57, 24) + SourceIndex(0)
 13>Emitted(45, 56) Source(57, 35) + SourceIndex(0)
-14>Emitted(45, 57) Source(57, 36) + SourceIndex(0)
 ---
 >>>    _10 = _9[_8][0], numberB = _10 === void 0 ? -1 : _10;
 1->^^^^
@@ -1345,7 +1276,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
 1->
   >
 2 >for
@@ -1362,7 +1292,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(49, 1) Source(60, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(60, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(60, 5) + SourceIndex(0)
@@ -1378,7 +1307,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(49, 59) Source(60, 40) + SourceIndex(0)
 14>Emitted(49, 61) Source(60, 24) + SourceIndex(0)
 15>Emitted(49, 66) Source(60, 40) + SourceIndex(0)
-16>Emitted(49, 67) Source(60, 41) + SourceIndex(0)
 ---
 >>>    _13 = _12[_11][0], numberB = _13 === void 0 ? -1 : _13;
 1 >^^^^
@@ -1440,7 +1368,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
 1->
   >
 2 >for
@@ -1453,7 +1380,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(53, 1) Source(63, 1) + SourceIndex(0)
 2 >Emitted(53, 4) Source(63, 4) + SourceIndex(0)
 3 >Emitted(53, 5) Source(63, 5) + SourceIndex(0)
@@ -1465,7 +1391,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(53, 74) Source(63, 39) + SourceIndex(0)
 10>Emitted(53, 76) Source(63, 28) + SourceIndex(0)
 11>Emitted(53, 81) Source(63, 39) + SourceIndex(0)
-12>Emitted(53, 82) Source(63, 40) + SourceIndex(0)
 ---
 >>>    _15 = multiRobots_2[_14][0], nameB = _15 === void 0 ? "noName" : _15;
 1 >^^^^
@@ -1529,7 +1454,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
 1->
   >
 2 >for
@@ -1544,7 +1468,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(57, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(57, 4) Source(66, 4) + SourceIndex(0)
 3 >Emitted(57, 5) Source(66, 5) + SourceIndex(0)
@@ -1558,7 +1481,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(57, 59) Source(66, 44) + SourceIndex(0)
 12>Emitted(57, 61) Source(66, 28) + SourceIndex(0)
 13>Emitted(57, 66) Source(66, 44) + SourceIndex(0)
-14>Emitted(57, 67) Source(66, 45) + SourceIndex(0)
 ---
 >>>    _18 = _17[_16][0], nameB = _18 === void 0 ? "noName" : _18;
 1 >^^^^
@@ -1624,7 +1546,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
 1->
   >
 2 >for
@@ -1641,7 +1562,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(61, 1) Source(69, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(69, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(69, 5) + SourceIndex(0)
@@ -1657,7 +1577,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(61, 69) Source(69, 54) + SourceIndex(0)
 14>Emitted(61, 71) Source(69, 28) + SourceIndex(0)
 15>Emitted(61, 76) Source(69, 54) + SourceIndex(0)
-16>Emitted(61, 77) Source(69, 55) + SourceIndex(0)
 ---
 >>>    _21 = _20[_19][0], nameB = _21 === void 0 ? "noName" : _21;
 1 >^^^^
@@ -1719,8 +1638,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1734,7 +1652,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(65, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(65, 4) Source(73, 4) + SourceIndex(0)
 3 >Emitted(65, 5) Source(73, 5) + SourceIndex(0)
@@ -1746,51 +1663,44 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(65, 59) Source(73, 69) + SourceIndex(0)
 10>Emitted(65, 61) Source(73, 63) + SourceIndex(0)
 11>Emitted(65, 66) Source(73, 69) + SourceIndex(0)
-12>Emitted(65, 67) Source(73, 70) + SourceIndex(0)
 ---
 >>>    _23 = robots_3[_22], _24 = _23[0], numberA2 = _24 === void 0 ? -1 : _24, _25 = _23[1], nameA2 = _25 === void 0 ? "noName" : _25, _26 = _23[2], skillA2 = _26 === void 0 ? "skill" : _26;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^^^
-9 >                                                                                         ^^
-10>                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                   ^^
-12>                                                                                                                                     ^^^^^^^^^^^^
-13>                                                                                                                                                 ^^
-14>                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                         ^^^^^^^^^^^^
+3 >                                     ^^
+4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^^^
+7 >                                                                                         ^^
+8 >                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                   ^^
+10>                                                                                                                                     ^^^^^^^^^^^^
+11>                                                                                                                                                 ^^
+12>                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
-3 >                       
-4 >                         numberA2 = -1
-5 >                                     
-6 >                                       numberA2 = -1
-7 >                                                                           , 
-8 >                                                                             nameA2 = "noName"
-9 >                                                                                         
-10>                                                                                           nameA2 = "noName"
-11>                                                                                                                                   , 
-12>                                                                                                                                     skillA2 = "skill"
-13>                                                                                                                                                 
-14>                                                                                                                                                   skillA2 = "skill"
-1->Emitted(66, 5) Source(73, 6) + SourceIndex(0)
-2 >Emitted(66, 24) Source(73, 59) + SourceIndex(0)
-3 >Emitted(66, 26) Source(73, 7) + SourceIndex(0)
-4 >Emitted(66, 38) Source(73, 20) + SourceIndex(0)
-5 >Emitted(66, 40) Source(73, 7) + SourceIndex(0)
-6 >Emitted(66, 76) Source(73, 20) + SourceIndex(0)
-7 >Emitted(66, 78) Source(73, 22) + SourceIndex(0)
-8 >Emitted(66, 90) Source(73, 39) + SourceIndex(0)
-9 >Emitted(66, 92) Source(73, 22) + SourceIndex(0)
-10>Emitted(66, 132) Source(73, 39) + SourceIndex(0)
-11>Emitted(66, 134) Source(73, 41) + SourceIndex(0)
-12>Emitted(66, 146) Source(73, 58) + SourceIndex(0)
-13>Emitted(66, 148) Source(73, 41) + SourceIndex(0)
-14>Emitted(66, 188) Source(73, 58) + SourceIndex(0)
+2 >                         numberA2 = -1
+3 >                                     
+4 >                                       numberA2 = -1
+5 >                                                                           , 
+6 >                                                                             nameA2 = "noName"
+7 >                                                                                         
+8 >                                                                                           nameA2 = "noName"
+9 >                                                                                                                                   , 
+10>                                                                                                                                     skillA2 = "skill"
+11>                                                                                                                                                 
+12>                                                                                                                                                   skillA2 = "skill"
+1->Emitted(66, 26) Source(73, 7) + SourceIndex(0)
+2 >Emitted(66, 38) Source(73, 20) + SourceIndex(0)
+3 >Emitted(66, 40) Source(73, 7) + SourceIndex(0)
+4 >Emitted(66, 76) Source(73, 20) + SourceIndex(0)
+5 >Emitted(66, 78) Source(73, 22) + SourceIndex(0)
+6 >Emitted(66, 90) Source(73, 39) + SourceIndex(0)
+7 >Emitted(66, 92) Source(73, 22) + SourceIndex(0)
+8 >Emitted(66, 132) Source(73, 39) + SourceIndex(0)
+9 >Emitted(66, 134) Source(73, 41) + SourceIndex(0)
+10>Emitted(66, 146) Source(73, 58) + SourceIndex(0)
+11>Emitted(66, 148) Source(73, 41) + SourceIndex(0)
+12>Emitted(66, 188) Source(73, 58) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1840,8 +1750,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1856,7 +1765,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(69, 1) Source(76, 1) + SourceIndex(0)
 2 >Emitted(69, 4) Source(76, 4) + SourceIndex(0)
 3 >Emitted(69, 5) Source(76, 5) + SourceIndex(0)
@@ -1870,51 +1778,44 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(69, 54) Source(76, 74) + SourceIndex(0)
 12>Emitted(69, 56) Source(76, 63) + SourceIndex(0)
 13>Emitted(69, 61) Source(76, 74) + SourceIndex(0)
-14>Emitted(69, 62) Source(76, 75) + SourceIndex(0)
 ---
 >>>    _29 = _28[_27], _30 = _29[0], numberA2 = _30 === void 0 ? -1 : _30, _31 = _29[1], nameA2 = _31 === void 0 ? "noName" : _31, _32 = _29[2], skillA2 = _32 === void 0 ? "skill" : _32;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                      ^^
-8 >                                                                        ^^^^^^^^^^^^
-9 >                                                                                    ^^
-10>                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                              ^^
-12>                                                                                                                                ^^^^^^^^^^^^
-13>                                                                                                                                            ^^
-14>                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                      ^^
+6 >                                                                        ^^^^^^^^^^^^
+7 >                                                                                    ^^
+8 >                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                              ^^
+10>                                                                                                                                ^^^^^^^^^^^^
+11>                                                                                                                                            ^^
+12>                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
-3 >                  
-4 >                    numberA2 = -1
-5 >                                
-6 >                                  numberA2 = -1
-7 >                                                                      , 
-8 >                                                                        nameA2 = "noName"
-9 >                                                                                    
-10>                                                                                      nameA2 = "noName"
-11>                                                                                                                              , 
-12>                                                                                                                                skillA2 = "skill"
-13>                                                                                                                                            
-14>                                                                                                                                              skillA2 = "skill"
-1->Emitted(70, 5) Source(76, 6) + SourceIndex(0)
-2 >Emitted(70, 19) Source(76, 59) + SourceIndex(0)
-3 >Emitted(70, 21) Source(76, 7) + SourceIndex(0)
-4 >Emitted(70, 33) Source(76, 20) + SourceIndex(0)
-5 >Emitted(70, 35) Source(76, 7) + SourceIndex(0)
-6 >Emitted(70, 71) Source(76, 20) + SourceIndex(0)
-7 >Emitted(70, 73) Source(76, 22) + SourceIndex(0)
-8 >Emitted(70, 85) Source(76, 39) + SourceIndex(0)
-9 >Emitted(70, 87) Source(76, 22) + SourceIndex(0)
-10>Emitted(70, 127) Source(76, 39) + SourceIndex(0)
-11>Emitted(70, 129) Source(76, 41) + SourceIndex(0)
-12>Emitted(70, 141) Source(76, 58) + SourceIndex(0)
-13>Emitted(70, 143) Source(76, 41) + SourceIndex(0)
-14>Emitted(70, 183) Source(76, 58) + SourceIndex(0)
+2 >                    numberA2 = -1
+3 >                                
+4 >                                  numberA2 = -1
+5 >                                                                      , 
+6 >                                                                        nameA2 = "noName"
+7 >                                                                                    
+8 >                                                                                      nameA2 = "noName"
+9 >                                                                                                                              , 
+10>                                                                                                                                skillA2 = "skill"
+11>                                                                                                                                            
+12>                                                                                                                                              skillA2 = "skill"
+1->Emitted(70, 21) Source(76, 7) + SourceIndex(0)
+2 >Emitted(70, 33) Source(76, 20) + SourceIndex(0)
+3 >Emitted(70, 35) Source(76, 7) + SourceIndex(0)
+4 >Emitted(70, 71) Source(76, 20) + SourceIndex(0)
+5 >Emitted(70, 73) Source(76, 22) + SourceIndex(0)
+6 >Emitted(70, 85) Source(76, 39) + SourceIndex(0)
+7 >Emitted(70, 87) Source(76, 22) + SourceIndex(0)
+8 >Emitted(70, 127) Source(76, 39) + SourceIndex(0)
+9 >Emitted(70, 129) Source(76, 41) + SourceIndex(0)
+10>Emitted(70, 141) Source(76, 58) + SourceIndex(0)
+11>Emitted(70, 143) Source(76, 41) + SourceIndex(0)
+12>Emitted(70, 183) Source(76, 58) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -1966,8 +1867,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
-17>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1984,7 +1884,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(73, 1) Source(79, 1) + SourceIndex(0)
 2 >Emitted(73, 4) Source(79, 4) + SourceIndex(0)
 3 >Emitted(73, 5) Source(79, 5) + SourceIndex(0)
@@ -2000,51 +1899,44 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(73, 59) Source(79, 79) + SourceIndex(0)
 14>Emitted(73, 61) Source(79, 63) + SourceIndex(0)
 15>Emitted(73, 66) Source(79, 79) + SourceIndex(0)
-16>Emitted(73, 67) Source(79, 80) + SourceIndex(0)
 ---
 >>>    _35 = _34[_33], _36 = _35[0], numberA2 = _36 === void 0 ? -1 : _36, _37 = _35[1], nameA2 = _37 === void 0 ? "noName" : _37, _38 = _35[2], skillA2 = _38 === void 0 ? "skill" : _38;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                      ^^
-8 >                                                                        ^^^^^^^^^^^^
-9 >                                                                                    ^^
-10>                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                              ^^
-12>                                                                                                                                ^^^^^^^^^^^^
-13>                                                                                                                                            ^^
-14>                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                      ^^
+6 >                                                                        ^^^^^^^^^^^^
+7 >                                                                                    ^^
+8 >                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                              ^^
+10>                                                                                                                                ^^^^^^^^^^^^
+11>                                                                                                                                            ^^
+12>                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA2 = -1, nameA2 = "noName", skillA2 = "skill"]
-3 >                  
-4 >                    numberA2 = -1
-5 >                                
-6 >                                  numberA2 = -1
-7 >                                                                      , 
-8 >                                                                        nameA2 = "noName"
-9 >                                                                                    
-10>                                                                                      nameA2 = "noName"
-11>                                                                                                                              , 
-12>                                                                                                                                skillA2 = "skill"
-13>                                                                                                                                            
-14>                                                                                                                                              skillA2 = "skill"
-1->Emitted(74, 5) Source(79, 6) + SourceIndex(0)
-2 >Emitted(74, 19) Source(79, 59) + SourceIndex(0)
-3 >Emitted(74, 21) Source(79, 7) + SourceIndex(0)
-4 >Emitted(74, 33) Source(79, 20) + SourceIndex(0)
-5 >Emitted(74, 35) Source(79, 7) + SourceIndex(0)
-6 >Emitted(74, 71) Source(79, 20) + SourceIndex(0)
-7 >Emitted(74, 73) Source(79, 22) + SourceIndex(0)
-8 >Emitted(74, 85) Source(79, 39) + SourceIndex(0)
-9 >Emitted(74, 87) Source(79, 22) + SourceIndex(0)
-10>Emitted(74, 127) Source(79, 39) + SourceIndex(0)
-11>Emitted(74, 129) Source(79, 41) + SourceIndex(0)
-12>Emitted(74, 141) Source(79, 58) + SourceIndex(0)
-13>Emitted(74, 143) Source(79, 41) + SourceIndex(0)
-14>Emitted(74, 183) Source(79, 58) + SourceIndex(0)
+2 >                    numberA2 = -1
+3 >                                
+4 >                                  numberA2 = -1
+5 >                                                                      , 
+6 >                                                                        nameA2 = "noName"
+7 >                                                                                    
+8 >                                                                                      nameA2 = "noName"
+9 >                                                                                                                              , 
+10>                                                                                                                                skillA2 = "skill"
+11>                                                                                                                                            
+12>                                                                                                                                              skillA2 = "skill"
+1->Emitted(74, 21) Source(79, 7) + SourceIndex(0)
+2 >Emitted(74, 33) Source(79, 20) + SourceIndex(0)
+3 >Emitted(74, 35) Source(79, 7) + SourceIndex(0)
+4 >Emitted(74, 71) Source(79, 20) + SourceIndex(0)
+5 >Emitted(74, 73) Source(79, 22) + SourceIndex(0)
+6 >Emitted(74, 85) Source(79, 39) + SourceIndex(0)
+7 >Emitted(74, 87) Source(79, 22) + SourceIndex(0)
+8 >Emitted(74, 127) Source(79, 39) + SourceIndex(0)
+9 >Emitted(74, 129) Source(79, 41) + SourceIndex(0)
+10>Emitted(74, 141) Source(79, 58) + SourceIndex(0)
+11>Emitted(74, 143) Source(79, 41) + SourceIndex(0)
+12>Emitted(74, 183) Source(79, 58) + SourceIndex(0)
 ---
 >>>    console.log(nameA2);
 1 >^^^^
@@ -2092,8 +1984,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2109,7 +2000,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(77, 1) Source(82, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(82, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(82, 5) + SourceIndex(0)
@@ -2121,73 +2011,63 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(77, 74) Source(85, 41) + SourceIndex(0)
 10>Emitted(77, 76) Source(85, 30) + SourceIndex(0)
 11>Emitted(77, 81) Source(85, 41) + SourceIndex(0)
-12>Emitted(77, 82) Source(85, 42) + SourceIndex(0)
 ---
 >>>    _40 = multiRobots_3[_39], _41 = _40[0], nameMA = _41 === void 0 ? "noName" : _41, _42 = _40[1], _43 = _42 === void 0 ? ["skill1", "skill2"] : _42, _44 = _43[0], primarySkillA = _44 === void 0 ? "primary" : _44, _45 = _43[1], secondarySkillA = _45 === void 0 ? "secondary" : _45;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                            ^^
-4 >                              ^^^^^^^^^^^^
-5 >                                          ^^
-6 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^
-9 >                                                                                                  ^^
-10>                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                     ^^
-12>                                                                                                                                                       ^^^^^^^^^^^^
-13>                                                                                                                                                                   ^^
-14>                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                     ^^
-16>                                                                                                                                                                                                                       ^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                   ^^
-18>                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                              ^^^^^^^^^^^^
+3 >                                          ^^
+4 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                                    ^^
+6 >                                                                                      ^^^^^^^^^^^^
+7 >                                                                                                  ^^
+8 >                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                     ^^
+10>                                                                                                                                                       ^^^^^^^^^^^^
+11>                                                                                                                                                                   ^^
+12>                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                     ^^
+14>                                                                                                                                                                                                                       ^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                   ^^
+16>                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [nameMA = "noName", [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                            
-4 >                              nameMA = "noName"
-5 >                                          
-6 >                                            nameMA = "noName"
-7 >                                                                                    , 
-8 >                                                                                      [
+2 >                              nameMA = "noName"
+3 >                                          
+4 >                                            nameMA = "noName"
+5 >                                                                                    , 
+6 >                                                                                      [
   >                                                                                          primarySkillA = "primary",
   >                                                                                          secondarySkillA = "secondary"
   >                                                                                      ] = ["skill1", "skill2"]
-9 >                                                                                                  
-10>                                                                                                    [
+7 >                                                                                                  
+8 >                                                                                                    [
   >                                                                                                        primarySkillA = "primary",
   >                                                                                                        secondarySkillA = "secondary"
   >                                                                                                    ] = ["skill1", "skill2"]
-11>                                                                                                                                                     
-12>                                                                                                                                                       primarySkillA = "primary"
-13>                                                                                                                                                                   
-14>                                                                                                                                                                     primarySkillA = "primary"
-15>                                                                                                                                                                                                                     ,
+9 >                                                                                                                                                     
+10>                                                                                                                                                       primarySkillA = "primary"
+11>                                                                                                                                                                   
+12>                                                                                                                                                                     primarySkillA = "primary"
+13>                                                                                                                                                                                                                     ,
   >                                                                                                                                                                                                                         
-16>                                                                                                                                                                                                                       secondarySkillA = "secondary"
-17>                                                                                                                                                                                                                                   
-18>                                                                                                                                                                                                                                     secondarySkillA = "secondary"
-1->Emitted(78, 5) Source(82, 6) + SourceIndex(0)
-2 >Emitted(78, 29) Source(85, 26) + SourceIndex(0)
-3 >Emitted(78, 31) Source(82, 7) + SourceIndex(0)
-4 >Emitted(78, 43) Source(82, 24) + SourceIndex(0)
-5 >Emitted(78, 45) Source(82, 7) + SourceIndex(0)
-6 >Emitted(78, 85) Source(82, 24) + SourceIndex(0)
-7 >Emitted(78, 87) Source(82, 26) + SourceIndex(0)
-8 >Emitted(78, 99) Source(85, 25) + SourceIndex(0)
-9 >Emitted(78, 101) Source(82, 26) + SourceIndex(0)
-10>Emitted(78, 150) Source(85, 25) + SourceIndex(0)
-11>Emitted(78, 152) Source(83, 5) + SourceIndex(0)
-12>Emitted(78, 164) Source(83, 30) + SourceIndex(0)
-13>Emitted(78, 166) Source(83, 5) + SourceIndex(0)
-14>Emitted(78, 214) Source(83, 30) + SourceIndex(0)
-15>Emitted(78, 216) Source(84, 5) + SourceIndex(0)
-16>Emitted(78, 228) Source(84, 34) + SourceIndex(0)
-17>Emitted(78, 230) Source(84, 5) + SourceIndex(0)
-18>Emitted(78, 282) Source(84, 34) + SourceIndex(0)
+14>                                                                                                                                                                                                                       secondarySkillA = "secondary"
+15>                                                                                                                                                                                                                                   
+16>                                                                                                                                                                                                                                     secondarySkillA = "secondary"
+1->Emitted(78, 31) Source(82, 7) + SourceIndex(0)
+2 >Emitted(78, 43) Source(82, 24) + SourceIndex(0)
+3 >Emitted(78, 45) Source(82, 7) + SourceIndex(0)
+4 >Emitted(78, 85) Source(82, 24) + SourceIndex(0)
+5 >Emitted(78, 87) Source(82, 26) + SourceIndex(0)
+6 >Emitted(78, 99) Source(85, 25) + SourceIndex(0)
+7 >Emitted(78, 101) Source(82, 26) + SourceIndex(0)
+8 >Emitted(78, 150) Source(85, 25) + SourceIndex(0)
+9 >Emitted(78, 152) Source(83, 5) + SourceIndex(0)
+10>Emitted(78, 164) Source(83, 30) + SourceIndex(0)
+11>Emitted(78, 166) Source(83, 5) + SourceIndex(0)
+12>Emitted(78, 214) Source(83, 30) + SourceIndex(0)
+13>Emitted(78, 216) Source(84, 5) + SourceIndex(0)
+14>Emitted(78, 228) Source(84, 34) + SourceIndex(0)
+15>Emitted(78, 230) Source(84, 5) + SourceIndex(0)
+16>Emitted(78, 282) Source(84, 34) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2238,8 +2118,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2257,7 +2136,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(81, 1) Source(88, 1) + SourceIndex(0)
 2 >Emitted(81, 4) Source(88, 4) + SourceIndex(0)
 3 >Emitted(81, 5) Source(88, 5) + SourceIndex(0)
@@ -2271,73 +2149,63 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(81, 59) Source(91, 46) + SourceIndex(0)
 12>Emitted(81, 61) Source(91, 30) + SourceIndex(0)
 13>Emitted(81, 66) Source(91, 46) + SourceIndex(0)
-14>Emitted(81, 67) Source(91, 47) + SourceIndex(0)
 ---
 >>>    _48 = _47[_46], _49 = _48[0], nameMA = _49 === void 0 ? "noName" : _49, _50 = _48[1], _51 = _50 === void 0 ? ["skill1", "skill2"] : _50, _52 = _51[0], primarySkillA = _52 === void 0 ? "primary" : _52, _53 = _51[1], secondarySkillA = _53 === void 0 ? "secondary" : _53;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^
-9 >                                                                                        ^^
-10>                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                           ^^
-12>                                                                                                                                             ^^^^^^^^^^^^
-13>                                                                                                                                                         ^^
-14>                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                           ^^
-16>                                                                                                                                                                                                             ^^^^^^^^^^^^
-17>                                                                                                                                                                                                                         ^^
-18>                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                          ^^
+6 >                                                                            ^^^^^^^^^^^^
+7 >                                                                                        ^^
+8 >                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                           ^^
+10>                                                                                                                                             ^^^^^^^^^^^^
+11>                                                                                                                                                         ^^
+12>                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                           ^^
+14>                                                                                                                                                                                                             ^^^^^^^^^^^^
+15>                                                                                                                                                                                                                         ^^
+16>                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [nameMA = "noName", [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                  
-4 >                    nameMA = "noName"
-5 >                                
-6 >                                  nameMA = "noName"
-7 >                                                                          , 
-8 >                                                                            [
+2 >                    nameMA = "noName"
+3 >                                
+4 >                                  nameMA = "noName"
+5 >                                                                          , 
+6 >                                                                            [
   >                                                                                primarySkillA = "primary",
   >                                                                                secondarySkillA = "secondary"
   >                                                                            ] = ["skill1", "skill2"]
-9 >                                                                                        
-10>                                                                                          [
+7 >                                                                                        
+8 >                                                                                          [
   >                                                                                              primarySkillA = "primary",
   >                                                                                              secondarySkillA = "secondary"
   >                                                                                          ] = ["skill1", "skill2"]
-11>                                                                                                                                           
-12>                                                                                                                                             primarySkillA = "primary"
-13>                                                                                                                                                         
-14>                                                                                                                                                           primarySkillA = "primary"
-15>                                                                                                                                                                                                           ,
+9 >                                                                                                                                           
+10>                                                                                                                                             primarySkillA = "primary"
+11>                                                                                                                                                         
+12>                                                                                                                                                           primarySkillA = "primary"
+13>                                                                                                                                                                                                           ,
   >                                                                                                                                                                                                               
-16>                                                                                                                                                                                                             secondarySkillA = "secondary"
-17>                                                                                                                                                                                                                         
-18>                                                                                                                                                                                                                           secondarySkillA = "secondary"
-1->Emitted(82, 5) Source(88, 6) + SourceIndex(0)
-2 >Emitted(82, 19) Source(91, 26) + SourceIndex(0)
-3 >Emitted(82, 21) Source(88, 7) + SourceIndex(0)
-4 >Emitted(82, 33) Source(88, 24) + SourceIndex(0)
-5 >Emitted(82, 35) Source(88, 7) + SourceIndex(0)
-6 >Emitted(82, 75) Source(88, 24) + SourceIndex(0)
-7 >Emitted(82, 77) Source(88, 26) + SourceIndex(0)
-8 >Emitted(82, 89) Source(91, 25) + SourceIndex(0)
-9 >Emitted(82, 91) Source(88, 26) + SourceIndex(0)
-10>Emitted(82, 140) Source(91, 25) + SourceIndex(0)
-11>Emitted(82, 142) Source(89, 5) + SourceIndex(0)
-12>Emitted(82, 154) Source(89, 30) + SourceIndex(0)
-13>Emitted(82, 156) Source(89, 5) + SourceIndex(0)
-14>Emitted(82, 204) Source(89, 30) + SourceIndex(0)
-15>Emitted(82, 206) Source(90, 5) + SourceIndex(0)
-16>Emitted(82, 218) Source(90, 34) + SourceIndex(0)
-17>Emitted(82, 220) Source(90, 5) + SourceIndex(0)
-18>Emitted(82, 272) Source(90, 34) + SourceIndex(0)
+14>                                                                                                                                                                                                             secondarySkillA = "secondary"
+15>                                                                                                                                                                                                                         
+16>                                                                                                                                                                                                                           secondarySkillA = "secondary"
+1->Emitted(82, 21) Source(88, 7) + SourceIndex(0)
+2 >Emitted(82, 33) Source(88, 24) + SourceIndex(0)
+3 >Emitted(82, 35) Source(88, 7) + SourceIndex(0)
+4 >Emitted(82, 75) Source(88, 24) + SourceIndex(0)
+5 >Emitted(82, 77) Source(88, 26) + SourceIndex(0)
+6 >Emitted(82, 89) Source(91, 25) + SourceIndex(0)
+7 >Emitted(82, 91) Source(88, 26) + SourceIndex(0)
+8 >Emitted(82, 140) Source(91, 25) + SourceIndex(0)
+9 >Emitted(82, 142) Source(89, 5) + SourceIndex(0)
+10>Emitted(82, 154) Source(89, 30) + SourceIndex(0)
+11>Emitted(82, 156) Source(89, 5) + SourceIndex(0)
+12>Emitted(82, 204) Source(89, 30) + SourceIndex(0)
+13>Emitted(82, 206) Source(90, 5) + SourceIndex(0)
+14>Emitted(82, 218) Source(90, 34) + SourceIndex(0)
+15>Emitted(82, 220) Source(90, 5) + SourceIndex(0)
+16>Emitted(82, 272) Source(90, 34) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2390,8 +2258,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    ^^^^^^^^^^^^^^^^
 14>                                                                    ^^
 15>                                                                      ^^^^^
-16>                                                                           ^
-17>                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2411,7 +2278,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                                    [multiRobotA, multiRobotB]
 14>                                                                    
 15>                                                                      [multiRobotA, multiRobotB]
-16>                                                                           )
 1->Emitted(85, 1) Source(94, 1) + SourceIndex(0)
 2 >Emitted(85, 4) Source(94, 4) + SourceIndex(0)
 3 >Emitted(85, 5) Source(94, 5) + SourceIndex(0)
@@ -2427,73 +2293,63 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(85, 69) Source(97, 56) + SourceIndex(0)
 14>Emitted(85, 71) Source(97, 30) + SourceIndex(0)
 15>Emitted(85, 76) Source(97, 56) + SourceIndex(0)
-16>Emitted(85, 77) Source(97, 57) + SourceIndex(0)
 ---
 >>>    _56 = _55[_54], _57 = _56[0], nameMA = _57 === void 0 ? "noName" : _57, _58 = _56[1], _59 = _58 === void 0 ? ["skill1", "skill2"] : _58, _60 = _59[0], primarySkillA = _60 === void 0 ? "primary" : _60, _61 = _59[1], secondarySkillA = _61 === void 0 ? "secondary" : _61;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^
-9 >                                                                                        ^^
-10>                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                           ^^
-12>                                                                                                                                             ^^^^^^^^^^^^
-13>                                                                                                                                                         ^^
-14>                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                           ^^
-16>                                                                                                                                                                                                             ^^^^^^^^^^^^
-17>                                                                                                                                                                                                                         ^^
-18>                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                          ^^
+6 >                                                                            ^^^^^^^^^^^^
+7 >                                                                                        ^^
+8 >                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                           ^^
+10>                                                                                                                                             ^^^^^^^^^^^^
+11>                                                                                                                                                         ^^
+12>                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                           ^^
+14>                                                                                                                                                                                                             ^^^^^^^^^^^^
+15>                                                                                                                                                                                                                         ^^
+16>                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [nameMA = "noName", [
-  >        primarySkillA = "primary",
-  >        secondarySkillA = "secondary"
-  >    ] = ["skill1", "skill2"]]
-3 >                  
-4 >                    nameMA = "noName"
-5 >                                
-6 >                                  nameMA = "noName"
-7 >                                                                          , 
-8 >                                                                            [
+2 >                    nameMA = "noName"
+3 >                                
+4 >                                  nameMA = "noName"
+5 >                                                                          , 
+6 >                                                                            [
   >                                                                                primarySkillA = "primary",
   >                                                                                secondarySkillA = "secondary"
   >                                                                            ] = ["skill1", "skill2"]
-9 >                                                                                        
-10>                                                                                          [
+7 >                                                                                        
+8 >                                                                                          [
   >                                                                                              primarySkillA = "primary",
   >                                                                                              secondarySkillA = "secondary"
   >                                                                                          ] = ["skill1", "skill2"]
-11>                                                                                                                                           
-12>                                                                                                                                             primarySkillA = "primary"
-13>                                                                                                                                                         
-14>                                                                                                                                                           primarySkillA = "primary"
-15>                                                                                                                                                                                                           ,
+9 >                                                                                                                                           
+10>                                                                                                                                             primarySkillA = "primary"
+11>                                                                                                                                                         
+12>                                                                                                                                                           primarySkillA = "primary"
+13>                                                                                                                                                                                                           ,
   >                                                                                                                                                                                                               
-16>                                                                                                                                                                                                             secondarySkillA = "secondary"
-17>                                                                                                                                                                                                                         
-18>                                                                                                                                                                                                                           secondarySkillA = "secondary"
-1->Emitted(86, 5) Source(94, 6) + SourceIndex(0)
-2 >Emitted(86, 19) Source(97, 26) + SourceIndex(0)
-3 >Emitted(86, 21) Source(94, 7) + SourceIndex(0)
-4 >Emitted(86, 33) Source(94, 24) + SourceIndex(0)
-5 >Emitted(86, 35) Source(94, 7) + SourceIndex(0)
-6 >Emitted(86, 75) Source(94, 24) + SourceIndex(0)
-7 >Emitted(86, 77) Source(94, 26) + SourceIndex(0)
-8 >Emitted(86, 89) Source(97, 25) + SourceIndex(0)
-9 >Emitted(86, 91) Source(94, 26) + SourceIndex(0)
-10>Emitted(86, 140) Source(97, 25) + SourceIndex(0)
-11>Emitted(86, 142) Source(95, 5) + SourceIndex(0)
-12>Emitted(86, 154) Source(95, 30) + SourceIndex(0)
-13>Emitted(86, 156) Source(95, 5) + SourceIndex(0)
-14>Emitted(86, 204) Source(95, 30) + SourceIndex(0)
-15>Emitted(86, 206) Source(96, 5) + SourceIndex(0)
-16>Emitted(86, 218) Source(96, 34) + SourceIndex(0)
-17>Emitted(86, 220) Source(96, 5) + SourceIndex(0)
-18>Emitted(86, 272) Source(96, 34) + SourceIndex(0)
+14>                                                                                                                                                                                                             secondarySkillA = "secondary"
+15>                                                                                                                                                                                                                         
+16>                                                                                                                                                                                                                           secondarySkillA = "secondary"
+1->Emitted(86, 21) Source(94, 7) + SourceIndex(0)
+2 >Emitted(86, 33) Source(94, 24) + SourceIndex(0)
+3 >Emitted(86, 35) Source(94, 7) + SourceIndex(0)
+4 >Emitted(86, 75) Source(94, 24) + SourceIndex(0)
+5 >Emitted(86, 77) Source(94, 26) + SourceIndex(0)
+6 >Emitted(86, 89) Source(97, 25) + SourceIndex(0)
+7 >Emitted(86, 91) Source(94, 26) + SourceIndex(0)
+8 >Emitted(86, 140) Source(97, 25) + SourceIndex(0)
+9 >Emitted(86, 142) Source(95, 5) + SourceIndex(0)
+10>Emitted(86, 154) Source(95, 30) + SourceIndex(0)
+11>Emitted(86, 156) Source(95, 5) + SourceIndex(0)
+12>Emitted(86, 204) Source(95, 30) + SourceIndex(0)
+13>Emitted(86, 206) Source(96, 5) + SourceIndex(0)
+14>Emitted(86, 218) Source(96, 34) + SourceIndex(0)
+15>Emitted(86, 220) Source(96, 5) + SourceIndex(0)
+16>Emitted(86, 272) Source(96, 34) + SourceIndex(0)
 ---
 >>>    console.log(nameMA);
 1 >^^^^
@@ -2542,8 +2398,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -2557,7 +2412,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(89, 1) Source(101, 1) + SourceIndex(0)
 2 >Emitted(89, 4) Source(101, 4) + SourceIndex(0)
 3 >Emitted(89, 5) Source(101, 5) + SourceIndex(0)
@@ -2569,33 +2423,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 9 >Emitted(89, 59) Source(101, 46) + SourceIndex(0)
 10>Emitted(89, 61) Source(101, 40) + SourceIndex(0)
 11>Emitted(89, 66) Source(101, 46) + SourceIndex(0)
-12>Emitted(89, 67) Source(101, 47) + SourceIndex(0)
 ---
 >>>    _63 = robots_4[_62], _64 = _63[0], numberA3 = _64 === void 0 ? -1 : _64, robotAInfo = _63.slice(1);
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                         ^^^^^^^^^^^^
+3 >                                     ^^
+4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA3 = -1, ...robotAInfo]
-3 >                       
-4 >                         numberA3 = -1
-5 >                                     
-6 >                                       numberA3 = -1
-7 >                                                                           , 
-8 >                                                                             ...robotAInfo
-1->Emitted(90, 5) Source(101, 6) + SourceIndex(0)
-2 >Emitted(90, 24) Source(101, 36) + SourceIndex(0)
-3 >Emitted(90, 26) Source(101, 7) + SourceIndex(0)
-4 >Emitted(90, 38) Source(101, 20) + SourceIndex(0)
-5 >Emitted(90, 40) Source(101, 7) + SourceIndex(0)
-6 >Emitted(90, 76) Source(101, 20) + SourceIndex(0)
-7 >Emitted(90, 78) Source(101, 22) + SourceIndex(0)
-8 >Emitted(90, 103) Source(101, 35) + SourceIndex(0)
+2 >                         numberA3 = -1
+3 >                                     
+4 >                                       numberA3 = -1
+5 >                                                                           , 
+6 >                                                                             ...robotAInfo
+1->Emitted(90, 26) Source(101, 7) + SourceIndex(0)
+2 >Emitted(90, 38) Source(101, 20) + SourceIndex(0)
+3 >Emitted(90, 40) Source(101, 7) + SourceIndex(0)
+4 >Emitted(90, 76) Source(101, 20) + SourceIndex(0)
+5 >Emitted(90, 78) Source(101, 22) + SourceIndex(0)
+6 >Emitted(90, 103) Source(101, 35) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2645,8 +2492,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2661,7 +2507,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(93, 1) Source(104, 1) + SourceIndex(0)
 2 >Emitted(93, 4) Source(104, 4) + SourceIndex(0)
 3 >Emitted(93, 5) Source(104, 5) + SourceIndex(0)
@@ -2675,33 +2520,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 11>Emitted(93, 54) Source(104, 51) + SourceIndex(0)
 12>Emitted(93, 56) Source(104, 40) + SourceIndex(0)
 13>Emitted(93, 61) Source(104, 51) + SourceIndex(0)
-14>Emitted(93, 62) Source(104, 52) + SourceIndex(0)
 ---
 >>>    _67 = _66[_65], _68 = _67[0], numberA3 = _68 === void 0 ? -1 : _68, robotAInfo = _67.slice(1);
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                      ^^
-8 >                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                      ^^
+6 >                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA3 = -1, ...robotAInfo]
-3 >                  
-4 >                    numberA3 = -1
-5 >                                
-6 >                                  numberA3 = -1
-7 >                                                                      , 
-8 >                                                                        ...robotAInfo
-1->Emitted(94, 5) Source(104, 6) + SourceIndex(0)
-2 >Emitted(94, 19) Source(104, 36) + SourceIndex(0)
-3 >Emitted(94, 21) Source(104, 7) + SourceIndex(0)
-4 >Emitted(94, 33) Source(104, 20) + SourceIndex(0)
-5 >Emitted(94, 35) Source(104, 7) + SourceIndex(0)
-6 >Emitted(94, 71) Source(104, 20) + SourceIndex(0)
-7 >Emitted(94, 73) Source(104, 22) + SourceIndex(0)
-8 >Emitted(94, 98) Source(104, 35) + SourceIndex(0)
+2 >                    numberA3 = -1
+3 >                                
+4 >                                  numberA3 = -1
+5 >                                                                      , 
+6 >                                                                        ...robotAInfo
+1->Emitted(94, 21) Source(104, 7) + SourceIndex(0)
+2 >Emitted(94, 33) Source(104, 20) + SourceIndex(0)
+3 >Emitted(94, 35) Source(104, 7) + SourceIndex(0)
+4 >Emitted(94, 71) Source(104, 20) + SourceIndex(0)
+5 >Emitted(94, 73) Source(104, 22) + SourceIndex(0)
+6 >Emitted(94, 98) Source(104, 35) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
@@ -2753,8 +2591,7 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          ^^^^^^^^^^^^^^^^
 14>                                                          ^^
 15>                                                            ^^^^^
-16>                                                                 ^
-17>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2771,7 +2608,6 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>                                          [robotA, robotB]
 14>                                                          
 15>                                                            [robotA, robotB]
-16>                                                                 )
 1->Emitted(97, 1) Source(107, 1) + SourceIndex(0)
 2 >Emitted(97, 4) Source(107, 4) + SourceIndex(0)
 3 >Emitted(97, 5) Source(107, 5) + SourceIndex(0)
@@ -2787,33 +2623,26 @@ sourceFile:sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues
 13>Emitted(97, 59) Source(107, 56) + SourceIndex(0)
 14>Emitted(97, 61) Source(107, 40) + SourceIndex(0)
 15>Emitted(97, 66) Source(107, 56) + SourceIndex(0)
-16>Emitted(97, 67) Source(107, 57) + SourceIndex(0)
 ---
 >>>    _71 = _70[_69], _72 = _71[0], numberA3 = _72 === void 0 ? -1 : _72, robotAInfo = _71.slice(1);
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                      ^^
-8 >                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                      ^^
+6 >                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    [numberA3 = -1, ...robotAInfo]
-3 >                  
-4 >                    numberA3 = -1
-5 >                                
-6 >                                  numberA3 = -1
-7 >                                                                      , 
-8 >                                                                        ...robotAInfo
-1->Emitted(98, 5) Source(107, 6) + SourceIndex(0)
-2 >Emitted(98, 19) Source(107, 36) + SourceIndex(0)
-3 >Emitted(98, 21) Source(107, 7) + SourceIndex(0)
-4 >Emitted(98, 33) Source(107, 20) + SourceIndex(0)
-5 >Emitted(98, 35) Source(107, 7) + SourceIndex(0)
-6 >Emitted(98, 71) Source(107, 20) + SourceIndex(0)
-7 >Emitted(98, 73) Source(107, 22) + SourceIndex(0)
-8 >Emitted(98, 98) Source(107, 35) + SourceIndex(0)
+2 >                    numberA3 = -1
+3 >                                
+4 >                                  numberA3 = -1
+5 >                                                                      , 
+6 >                                                                        ...robotAInfo
+1->Emitted(98, 21) Source(107, 7) + SourceIndex(0)
+2 >Emitted(98, 33) Source(107, 20) + SourceIndex(0)
+3 >Emitted(98, 35) Source(107, 7) + SourceIndex(0)
+4 >Emitted(98, 71) Source(107, 20) + SourceIndex(0)
+5 >Emitted(98, 73) Source(107, 22) + SourceIndex(0)
+6 >Emitted(98, 98) Source(107, 35) + SourceIndex(0)
 ---
 >>>    console.log(numberA3);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.js.map
index 3f10e267eb9..3fe49ed9ef9 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfObjectBindingPattern.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPattern.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAuB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAxB,6BAAW;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA7B,uBAAW;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAA9F,uBAAW;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAiE,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAtE,iCAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAiE,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA3E,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAiE,UACS,EADT,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADT,cACS,EADT,IACS,CAAC;IADpE,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAEzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAED,GAAG,CAAC,CAAsC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAA5C,qBAAiC,EAA5B,eAAW,EAAE,iBAAa;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAsC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAjD,eAAiC,EAA5B,eAAW,EAAE,iBAAa;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAsC,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAAlH,eAAiC,EAA5B,eAAW,EAAE,iBAAa;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6E,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAxF,0BAAwE,EAAnE,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6E,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA7F,eAAwE,EAAnE,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6E,UACH,EADG,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACjJ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADG,cACH,EADG,IACH,CAAC;IAD1E,eAAwE,EAAnE,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAErE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPattern.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAuB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAvB,IAAA,yBAAW;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAA5B,IAAA,mBAAW;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuB,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAA7F,IAAA,mBAAW;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAiE,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAArE,IAAA,6BAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAiE,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAA1E,IAAA,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAiE,UACS,EADT,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADT,cACS,EADT,IACS;IADnE,IAAA,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAEzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAED,GAAG,CAAC,CAAsC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAvC,IAAA,iBAA6B,EAA5B,eAAW,EAAE,iBAAa;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAsC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAA5C,IAAA,WAA6B,EAA5B,eAAW,EAAE,iBAAa;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAsC,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAA7G,IAAA,WAA6B,EAA5B,eAAW,EAAE,iBAAa;IAChC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6E,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAAnF,IAAA,sBAAoE,EAAnE,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6E,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAAxF,IAAA,WAAoE,EAAnE,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6E,UACH,EADG,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACjJ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADG,cACH,EADG,IACH;IADrE,IAAA,WAAoE,EAAnE,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAErE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.sourcemap.txt
index 5403a0863a3..a22c02644c2 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.sourcemap.txt
@@ -320,7 +320,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -334,7 +333,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(10, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(10, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(10, 5) Source(29, 5) + SourceIndex(0)
@@ -346,15 +344,17 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >Emitted(10, 57) Source(29, 34) + SourceIndex(0)
 10>Emitted(10, 59) Source(29, 28) + SourceIndex(0)
 11>Emitted(10, 63) Source(29, 34) + SourceIndex(0)
-12>Emitted(10, 64) Source(29, 35) + SourceIndex(0)
 ---
 >>>    var nameA = robots_1[_i].name;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    name: nameA
+2 >    
+3 >        name: nameA
 1 >Emitted(11, 5) Source(29, 11) + SourceIndex(0)
-2 >Emitted(11, 34) Source(29, 22) + SourceIndex(0)
+2 >Emitted(11, 9) Source(29, 11) + SourceIndex(0)
+3 >Emitted(11, 34) Source(29, 22) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -404,7 +404,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -419,7 +418,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(14, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(14, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(14, 5) Source(32, 5) + SourceIndex(0)
@@ -433,15 +431,17 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>Emitted(14, 50) Source(32, 39) + SourceIndex(0)
 12>Emitted(14, 52) Source(32, 28) + SourceIndex(0)
 13>Emitted(14, 56) Source(32, 39) + SourceIndex(0)
-14>Emitted(14, 57) Source(32, 40) + SourceIndex(0)
 ---
 >>>    var nameA = _b[_a].name;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    name: nameA
+2 >    
+3 >        name: nameA
 1 >Emitted(15, 5) Source(32, 11) + SourceIndex(0)
-2 >Emitted(15, 28) Source(32, 22) + SourceIndex(0)
+2 >Emitted(15, 9) Source(32, 11) + SourceIndex(0)
+3 >Emitted(15, 28) Source(32, 22) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -509,7 +509,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -542,7 +541,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(18, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(18, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(18, 5) Source(35, 5) + SourceIndex(0)
@@ -574,15 +572,17 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 29>Emitted(18, 115) Source(35, 104) + SourceIndex(0)
 30>Emitted(18, 117) Source(35, 28) + SourceIndex(0)
 31>Emitted(18, 121) Source(35, 104) + SourceIndex(0)
-32>Emitted(18, 122) Source(35, 105) + SourceIndex(0)
 ---
 >>>    var nameA = _d[_c].name;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    name: nameA
+2 >    
+3 >        name: nameA
 1 >Emitted(19, 5) Source(35, 11) + SourceIndex(0)
-2 >Emitted(19, 28) Source(35, 22) + SourceIndex(0)
+2 >Emitted(19, 9) Source(35, 11) + SourceIndex(0)
+3 >Emitted(19, 28) Source(35, 22) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -630,8 +630,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -644,7 +643,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(22, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(22, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(22, 5) Source(38, 5) + SourceIndex(0)
@@ -656,27 +654,29 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >Emitted(22, 72) Source(38, 81) + SourceIndex(0)
 10>Emitted(22, 74) Source(38, 70) + SourceIndex(0)
 11>Emitted(22, 78) Source(38, 81) + SourceIndex(0)
-12>Emitted(22, 79) Source(38, 82) + SourceIndex(0)
 ---
 >>>    var _f = multiRobots_1[_e].skills, primaryA = _f.primary, secondaryA = _f.secondary;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                     ^^
-4 >                                       ^^^^^^^^^^^^^^^^^^^^^
-5 >                                                            ^^
-6 >                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                     ^^
+5 >                                       ^^^^^^^^^^^^^^^^^^^^^
+6 >                                                            ^^
+7 >                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    skills: { primary: primaryA, secondary: secondaryA }
-3 >                                     
-4 >                                       primary: primaryA
-5 >                                                            , 
-6 >                                                              secondary: secondaryA
+2 >    
+3 >        skills: { primary: primaryA, secondary: secondaryA }
+4 >                                     
+5 >                                       primary: primaryA
+6 >                                                            , 
+7 >                                                              secondary: secondaryA
 1->Emitted(23, 5) Source(38, 12) + SourceIndex(0)
-2 >Emitted(23, 38) Source(38, 64) + SourceIndex(0)
-3 >Emitted(23, 40) Source(38, 22) + SourceIndex(0)
-4 >Emitted(23, 61) Source(38, 39) + SourceIndex(0)
-5 >Emitted(23, 63) Source(38, 41) + SourceIndex(0)
-6 >Emitted(23, 88) Source(38, 62) + SourceIndex(0)
+2 >Emitted(23, 9) Source(38, 12) + SourceIndex(0)
+3 >Emitted(23, 38) Source(38, 64) + SourceIndex(0)
+4 >Emitted(23, 40) Source(38, 22) + SourceIndex(0)
+5 >Emitted(23, 61) Source(38, 39) + SourceIndex(0)
+6 >Emitted(23, 63) Source(38, 41) + SourceIndex(0)
+7 >Emitted(23, 88) Source(38, 62) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -726,8 +726,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -742,7 +741,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(26, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(26, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(26, 5) Source(41, 5) + SourceIndex(0)
@@ -756,27 +754,29 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>Emitted(26, 55) Source(41, 86) + SourceIndex(0)
 12>Emitted(26, 57) Source(41, 70) + SourceIndex(0)
 13>Emitted(26, 61) Source(41, 86) + SourceIndex(0)
-14>Emitted(26, 62) Source(41, 87) + SourceIndex(0)
 ---
 >>>    var _j = _h[_g].skills, primaryA = _j.primary, secondaryA = _j.secondary;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^
-4 >                            ^^^^^^^^^^^^^^^^^^^^^
-5 >                                                 ^^
-6 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^
+4 >                          ^^
+5 >                            ^^^^^^^^^^^^^^^^^^^^^
+6 >                                                 ^^
+7 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    skills: { primary: primaryA, secondary: secondaryA }
-3 >                          
-4 >                            primary: primaryA
-5 >                                                 , 
-6 >                                                   secondary: secondaryA
+2 >    
+3 >        skills: { primary: primaryA, secondary: secondaryA }
+4 >                          
+5 >                            primary: primaryA
+6 >                                                 , 
+7 >                                                   secondary: secondaryA
 1->Emitted(27, 5) Source(41, 12) + SourceIndex(0)
-2 >Emitted(27, 27) Source(41, 64) + SourceIndex(0)
-3 >Emitted(27, 29) Source(41, 22) + SourceIndex(0)
-4 >Emitted(27, 50) Source(41, 39) + SourceIndex(0)
-5 >Emitted(27, 52) Source(41, 41) + SourceIndex(0)
-6 >Emitted(27, 77) Source(41, 62) + SourceIndex(0)
+2 >Emitted(27, 9) Source(41, 12) + SourceIndex(0)
+3 >Emitted(27, 27) Source(41, 64) + SourceIndex(0)
+4 >Emitted(27, 29) Source(41, 22) + SourceIndex(0)
+5 >Emitted(27, 50) Source(41, 39) + SourceIndex(0)
+6 >Emitted(27, 52) Source(41, 41) + SourceIndex(0)
+7 >Emitted(27, 77) Source(41, 62) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -913,7 +913,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 21>                                                                                ^^^^^^^^^^^^^^
 22>                                                                                              ^^
 23>                                                                                                ^^^^
-24>                                                                                                    ^
 1->,
   >    
 2 >    { 
@@ -940,7 +939,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 22>                                                                                              
 23>                                                                                                [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                    )
 1->Emitted(31, 5) Source(45, 5) + SourceIndex(0)
 2 >Emitted(31, 7) Source(45, 7) + SourceIndex(0)
 3 >Emitted(31, 11) Source(45, 11) + SourceIndex(0)
@@ -964,27 +962,29 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 21>Emitted(31, 95) Source(45, 79) + SourceIndex(0)
 22>Emitted(31, 97) Source(44, 70) + SourceIndex(0)
 23>Emitted(31, 101) Source(45, 79) + SourceIndex(0)
-24>Emitted(31, 102) Source(45, 80) + SourceIndex(0)
 ---
 >>>    var _m = _l[_k].skills, primaryA = _m.primary, secondaryA = _m.secondary;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^
-4 >                            ^^^^^^^^^^^^^^^^^^^^^
-5 >                                                 ^^
-6 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^
+4 >                          ^^
+5 >                            ^^^^^^^^^^^^^^^^^^^^^
+6 >                                                 ^^
+7 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    skills: { primary: primaryA, secondary: secondaryA }
-3 >                          
-4 >                            primary: primaryA
-5 >                                                 , 
-6 >                                                   secondary: secondaryA
+2 >    
+3 >        skills: { primary: primaryA, secondary: secondaryA }
+4 >                          
+5 >                            primary: primaryA
+6 >                                                 , 
+7 >                                                   secondary: secondaryA
 1 >Emitted(32, 5) Source(44, 12) + SourceIndex(0)
-2 >Emitted(32, 27) Source(44, 64) + SourceIndex(0)
-3 >Emitted(32, 29) Source(44, 22) + SourceIndex(0)
-4 >Emitted(32, 50) Source(44, 39) + SourceIndex(0)
-5 >Emitted(32, 52) Source(44, 41) + SourceIndex(0)
-6 >Emitted(32, 77) Source(44, 62) + SourceIndex(0)
+2 >Emitted(32, 9) Source(44, 12) + SourceIndex(0)
+3 >Emitted(32, 27) Source(44, 64) + SourceIndex(0)
+4 >Emitted(32, 29) Source(44, 22) + SourceIndex(0)
+5 >Emitted(32, 50) Source(44, 39) + SourceIndex(0)
+6 >Emitted(32, 52) Source(44, 41) + SourceIndex(0)
+7 >Emitted(32, 77) Source(44, 62) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1033,7 +1033,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
+12>                                                              ^->
 1->
   >
   >
@@ -1047,7 +1047,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(35, 1) Source(49, 1) + SourceIndex(0)
 2 >Emitted(35, 4) Source(49, 4) + SourceIndex(0)
 3 >Emitted(35, 5) Source(49, 5) + SourceIndex(0)
@@ -1059,27 +1058,29 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >Emitted(35, 57) Source(49, 49) + SourceIndex(0)
 10>Emitted(35, 59) Source(49, 43) + SourceIndex(0)
 11>Emitted(35, 63) Source(49, 49) + SourceIndex(0)
-12>Emitted(35, 64) Source(49, 50) + SourceIndex(0)
 ---
 >>>    var _p = robots_2[_o], nameA = _p.name, skillA = _p.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^^^^
-5 >                                          ^^
-6 >                                            ^^^^^^^^^^^^^^^^^
-1 >
-2 >    let {name: nameA, skill: skillA }
-3 >                         
-4 >                           name: nameA
-5 >                                          , 
-6 >                                            skill: skillA
-1 >Emitted(36, 5) Source(49, 6) + SourceIndex(0)
-2 >Emitted(36, 26) Source(49, 39) + SourceIndex(0)
-3 >Emitted(36, 28) Source(49, 11) + SourceIndex(0)
-4 >Emitted(36, 43) Source(49, 22) + SourceIndex(0)
-5 >Emitted(36, 45) Source(49, 24) + SourceIndex(0)
-6 >Emitted(36, 62) Source(49, 37) + SourceIndex(0)
+1->^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^^^^
+6 >                                          ^^
+7 >                                            ^^^^^^^^^^^^^^^^^
+1->
+2 >    
+3 >        {name: nameA, skill: skillA }
+4 >                         
+5 >                           name: nameA
+6 >                                          , 
+7 >                                            skill: skillA
+1->Emitted(36, 5) Source(49, 10) + SourceIndex(0)
+2 >Emitted(36, 9) Source(49, 10) + SourceIndex(0)
+3 >Emitted(36, 26) Source(49, 39) + SourceIndex(0)
+4 >Emitted(36, 28) Source(49, 11) + SourceIndex(0)
+5 >Emitted(36, 43) Source(49, 22) + SourceIndex(0)
+6 >Emitted(36, 45) Source(49, 24) + SourceIndex(0)
+7 >Emitted(36, 62) Source(49, 37) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1129,8 +1130,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^->
+14>                                                       ^^->
 1->
   >
 2 >for
@@ -1145,7 +1145,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(39, 1) Source(52, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(52, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(52, 5) + SourceIndex(0)
@@ -1159,27 +1158,29 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>Emitted(39, 50) Source(52, 54) + SourceIndex(0)
 12>Emitted(39, 52) Source(52, 43) + SourceIndex(0)
 13>Emitted(39, 56) Source(52, 54) + SourceIndex(0)
-14>Emitted(39, 57) Source(52, 55) + SourceIndex(0)
 ---
 >>>    var _s = _r[_q], nameA = _s.name, skillA = _s.skill;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA, skill: skillA }
-3 >                   
-4 >                     name: nameA
-5 >                                    , 
-6 >                                      skill: skillA
-1->Emitted(40, 5) Source(52, 6) + SourceIndex(0)
-2 >Emitted(40, 20) Source(52, 39) + SourceIndex(0)
-3 >Emitted(40, 22) Source(52, 11) + SourceIndex(0)
-4 >Emitted(40, 37) Source(52, 22) + SourceIndex(0)
-5 >Emitted(40, 39) Source(52, 24) + SourceIndex(0)
-6 >Emitted(40, 56) Source(52, 37) + SourceIndex(0)
+2 >    
+3 >        {name: nameA, skill: skillA }
+4 >                   
+5 >                     name: nameA
+6 >                                    , 
+7 >                                      skill: skillA
+1->Emitted(40, 5) Source(52, 10) + SourceIndex(0)
+2 >Emitted(40, 9) Source(52, 10) + SourceIndex(0)
+3 >Emitted(40, 20) Source(52, 39) + SourceIndex(0)
+4 >Emitted(40, 22) Source(52, 11) + SourceIndex(0)
+5 >Emitted(40, 37) Source(52, 22) + SourceIndex(0)
+6 >Emitted(40, 39) Source(52, 24) + SourceIndex(0)
+7 >Emitted(40, 56) Source(52, 37) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1247,7 +1248,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -1280,7 +1280,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(43, 1) Source(55, 1) + SourceIndex(0)
 2 >Emitted(43, 4) Source(55, 4) + SourceIndex(0)
 3 >Emitted(43, 5) Source(55, 5) + SourceIndex(0)
@@ -1312,27 +1311,29 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 29>Emitted(43, 115) Source(55, 119) + SourceIndex(0)
 30>Emitted(43, 117) Source(55, 43) + SourceIndex(0)
 31>Emitted(43, 121) Source(55, 119) + SourceIndex(0)
-32>Emitted(43, 122) Source(55, 120) + SourceIndex(0)
 ---
 >>>    var _v = _u[_t], nameA = _v.name, skillA = _v.skill;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^^^^
 1 >
-2 >    let {name: nameA, skill: skillA }
-3 >                   
-4 >                     name: nameA
-5 >                                    , 
-6 >                                      skill: skillA
-1 >Emitted(44, 5) Source(55, 6) + SourceIndex(0)
-2 >Emitted(44, 20) Source(55, 39) + SourceIndex(0)
-3 >Emitted(44, 22) Source(55, 11) + SourceIndex(0)
-4 >Emitted(44, 37) Source(55, 22) + SourceIndex(0)
-5 >Emitted(44, 39) Source(55, 24) + SourceIndex(0)
-6 >Emitted(44, 56) Source(55, 37) + SourceIndex(0)
+2 >    
+3 >        {name: nameA, skill: skillA }
+4 >                   
+5 >                     name: nameA
+6 >                                    , 
+7 >                                      skill: skillA
+1 >Emitted(44, 5) Source(55, 10) + SourceIndex(0)
+2 >Emitted(44, 9) Source(55, 10) + SourceIndex(0)
+3 >Emitted(44, 20) Source(55, 39) + SourceIndex(0)
+4 >Emitted(44, 22) Source(55, 11) + SourceIndex(0)
+5 >Emitted(44, 37) Source(55, 22) + SourceIndex(0)
+6 >Emitted(44, 39) Source(55, 24) + SourceIndex(0)
+7 >Emitted(44, 56) Source(55, 37) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1380,8 +1381,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1394,7 +1394,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(47, 1) Source(58, 1) + SourceIndex(0)
 2 >Emitted(47, 4) Source(58, 4) + SourceIndex(0)
 3 >Emitted(47, 5) Source(58, 5) + SourceIndex(0)
@@ -1406,39 +1405,41 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 9 >Emitted(47, 72) Source(58, 93) + SourceIndex(0)
 10>Emitted(47, 74) Source(58, 82) + SourceIndex(0)
 11>Emitted(47, 78) Source(58, 93) + SourceIndex(0)
-12>Emitted(47, 79) Source(58, 94) + SourceIndex(0)
 ---
 >>>    var _x = multiRobots_2[_w], nameA = _x.name, _y = _x.skills, primaryA = _y.primary, secondaryA = _y.secondary;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                              ^^
-4 >                                ^^^^^^^^^^^^^^^
-5 >                                               ^^
-6 >                                                 ^^^^^^^^^^^^^^
-7 >                                                               ^^
-8 >                                                                 ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                      ^^
-10>                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^
+4 >                              ^^
+5 >                                ^^^^^^^^^^^^^^^
+6 >                                               ^^
+7 >                                                 ^^^^^^^^^^^^^^
+8 >                                                               ^^
+9 >                                                                 ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                      ^^
+11>                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
-3 >                              
-4 >                                name: nameA
-5 >                                               , 
-6 >                                                 skills: { primary: primaryA, secondary: secondaryA }
-7 >                                                               
-8 >                                                                 primary: primaryA
-9 >                                                                                      , 
-10>                                                                                        secondary: secondaryA
-1->Emitted(48, 5) Source(58, 6) + SourceIndex(0)
-2 >Emitted(48, 31) Source(58, 78) + SourceIndex(0)
-3 >Emitted(48, 33) Source(58, 11) + SourceIndex(0)
-4 >Emitted(48, 48) Source(58, 22) + SourceIndex(0)
-5 >Emitted(48, 50) Source(58, 24) + SourceIndex(0)
-6 >Emitted(48, 64) Source(58, 76) + SourceIndex(0)
-7 >Emitted(48, 66) Source(58, 34) + SourceIndex(0)
-8 >Emitted(48, 87) Source(58, 51) + SourceIndex(0)
-9 >Emitted(48, 89) Source(58, 53) + SourceIndex(0)
-10>Emitted(48, 114) Source(58, 74) + SourceIndex(0)
+2 >    
+3 >        {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
+4 >                              
+5 >                                name: nameA
+6 >                                               , 
+7 >                                                 skills: { primary: primaryA, secondary: secondaryA }
+8 >                                                               
+9 >                                                                 primary: primaryA
+10>                                                                                      , 
+11>                                                                                        secondary: secondaryA
+1->Emitted(48, 5) Source(58, 10) + SourceIndex(0)
+2 >Emitted(48, 9) Source(58, 10) + SourceIndex(0)
+3 >Emitted(48, 31) Source(58, 78) + SourceIndex(0)
+4 >Emitted(48, 33) Source(58, 11) + SourceIndex(0)
+5 >Emitted(48, 48) Source(58, 22) + SourceIndex(0)
+6 >Emitted(48, 50) Source(58, 24) + SourceIndex(0)
+7 >Emitted(48, 64) Source(58, 76) + SourceIndex(0)
+8 >Emitted(48, 66) Source(58, 34) + SourceIndex(0)
+9 >Emitted(48, 87) Source(58, 51) + SourceIndex(0)
+10>Emitted(48, 89) Source(58, 53) + SourceIndex(0)
+11>Emitted(48, 114) Source(58, 74) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1488,8 +1489,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1504,7 +1504,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(51, 1) Source(61, 1) + SourceIndex(0)
 2 >Emitted(51, 4) Source(61, 4) + SourceIndex(0)
 3 >Emitted(51, 5) Source(61, 5) + SourceIndex(0)
@@ -1518,39 +1517,41 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 11>Emitted(51, 55) Source(61, 98) + SourceIndex(0)
 12>Emitted(51, 57) Source(61, 82) + SourceIndex(0)
 13>Emitted(51, 61) Source(61, 98) + SourceIndex(0)
-14>Emitted(51, 62) Source(61, 99) + SourceIndex(0)
 ---
 >>>    var _1 = _0[_z], nameA = _1.name, _2 = _1.skills, primaryA = _2.primary, secondaryA = _2.secondary;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^
-7 >                                                    ^^
-8 >                                                      ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                           ^^
-10>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^
+8 >                                                    ^^
+9 >                                                      ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                           ^^
+11>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
-3 >                   
-4 >                     name: nameA
-5 >                                    , 
-6 >                                      skills: { primary: primaryA, secondary: secondaryA }
-7 >                                                    
-8 >                                                      primary: primaryA
-9 >                                                                           , 
-10>                                                                             secondary: secondaryA
-1->Emitted(52, 5) Source(61, 6) + SourceIndex(0)
-2 >Emitted(52, 20) Source(61, 78) + SourceIndex(0)
-3 >Emitted(52, 22) Source(61, 11) + SourceIndex(0)
-4 >Emitted(52, 37) Source(61, 22) + SourceIndex(0)
-5 >Emitted(52, 39) Source(61, 24) + SourceIndex(0)
-6 >Emitted(52, 53) Source(61, 76) + SourceIndex(0)
-7 >Emitted(52, 55) Source(61, 34) + SourceIndex(0)
-8 >Emitted(52, 76) Source(61, 51) + SourceIndex(0)
-9 >Emitted(52, 78) Source(61, 53) + SourceIndex(0)
-10>Emitted(52, 103) Source(61, 74) + SourceIndex(0)
+2 >    
+3 >        {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
+4 >                   
+5 >                     name: nameA
+6 >                                    , 
+7 >                                      skills: { primary: primaryA, secondary: secondaryA }
+8 >                                                    
+9 >                                                      primary: primaryA
+10>                                                                           , 
+11>                                                                             secondary: secondaryA
+1->Emitted(52, 5) Source(61, 10) + SourceIndex(0)
+2 >Emitted(52, 9) Source(61, 10) + SourceIndex(0)
+3 >Emitted(52, 20) Source(61, 78) + SourceIndex(0)
+4 >Emitted(52, 22) Source(61, 11) + SourceIndex(0)
+5 >Emitted(52, 37) Source(61, 22) + SourceIndex(0)
+6 >Emitted(52, 39) Source(61, 24) + SourceIndex(0)
+7 >Emitted(52, 53) Source(61, 76) + SourceIndex(0)
+8 >Emitted(52, 55) Source(61, 34) + SourceIndex(0)
+9 >Emitted(52, 76) Source(61, 51) + SourceIndex(0)
+10>Emitted(52, 78) Source(61, 53) + SourceIndex(0)
+11>Emitted(52, 103) Source(61, 74) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1687,8 +1688,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 21>                                                                                ^^^^^^^^^^^^^^
 22>                                                                                              ^^
 23>                                                                                                ^^^^
-24>                                                                                                    ^
-25>                                                                                                     ^^^->
+24>                                                                                                    ^^^^->
 1->,
   >    
 2 >    { 
@@ -1715,7 +1715,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 22>                                                                                              
 23>                                                                                                [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                    )
 1->Emitted(56, 5) Source(65, 5) + SourceIndex(0)
 2 >Emitted(56, 7) Source(65, 7) + SourceIndex(0)
 3 >Emitted(56, 11) Source(65, 11) + SourceIndex(0)
@@ -1739,39 +1738,41 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern.ts
 21>Emitted(56, 95) Source(65, 79) + SourceIndex(0)
 22>Emitted(56, 97) Source(64, 82) + SourceIndex(0)
 23>Emitted(56, 101) Source(65, 79) + SourceIndex(0)
-24>Emitted(56, 102) Source(65, 80) + SourceIndex(0)
 ---
 >>>    var _5 = _4[_3], nameA = _5.name, _6 = _5.skills, primaryA = _6.primary, secondaryA = _6.secondary;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^
-7 >                                                    ^^
-8 >                                                      ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                           ^^
-10>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^^^^
+6 >                                    ^^
+7 >                                      ^^^^^^^^^^^^^^
+8 >                                                    ^^
+9 >                                                      ^^^^^^^^^^^^^^^^^^^^^
+10>                                                                           ^^
+11>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
-3 >                   
-4 >                     name: nameA
-5 >                                    , 
-6 >                                      skills: { primary: primaryA, secondary: secondaryA }
-7 >                                                    
-8 >                                                      primary: primaryA
-9 >                                                                           , 
-10>                                                                             secondary: secondaryA
-1->Emitted(57, 5) Source(64, 6) + SourceIndex(0)
-2 >Emitted(57, 20) Source(64, 78) + SourceIndex(0)
-3 >Emitted(57, 22) Source(64, 11) + SourceIndex(0)
-4 >Emitted(57, 37) Source(64, 22) + SourceIndex(0)
-5 >Emitted(57, 39) Source(64, 24) + SourceIndex(0)
-6 >Emitted(57, 53) Source(64, 76) + SourceIndex(0)
-7 >Emitted(57, 55) Source(64, 34) + SourceIndex(0)
-8 >Emitted(57, 76) Source(64, 51) + SourceIndex(0)
-9 >Emitted(57, 78) Source(64, 53) + SourceIndex(0)
-10>Emitted(57, 103) Source(64, 74) + SourceIndex(0)
+2 >    
+3 >        {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
+4 >                   
+5 >                     name: nameA
+6 >                                    , 
+7 >                                      skills: { primary: primaryA, secondary: secondaryA }
+8 >                                                    
+9 >                                                      primary: primaryA
+10>                                                                           , 
+11>                                                                             secondary: secondaryA
+1->Emitted(57, 5) Source(64, 10) + SourceIndex(0)
+2 >Emitted(57, 9) Source(64, 10) + SourceIndex(0)
+3 >Emitted(57, 20) Source(64, 78) + SourceIndex(0)
+4 >Emitted(57, 22) Source(64, 11) + SourceIndex(0)
+5 >Emitted(57, 37) Source(64, 22) + SourceIndex(0)
+6 >Emitted(57, 39) Source(64, 24) + SourceIndex(0)
+7 >Emitted(57, 53) Source(64, 76) + SourceIndex(0)
+8 >Emitted(57, 55) Source(64, 34) + SourceIndex(0)
+9 >Emitted(57, 76) Source(64, 51) + SourceIndex(0)
+10>Emitted(57, 78) Source(64, 53) + SourceIndex(0)
+11>Emitted(57, 103) Source(64, 74) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.js.map
index c8610cbeef8..47fdde05e22 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfObjectBindingPattern2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPattern2.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAmB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAxB,yBAAW;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA7B,mBAAW;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAA9F,mBAAW;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6D,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAtE,6BAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA6D,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAA3E,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA6D,UACa,EADb,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACjI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADb,cACa,EADb,IACa,CAAC;IADxE,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAErD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAY,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAjB,wBAAI;IACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAtB,kBAAI;IACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAAvF,kBAAI;IACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuC,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAAhD,6BAA8B,EAApB,oBAAO,EAAE,wBAAS;IAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAArD,kBAA8B,EAApB,oBAAO,EAAE,wBAAS;IAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,UACmC,EADnC,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC3G,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADnC,cACmC,EADnC,IACmC,CAAC;IADxE,kBAA8B,EAApB,oBAAO,EAAE,wBAAS;IAE/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAGD,GAAG,CAAC,CAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAxC,iBAA6B,EAA5B,eAAW,EAAE,iBAAa;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAA7C,WAA6B,EAA5B,eAAW,EAAE,iBAAa;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAA9G,WAA6B,EAA5B,eAAW,EAAE,iBAAa;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyE,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAApF,uBAAoE,EAAnE,gBAAW,EAAE,gBAAoD,EAA1C,sBAAiB,EAAE,0BAAqB;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyE,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAAzF,cAAoE,EAAnE,gBAAW,EAAE,gBAAoD,EAA1C,sBAAiB,EAAE,0BAAqB;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyE,WACC,EADD,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC7I,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADD,gBACC,EADD,KACC,CAAC;IAD1E,cAAoE,EAAnE,gBAAW,EAAE,gBAAoD,EAA1C,sBAAiB,EAAE,0BAAqB;IAEjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAAzB,mBAAc,EAAb,eAAI,EAAE,iBAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAA9B,cAAc,EAAb,eAAI,EAAE,iBAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,CAAC;IAA/F,cAAc,EAAb,eAAI,EAAE,iBAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IAAvD,wBAAuC,EAAtC,eAAI,EAAE,gBAA8B,EAApB,qBAAO,EAAE,yBAAS;IACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAA5D,cAAuC,EAAtC,eAAI,EAAE,gBAA8B,EAApB,qBAAO,EAAE,yBAAS;IACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAC8B,EAD9B,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChH,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9B,gBAC8B,EAD9B,KAC8B,CAAC;IAD1E,cAAuC,EAAtC,eAAI,EAAE,gBAA8B,EAApB,qBAAO,EAAE,yBAAS;IAEpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPattern2.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAmB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAvB,yBAAW;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAA5B,mBAAW;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAA7F,mBAAW;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA6D,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAArE,6BAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA6D,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAA1E,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IACrD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAA6D,UACa,EADb,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACjI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADb,cACa,EADb,IACa;IADvE,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB;IAErD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAY,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAhB,wBAAI;IACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAArB,kBAAI;IACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAY,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAAtF,kBAAI;IACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAuC,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAA/C,6BAA8B,EAApB,oBAAO,EAAE,wBAAS;IAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAApD,kBAA8B,EAApB,oBAAO,EAAE,wBAAS;IAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAAuC,UACmC,EADnC,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC3G,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADnC,cACmC,EADnC,IACmC;IADvE,kBAA8B,EAApB,oBAAO,EAAE,wBAAS;IAE/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAGD,GAAG,CAAC,CAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;uBAAtC,eAAW,EAAE,iBAAa;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;iBAA3C,eAAW,EAAE,iBAAa;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;iBAA5G,eAAW,EAAE,iBAAa;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyE,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;6BAAlF,gBAAW,EAAE,gBAAoD,EAA1C,sBAAiB,EAAE,0BAAqB;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyE,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;oBAAvF,gBAAW,EAAE,gBAAoD,EAA1C,sBAAiB,EAAE,0BAAqB;IACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAyE,WACC,EADD,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC7I,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADD,gBACC,EADD,KACC;oBADxE,gBAAW,EAAE,gBAAoD,EAA1C,sBAAiB,EAAE,0BAAqB;IAEjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;yBAAvB,eAAI,EAAE,iBAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;oBAA5B,eAAI,EAAE,iBAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAmB,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E;oBAA7F,eAAI,EAAE,iBAAK;IACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;8BAArD,eAAI,EAAE,gBAA8B,EAApB,qBAAO,EAAE,yBAAS;IACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;oBAA1D,eAAI,EAAE,gBAA8B,EAApB,qBAAO,EAAE,yBAAS;IACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAC8B,EAD9B,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChH,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9B,gBAC8B,EAD9B,KAC8B;oBADxE,eAAI,EAAE,gBAA8B,EAApB,qBAAO,EAAE,yBAAS;IAEpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.sourcemap.txt
index 8a603317954..b246504de7a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.sourcemap.txt
@@ -394,7 +394,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -408,7 +407,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(12, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(12, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(12, 5) Source(32, 5) + SourceIndex(0)
@@ -420,7 +418,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(12, 57) Source(32, 30) + SourceIndex(0)
 10>Emitted(12, 59) Source(32, 24) + SourceIndex(0)
 11>Emitted(12, 63) Source(32, 30) + SourceIndex(0)
-12>Emitted(12, 64) Source(32, 31) + SourceIndex(0)
 ---
 >>>    nameA = robots_1[_i].name;
 1 >^^^^
@@ -478,7 +475,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -493,7 +489,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(16, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(16, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(16, 5) Source(35, 5) + SourceIndex(0)
@@ -507,7 +502,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(16, 50) Source(35, 35) + SourceIndex(0)
 12>Emitted(16, 52) Source(35, 24) + SourceIndex(0)
 13>Emitted(16, 56) Source(35, 35) + SourceIndex(0)
-14>Emitted(16, 57) Source(35, 36) + SourceIndex(0)
 ---
 >>>    nameA = _b[_a].name;
 1 >^^^^
@@ -584,7 +578,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -617,7 +610,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(20, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(20, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(20, 5) Source(38, 5) + SourceIndex(0)
@@ -649,7 +641,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>Emitted(20, 115) Source(38, 100) + SourceIndex(0)
 30>Emitted(20, 117) Source(38, 24) + SourceIndex(0)
 31>Emitted(20, 121) Source(38, 100) + SourceIndex(0)
-32>Emitted(20, 122) Source(38, 101) + SourceIndex(0)
 ---
 >>>    nameA = _d[_c].name;
 1 >^^^^
@@ -706,8 +697,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^->
+12>                                                                             ^^^^^^^^->
 1->
   >
 2 >for
@@ -720,7 +710,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(24, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(24, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(24, 5) Source(41, 5) + SourceIndex(0)
@@ -732,7 +721,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(24, 72) Source(41, 77) + SourceIndex(0)
 10>Emitted(24, 74) Source(41, 66) + SourceIndex(0)
 11>Emitted(24, 78) Source(41, 77) + SourceIndex(0)
-12>Emitted(24, 79) Source(41, 78) + SourceIndex(0)
 ---
 >>>    _f = multiRobots_1[_e].skills, primaryA = _f.primary, secondaryA = _f.secondary;
 1->^^^^
@@ -802,8 +790,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -818,7 +805,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(28, 1) Source(44, 1) + SourceIndex(0)
 2 >Emitted(28, 4) Source(44, 4) + SourceIndex(0)
 3 >Emitted(28, 5) Source(44, 5) + SourceIndex(0)
@@ -832,7 +818,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(28, 55) Source(44, 82) + SourceIndex(0)
 12>Emitted(28, 57) Source(44, 66) + SourceIndex(0)
 13>Emitted(28, 61) Source(44, 82) + SourceIndex(0)
-14>Emitted(28, 62) Source(44, 83) + SourceIndex(0)
 ---
 >>>    _j = _h[_g].skills, primaryA = _j.primary, secondaryA = _j.secondary;
 1->^^^^
@@ -989,7 +974,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>                                                                                ^^^^^^^^^^^^^^
 22>                                                                                              ^^
 23>                                                                                                ^^^^
-24>                                                                                                    ^
 1->,
   >    
 2 >    { 
@@ -1016,7 +1000,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 22>                                                                                              
 23>                                                                                                [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                    )
 1->Emitted(33, 5) Source(48, 5) + SourceIndex(0)
 2 >Emitted(33, 7) Source(48, 7) + SourceIndex(0)
 3 >Emitted(33, 11) Source(48, 11) + SourceIndex(0)
@@ -1040,7 +1023,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>Emitted(33, 95) Source(48, 79) + SourceIndex(0)
 22>Emitted(33, 97) Source(47, 66) + SourceIndex(0)
 23>Emitted(33, 101) Source(48, 79) + SourceIndex(0)
-24>Emitted(33, 102) Source(48, 80) + SourceIndex(0)
 ---
 >>>    _m = _l[_k].skills, primaryA = _m.primary, secondaryA = _m.secondary;
 1 >^^^^
@@ -1109,7 +1091,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
 2 >for
@@ -1122,7 +1103,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(37, 1) Source(51, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(51, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(51, 5) + SourceIndex(0)
@@ -1134,7 +1114,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(37, 57) Source(51, 23) + SourceIndex(0)
 10>Emitted(37, 59) Source(51, 17) + SourceIndex(0)
 11>Emitted(37, 63) Source(51, 23) + SourceIndex(0)
-12>Emitted(37, 64) Source(51, 24) + SourceIndex(0)
 ---
 >>>    name = robots_2[_o].name;
 1 >^^^^
@@ -1192,7 +1171,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -1207,7 +1185,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(41, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(41, 4) Source(54, 4) + SourceIndex(0)
 3 >Emitted(41, 5) Source(54, 5) + SourceIndex(0)
@@ -1221,7 +1198,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(41, 50) Source(54, 28) + SourceIndex(0)
 12>Emitted(41, 52) Source(54, 17) + SourceIndex(0)
 13>Emitted(41, 56) Source(54, 28) + SourceIndex(0)
-14>Emitted(41, 57) Source(54, 29) + SourceIndex(0)
 ---
 >>>    name = _q[_p].name;
 1 >^^^^
@@ -1298,7 +1274,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -1331,7 +1306,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(45, 1) Source(57, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(57, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(57, 5) + SourceIndex(0)
@@ -1363,7 +1337,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>Emitted(45, 115) Source(57, 93) + SourceIndex(0)
 30>Emitted(45, 117) Source(57, 17) + SourceIndex(0)
 31>Emitted(45, 121) Source(57, 93) + SourceIndex(0)
-32>Emitted(45, 122) Source(57, 94) + SourceIndex(0)
 ---
 >>>    name = _s[_r].name;
 1 >^^^^
@@ -1420,8 +1393,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^->
+12>                                                                             ^^^^^^->
 1->
   >
 2 >for
@@ -1434,7 +1406,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(49, 1) Source(60, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(60, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(60, 5) + SourceIndex(0)
@@ -1446,7 +1417,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(49, 72) Source(60, 55) + SourceIndex(0)
 10>Emitted(49, 74) Source(60, 44) + SourceIndex(0)
 11>Emitted(49, 78) Source(60, 55) + SourceIndex(0)
-12>Emitted(49, 79) Source(60, 56) + SourceIndex(0)
 ---
 >>>    _u = multiRobots_2[_t].skills, primary = _u.primary, secondary = _u.secondary;
 1->^^^^
@@ -1516,8 +1486,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1532,7 +1501,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(53, 1) Source(63, 1) + SourceIndex(0)
 2 >Emitted(53, 4) Source(63, 4) + SourceIndex(0)
 3 >Emitted(53, 5) Source(63, 5) + SourceIndex(0)
@@ -1546,7 +1514,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(53, 55) Source(63, 60) + SourceIndex(0)
 12>Emitted(53, 57) Source(63, 44) + SourceIndex(0)
 13>Emitted(53, 61) Source(63, 60) + SourceIndex(0)
-14>Emitted(53, 62) Source(63, 61) + SourceIndex(0)
 ---
 >>>    _x = _w[_v].skills, primary = _x.primary, secondary = _x.secondary;
 1->^^^^
@@ -1703,7 +1670,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>                                                                                ^^^^^^^^^^^^^^
 22>                                                                                              ^^
 23>                                                                                                ^^^^
-24>                                                                                                    ^
 1->,
   >    
 2 >    { 
@@ -1730,7 +1696,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 22>                                                                                              
 23>                                                                                                [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                    )
 1->Emitted(58, 5) Source(67, 5) + SourceIndex(0)
 2 >Emitted(58, 7) Source(67, 7) + SourceIndex(0)
 3 >Emitted(58, 11) Source(67, 11) + SourceIndex(0)
@@ -1754,7 +1719,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>Emitted(58, 95) Source(67, 79) + SourceIndex(0)
 22>Emitted(58, 97) Source(66, 44) + SourceIndex(0)
 23>Emitted(58, 101) Source(67, 79) + SourceIndex(0)
-24>Emitted(58, 102) Source(67, 80) + SourceIndex(0)
 ---
 >>>    _0 = _z[_y].skills, primary = _0.primary, secondary = _0.secondary;
 1 >^^^^
@@ -1823,7 +1787,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
 1->
   >
   >
@@ -1838,7 +1801,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(62, 1) Source(72, 1) + SourceIndex(0)
 2 >Emitted(62, 4) Source(72, 4) + SourceIndex(0)
 3 >Emitted(62, 5) Source(72, 5) + SourceIndex(0)
@@ -1850,27 +1812,20 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(62, 57) Source(72, 45) + SourceIndex(0)
 10>Emitted(62, 59) Source(72, 39) + SourceIndex(0)
 11>Emitted(62, 63) Source(72, 45) + SourceIndex(0)
-12>Emitted(62, 64) Source(72, 46) + SourceIndex(0)
 ---
 >>>    _2 = robots_3[_1], nameA = _2.name, skillA = _2.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^
-4 >                       ^^^^^^^^^^^^^^^
-5 >                                      ^^
-6 >                                        ^^^^^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^^^^^^^
+2 >                       ^^^^^^^^^^^^^^^
+3 >                                      ^^
+4 >                                        ^^^^^^^^^^^^^^^^^
 1 >
-2 >    {name: nameA, skill: skillA }
-3 >                     
-4 >                       name: nameA
-5 >                                      , 
-6 >                                        skill: skillA
-1 >Emitted(63, 5) Source(72, 6) + SourceIndex(0)
-2 >Emitted(63, 22) Source(72, 35) + SourceIndex(0)
-3 >Emitted(63, 24) Source(72, 7) + SourceIndex(0)
-4 >Emitted(63, 39) Source(72, 18) + SourceIndex(0)
-5 >Emitted(63, 41) Source(72, 20) + SourceIndex(0)
-6 >Emitted(63, 58) Source(72, 33) + SourceIndex(0)
+2 >                       name: nameA
+3 >                                      , 
+4 >                                        skill: skillA
+1 >Emitted(63, 24) Source(72, 7) + SourceIndex(0)
+2 >Emitted(63, 39) Source(72, 18) + SourceIndex(0)
+3 >Emitted(63, 41) Source(72, 20) + SourceIndex(0)
+4 >Emitted(63, 58) Source(72, 33) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1920,7 +1875,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
 1->
   >
 2 >for
@@ -1935,7 +1889,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(66, 1) Source(75, 1) + SourceIndex(0)
 2 >Emitted(66, 4) Source(75, 4) + SourceIndex(0)
 3 >Emitted(66, 5) Source(75, 5) + SourceIndex(0)
@@ -1949,27 +1902,20 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(66, 50) Source(75, 50) + SourceIndex(0)
 12>Emitted(66, 52) Source(75, 39) + SourceIndex(0)
 13>Emitted(66, 56) Source(75, 50) + SourceIndex(0)
-14>Emitted(66, 57) Source(75, 51) + SourceIndex(0)
 ---
 >>>    _5 = _4[_3], nameA = _5.name, skillA = _5.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^
 1 >
-2 >    {name: nameA, skill: skillA }
-3 >               
-4 >                 name: nameA
-5 >                                , 
-6 >                                  skill: skillA
-1 >Emitted(67, 5) Source(75, 6) + SourceIndex(0)
-2 >Emitted(67, 16) Source(75, 35) + SourceIndex(0)
-3 >Emitted(67, 18) Source(75, 7) + SourceIndex(0)
-4 >Emitted(67, 33) Source(75, 18) + SourceIndex(0)
-5 >Emitted(67, 35) Source(75, 20) + SourceIndex(0)
-6 >Emitted(67, 52) Source(75, 33) + SourceIndex(0)
+2 >                 name: nameA
+3 >                                , 
+4 >                                  skill: skillA
+1 >Emitted(67, 18) Source(75, 7) + SourceIndex(0)
+2 >Emitted(67, 33) Source(75, 18) + SourceIndex(0)
+3 >Emitted(67, 35) Source(75, 20) + SourceIndex(0)
+4 >Emitted(67, 52) Source(75, 33) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2037,7 +1983,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -2070,7 +2015,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(70, 1) Source(78, 1) + SourceIndex(0)
 2 >Emitted(70, 4) Source(78, 4) + SourceIndex(0)
 3 >Emitted(70, 5) Source(78, 5) + SourceIndex(0)
@@ -2102,27 +2046,20 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>Emitted(70, 115) Source(78, 115) + SourceIndex(0)
 30>Emitted(70, 117) Source(78, 39) + SourceIndex(0)
 31>Emitted(70, 121) Source(78, 115) + SourceIndex(0)
-32>Emitted(70, 122) Source(78, 116) + SourceIndex(0)
 ---
 >>>    _8 = _7[_6], nameA = _8.name, skillA = _8.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^
-3 >               ^^
-4 >                 ^^^^^^^^^^^^^^^
-5 >                                ^^
-6 >                                  ^^^^^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^
+2 >                 ^^^^^^^^^^^^^^^
+3 >                                ^^
+4 >                                  ^^^^^^^^^^^^^^^^^
 1 >
-2 >    {name: nameA, skill: skillA }
-3 >               
-4 >                 name: nameA
-5 >                                , 
-6 >                                  skill: skillA
-1 >Emitted(71, 5) Source(78, 6) + SourceIndex(0)
-2 >Emitted(71, 16) Source(78, 35) + SourceIndex(0)
-3 >Emitted(71, 18) Source(78, 7) + SourceIndex(0)
-4 >Emitted(71, 33) Source(78, 18) + SourceIndex(0)
-5 >Emitted(71, 35) Source(78, 20) + SourceIndex(0)
-6 >Emitted(71, 52) Source(78, 33) + SourceIndex(0)
+2 >                 name: nameA
+3 >                                , 
+4 >                                  skill: skillA
+1 >Emitted(71, 18) Source(78, 7) + SourceIndex(0)
+2 >Emitted(71, 33) Source(78, 18) + SourceIndex(0)
+3 >Emitted(71, 35) Source(78, 20) + SourceIndex(0)
+4 >Emitted(71, 52) Source(78, 33) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2170,8 +2107,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2184,7 +2120,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(74, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(74, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(74, 5) Source(81, 5) + SourceIndex(0)
@@ -2196,39 +2131,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(74, 72) Source(81, 89) + SourceIndex(0)
 10>Emitted(74, 74) Source(81, 78) + SourceIndex(0)
 11>Emitted(74, 78) Source(81, 89) + SourceIndex(0)
-12>Emitted(74, 79) Source(81, 90) + SourceIndex(0)
 ---
 >>>    _10 = multiRobots_3[_9], nameA = _10.name, _11 = _10.skills, primaryA = _11.primary, secondaryA = _11.secondary;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^^
-4 >                             ^^^^^^^^^^^^^^^^
-5 >                                             ^^
-6 >                                               ^^^^^^^^^^^^^^^^
-7 >                                                               ^^
-8 >                                                                 ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                       ^^
-10>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                             ^^^^^^^^^^^^^^^^
+3 >                                             ^^
+4 >                                               ^^^^^^^^^^^^^^^^
+5 >                                                               ^^
+6 >                                                                 ^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                                       ^^
+8 >                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
-3 >                           
-4 >                             name: nameA
-5 >                                             , 
-6 >                                               skills: { primary: primaryA, secondary: secondaryA }
-7 >                                                               
-8 >                                                                 primary: primaryA
-9 >                                                                                       , 
-10>                                                                                         secondary: secondaryA
-1->Emitted(75, 5) Source(81, 6) + SourceIndex(0)
-2 >Emitted(75, 28) Source(81, 74) + SourceIndex(0)
-3 >Emitted(75, 30) Source(81, 7) + SourceIndex(0)
-4 >Emitted(75, 46) Source(81, 18) + SourceIndex(0)
-5 >Emitted(75, 48) Source(81, 20) + SourceIndex(0)
-6 >Emitted(75, 64) Source(81, 72) + SourceIndex(0)
-7 >Emitted(75, 66) Source(81, 30) + SourceIndex(0)
-8 >Emitted(75, 88) Source(81, 47) + SourceIndex(0)
-9 >Emitted(75, 90) Source(81, 49) + SourceIndex(0)
-10>Emitted(75, 116) Source(81, 70) + SourceIndex(0)
+2 >                             name: nameA
+3 >                                             , 
+4 >                                               skills: { primary: primaryA, secondary: secondaryA }
+5 >                                                               
+6 >                                                                 primary: primaryA
+7 >                                                                                       , 
+8 >                                                                                         secondary: secondaryA
+1->Emitted(75, 30) Source(81, 7) + SourceIndex(0)
+2 >Emitted(75, 46) Source(81, 18) + SourceIndex(0)
+3 >Emitted(75, 48) Source(81, 20) + SourceIndex(0)
+4 >Emitted(75, 64) Source(81, 72) + SourceIndex(0)
+5 >Emitted(75, 66) Source(81, 30) + SourceIndex(0)
+6 >Emitted(75, 88) Source(81, 47) + SourceIndex(0)
+7 >Emitted(75, 90) Source(81, 49) + SourceIndex(0)
+8 >Emitted(75, 116) Source(81, 70) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2278,8 +2206,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2294,7 +2221,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(78, 1) Source(84, 1) + SourceIndex(0)
 2 >Emitted(78, 4) Source(84, 4) + SourceIndex(0)
 3 >Emitted(78, 5) Source(84, 5) + SourceIndex(0)
@@ -2308,39 +2234,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(78, 59) Source(84, 94) + SourceIndex(0)
 12>Emitted(78, 61) Source(84, 78) + SourceIndex(0)
 13>Emitted(78, 66) Source(84, 94) + SourceIndex(0)
-14>Emitted(78, 67) Source(84, 95) + SourceIndex(0)
 ---
 >>>    _14 = _13[_12], nameA = _14.name, _15 = _14.skills, primaryA = _15.primary, secondaryA = _15.secondary;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^
-7 >                                                      ^^
-8 >                                                        ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                              ^^
-10>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^
+3 >                                    ^^
+4 >                                      ^^^^^^^^^^^^^^^^
+5 >                                                      ^^
+6 >                                                        ^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                              ^^
+8 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
-3 >                  
-4 >                    name: nameA
-5 >                                    , 
-6 >                                      skills: { primary: primaryA, secondary: secondaryA }
-7 >                                                      
-8 >                                                        primary: primaryA
-9 >                                                                              , 
-10>                                                                                secondary: secondaryA
-1->Emitted(79, 5) Source(84, 6) + SourceIndex(0)
-2 >Emitted(79, 19) Source(84, 74) + SourceIndex(0)
-3 >Emitted(79, 21) Source(84, 7) + SourceIndex(0)
-4 >Emitted(79, 37) Source(84, 18) + SourceIndex(0)
-5 >Emitted(79, 39) Source(84, 20) + SourceIndex(0)
-6 >Emitted(79, 55) Source(84, 72) + SourceIndex(0)
-7 >Emitted(79, 57) Source(84, 30) + SourceIndex(0)
-8 >Emitted(79, 79) Source(84, 47) + SourceIndex(0)
-9 >Emitted(79, 81) Source(84, 49) + SourceIndex(0)
-10>Emitted(79, 107) Source(84, 70) + SourceIndex(0)
+2 >                    name: nameA
+3 >                                    , 
+4 >                                      skills: { primary: primaryA, secondary: secondaryA }
+5 >                                                      
+6 >                                                        primary: primaryA
+7 >                                                                              , 
+8 >                                                                                secondary: secondaryA
+1->Emitted(79, 21) Source(84, 7) + SourceIndex(0)
+2 >Emitted(79, 37) Source(84, 18) + SourceIndex(0)
+3 >Emitted(79, 39) Source(84, 20) + SourceIndex(0)
+4 >Emitted(79, 55) Source(84, 72) + SourceIndex(0)
+5 >Emitted(79, 57) Source(84, 30) + SourceIndex(0)
+6 >Emitted(79, 79) Source(84, 47) + SourceIndex(0)
+7 >Emitted(79, 81) Source(84, 49) + SourceIndex(0)
+8 >Emitted(79, 107) Source(84, 70) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2477,8 +2396,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>                                                                                ^^^^^^^^^^^^^^^^
 22>                                                                                                ^^
 23>                                                                                                  ^^^^^
-24>                                                                                                       ^
-25>                                                                                                        ^^^^->
+24>                                                                                                       ^^^^^->
 1->,
   >    
 2 >    { 
@@ -2505,7 +2423,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 22>                                                                                                
 23>                                                                                                  [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                      { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                       )
 1->Emitted(83, 5) Source(88, 5) + SourceIndex(0)
 2 >Emitted(83, 7) Source(88, 7) + SourceIndex(0)
 3 >Emitted(83, 11) Source(88, 11) + SourceIndex(0)
@@ -2529,39 +2446,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>Emitted(83, 97) Source(88, 79) + SourceIndex(0)
 22>Emitted(83, 99) Source(87, 78) + SourceIndex(0)
 23>Emitted(83, 104) Source(88, 79) + SourceIndex(0)
-24>Emitted(83, 105) Source(88, 80) + SourceIndex(0)
 ---
 >>>    _18 = _17[_16], nameA = _18.name, _19 = _18.skills, primaryA = _19.primary, secondaryA = _19.secondary;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^
-5 >                                    ^^
-6 >                                      ^^^^^^^^^^^^^^^^
-7 >                                                      ^^
-8 >                                                        ^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                              ^^
-10>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^^
+3 >                                    ^^
+4 >                                      ^^^^^^^^^^^^^^^^
+5 >                                                      ^^
+6 >                                                        ^^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                              ^^
+8 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name: nameA, skills: { primary: primaryA, secondary: secondaryA } }
-3 >                  
-4 >                    name: nameA
-5 >                                    , 
-6 >                                      skills: { primary: primaryA, secondary: secondaryA }
-7 >                                                      
-8 >                                                        primary: primaryA
-9 >                                                                              , 
-10>                                                                                secondary: secondaryA
-1->Emitted(84, 5) Source(87, 6) + SourceIndex(0)
-2 >Emitted(84, 19) Source(87, 74) + SourceIndex(0)
-3 >Emitted(84, 21) Source(87, 7) + SourceIndex(0)
-4 >Emitted(84, 37) Source(87, 18) + SourceIndex(0)
-5 >Emitted(84, 39) Source(87, 20) + SourceIndex(0)
-6 >Emitted(84, 55) Source(87, 72) + SourceIndex(0)
-7 >Emitted(84, 57) Source(87, 30) + SourceIndex(0)
-8 >Emitted(84, 79) Source(87, 47) + SourceIndex(0)
-9 >Emitted(84, 81) Source(87, 49) + SourceIndex(0)
-10>Emitted(84, 107) Source(87, 70) + SourceIndex(0)
+2 >                    name: nameA
+3 >                                    , 
+4 >                                      skills: { primary: primaryA, secondary: secondaryA }
+5 >                                                      
+6 >                                                        primary: primaryA
+7 >                                                                              , 
+8 >                                                                                secondary: secondaryA
+1->Emitted(84, 21) Source(87, 7) + SourceIndex(0)
+2 >Emitted(84, 37) Source(87, 18) + SourceIndex(0)
+3 >Emitted(84, 39) Source(87, 20) + SourceIndex(0)
+4 >Emitted(84, 55) Source(87, 72) + SourceIndex(0)
+5 >Emitted(84, 57) Source(87, 30) + SourceIndex(0)
+6 >Emitted(84, 79) Source(87, 47) + SourceIndex(0)
+7 >Emitted(84, 81) Source(87, 49) + SourceIndex(0)
+8 >Emitted(84, 107) Source(87, 70) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2610,7 +2520,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
 1->
   >
 2 >for
@@ -2623,7 +2532,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(87, 1) Source(91, 1) + SourceIndex(0)
 2 >Emitted(87, 4) Source(91, 4) + SourceIndex(0)
 3 >Emitted(87, 5) Source(91, 5) + SourceIndex(0)
@@ -2635,27 +2543,20 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(87, 59) Source(91, 30) + SourceIndex(0)
 10>Emitted(87, 61) Source(91, 24) + SourceIndex(0)
 11>Emitted(87, 66) Source(91, 30) + SourceIndex(0)
-12>Emitted(87, 67) Source(91, 31) + SourceIndex(0)
 ---
 >>>    _21 = robots_4[_20], name = _21.name, skill = _21.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^
-5 >                                        ^^
-6 >                                          ^^^^^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                         ^^^^^^^^^^^^^^^
+3 >                                        ^^
+4 >                                          ^^^^^^^^^^^^^^^^^
 1 >
-2 >    {name, skill }
-3 >                       
-4 >                         name
-5 >                                        , 
-6 >                                          skill
-1 >Emitted(88, 5) Source(91, 6) + SourceIndex(0)
-2 >Emitted(88, 24) Source(91, 20) + SourceIndex(0)
-3 >Emitted(88, 26) Source(91, 7) + SourceIndex(0)
-4 >Emitted(88, 41) Source(91, 11) + SourceIndex(0)
-5 >Emitted(88, 43) Source(91, 13) + SourceIndex(0)
-6 >Emitted(88, 60) Source(91, 18) + SourceIndex(0)
+2 >                         name
+3 >                                        , 
+4 >                                          skill
+1 >Emitted(88, 26) Source(91, 7) + SourceIndex(0)
+2 >Emitted(88, 41) Source(91, 11) + SourceIndex(0)
+3 >Emitted(88, 43) Source(91, 13) + SourceIndex(0)
+4 >Emitted(88, 60) Source(91, 18) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2705,7 +2606,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
 1->
   >
 2 >for
@@ -2720,7 +2620,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(91, 1) Source(94, 1) + SourceIndex(0)
 2 >Emitted(91, 4) Source(94, 4) + SourceIndex(0)
 3 >Emitted(91, 5) Source(94, 5) + SourceIndex(0)
@@ -2734,27 +2633,20 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(91, 54) Source(94, 35) + SourceIndex(0)
 12>Emitted(91, 56) Source(94, 24) + SourceIndex(0)
 13>Emitted(91, 61) Source(94, 35) + SourceIndex(0)
-14>Emitted(91, 62) Source(94, 36) + SourceIndex(0)
 ---
 >>>    _24 = _23[_22], name = _24.name, skill = _24.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^
-5 >                                   ^^
-6 >                                     ^^^^^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^
+3 >                                   ^^
+4 >                                     ^^^^^^^^^^^^^^^^^
 1 >
-2 >    {name, skill }
-3 >                  
-4 >                    name
-5 >                                   , 
-6 >                                     skill
-1 >Emitted(92, 5) Source(94, 6) + SourceIndex(0)
-2 >Emitted(92, 19) Source(94, 20) + SourceIndex(0)
-3 >Emitted(92, 21) Source(94, 7) + SourceIndex(0)
-4 >Emitted(92, 36) Source(94, 11) + SourceIndex(0)
-5 >Emitted(92, 38) Source(94, 13) + SourceIndex(0)
-6 >Emitted(92, 55) Source(94, 18) + SourceIndex(0)
+2 >                    name
+3 >                                   , 
+4 >                                     skill
+1 >Emitted(92, 21) Source(94, 7) + SourceIndex(0)
+2 >Emitted(92, 36) Source(94, 11) + SourceIndex(0)
+3 >Emitted(92, 38) Source(94, 13) + SourceIndex(0)
+4 >Emitted(92, 55) Source(94, 18) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2822,7 +2714,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                      ^^^^^^^^^^^^^^^^
 30>                                                                                                                      ^^
 31>                                                                                                                        ^^^^^
-32>                                                                                                                             ^
 1->
   >
 2 >for
@@ -2855,7 +2746,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>                                                                                                      [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                      
 31>                                                                                                                        [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                             )
 1->Emitted(95, 1) Source(97, 1) + SourceIndex(0)
 2 >Emitted(95, 4) Source(97, 4) + SourceIndex(0)
 3 >Emitted(95, 5) Source(97, 5) + SourceIndex(0)
@@ -2887,27 +2777,20 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 29>Emitted(95, 119) Source(97, 100) + SourceIndex(0)
 30>Emitted(95, 121) Source(97, 24) + SourceIndex(0)
 31>Emitted(95, 126) Source(97, 100) + SourceIndex(0)
-32>Emitted(95, 127) Source(97, 101) + SourceIndex(0)
 ---
 >>>    _27 = _26[_25], name = _27.name, skill = _27.skill;
-1 >^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^
-5 >                                   ^^
-6 >                                     ^^^^^^^^^^^^^^^^^
+1 >^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^
+3 >                                   ^^
+4 >                                     ^^^^^^^^^^^^^^^^^
 1 >
-2 >    {name, skill }
-3 >                  
-4 >                    name
-5 >                                   , 
-6 >                                     skill
-1 >Emitted(96, 5) Source(97, 6) + SourceIndex(0)
-2 >Emitted(96, 19) Source(97, 20) + SourceIndex(0)
-3 >Emitted(96, 21) Source(97, 7) + SourceIndex(0)
-4 >Emitted(96, 36) Source(97, 11) + SourceIndex(0)
-5 >Emitted(96, 38) Source(97, 13) + SourceIndex(0)
-6 >Emitted(96, 55) Source(97, 18) + SourceIndex(0)
+2 >                    name
+3 >                                   , 
+4 >                                     skill
+1 >Emitted(96, 21) Source(97, 7) + SourceIndex(0)
+2 >Emitted(96, 36) Source(97, 11) + SourceIndex(0)
+3 >Emitted(96, 38) Source(97, 13) + SourceIndex(0)
+4 >Emitted(96, 55) Source(97, 18) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2955,8 +2838,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2969,7 +2851,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(99, 1) Source(100, 1) + SourceIndex(0)
 2 >Emitted(99, 4) Source(100, 4) + SourceIndex(0)
 3 >Emitted(99, 5) Source(100, 5) + SourceIndex(0)
@@ -2981,39 +2862,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 9 >Emitted(99, 74) Source(100, 60) + SourceIndex(0)
 10>Emitted(99, 76) Source(100, 49) + SourceIndex(0)
 11>Emitted(99, 81) Source(100, 60) + SourceIndex(0)
-12>Emitted(99, 82) Source(100, 61) + SourceIndex(0)
 ---
 >>>    _29 = multiRobots_4[_28], name = _29.name, _30 = _29.skills, primary = _30.primary, secondary = _30.secondary;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                            ^^
-4 >                              ^^^^^^^^^^^^^^^
-5 >                                             ^^
-6 >                                               ^^^^^^^^^^^^^^^^
-7 >                                                               ^^
-8 >                                                                 ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                      ^^
-10>                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                              ^^^^^^^^^^^^^^^
+3 >                                             ^^
+4 >                                               ^^^^^^^^^^^^^^^^
+5 >                                                               ^^
+6 >                                                                 ^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                                      ^^
+8 >                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name, skills: { primary, secondary } }
-3 >                            
-4 >                              name
-5 >                                             , 
-6 >                                               skills: { primary, secondary }
-7 >                                                               
-8 >                                                                 primary
-9 >                                                                                      , 
-10>                                                                                        secondary
-1->Emitted(100, 5) Source(100, 6) + SourceIndex(0)
-2 >Emitted(100, 29) Source(100, 45) + SourceIndex(0)
-3 >Emitted(100, 31) Source(100, 7) + SourceIndex(0)
-4 >Emitted(100, 46) Source(100, 11) + SourceIndex(0)
-5 >Emitted(100, 48) Source(100, 13) + SourceIndex(0)
-6 >Emitted(100, 64) Source(100, 43) + SourceIndex(0)
-7 >Emitted(100, 66) Source(100, 23) + SourceIndex(0)
-8 >Emitted(100, 87) Source(100, 30) + SourceIndex(0)
-9 >Emitted(100, 89) Source(100, 32) + SourceIndex(0)
-10>Emitted(100, 114) Source(100, 41) + SourceIndex(0)
+2 >                              name
+3 >                                             , 
+4 >                                               skills: { primary, secondary }
+5 >                                                               
+6 >                                                                 primary
+7 >                                                                                      , 
+8 >                                                                                        secondary
+1->Emitted(100, 31) Source(100, 7) + SourceIndex(0)
+2 >Emitted(100, 46) Source(100, 11) + SourceIndex(0)
+3 >Emitted(100, 48) Source(100, 13) + SourceIndex(0)
+4 >Emitted(100, 64) Source(100, 43) + SourceIndex(0)
+5 >Emitted(100, 66) Source(100, 23) + SourceIndex(0)
+6 >Emitted(100, 87) Source(100, 30) + SourceIndex(0)
+7 >Emitted(100, 89) Source(100, 32) + SourceIndex(0)
+8 >Emitted(100, 114) Source(100, 41) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3063,8 +2937,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -3079,7 +2952,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(103, 1) Source(103, 1) + SourceIndex(0)
 2 >Emitted(103, 4) Source(103, 4) + SourceIndex(0)
 3 >Emitted(103, 5) Source(103, 5) + SourceIndex(0)
@@ -3093,39 +2965,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 11>Emitted(103, 59) Source(103, 65) + SourceIndex(0)
 12>Emitted(103, 61) Source(103, 49) + SourceIndex(0)
 13>Emitted(103, 66) Source(103, 65) + SourceIndex(0)
-14>Emitted(103, 67) Source(103, 66) + SourceIndex(0)
 ---
 >>>    _33 = _32[_31], name = _33.name, _34 = _33.skills, primary = _34.primary, secondary = _34.secondary;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^
-5 >                                   ^^
-6 >                                     ^^^^^^^^^^^^^^^^
-7 >                                                     ^^
-8 >                                                       ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                            ^^
-10>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^
+3 >                                   ^^
+4 >                                     ^^^^^^^^^^^^^^^^
+5 >                                                     ^^
+6 >                                                       ^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                            ^^
+8 >                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name, skills: { primary, secondary } }
-3 >                  
-4 >                    name
-5 >                                   , 
-6 >                                     skills: { primary, secondary }
-7 >                                                     
-8 >                                                       primary
-9 >                                                                            , 
-10>                                                                              secondary
-1->Emitted(104, 5) Source(103, 6) + SourceIndex(0)
-2 >Emitted(104, 19) Source(103, 45) + SourceIndex(0)
-3 >Emitted(104, 21) Source(103, 7) + SourceIndex(0)
-4 >Emitted(104, 36) Source(103, 11) + SourceIndex(0)
-5 >Emitted(104, 38) Source(103, 13) + SourceIndex(0)
-6 >Emitted(104, 54) Source(103, 43) + SourceIndex(0)
-7 >Emitted(104, 56) Source(103, 23) + SourceIndex(0)
-8 >Emitted(104, 77) Source(103, 30) + SourceIndex(0)
-9 >Emitted(104, 79) Source(103, 32) + SourceIndex(0)
-10>Emitted(104, 104) Source(103, 41) + SourceIndex(0)
+2 >                    name
+3 >                                   , 
+4 >                                     skills: { primary, secondary }
+5 >                                                     
+6 >                                                       primary
+7 >                                                                            , 
+8 >                                                                              secondary
+1->Emitted(104, 21) Source(103, 7) + SourceIndex(0)
+2 >Emitted(104, 36) Source(103, 11) + SourceIndex(0)
+3 >Emitted(104, 38) Source(103, 13) + SourceIndex(0)
+4 >Emitted(104, 54) Source(103, 43) + SourceIndex(0)
+5 >Emitted(104, 56) Source(103, 23) + SourceIndex(0)
+6 >Emitted(104, 77) Source(103, 30) + SourceIndex(0)
+7 >Emitted(104, 79) Source(103, 32) + SourceIndex(0)
+8 >Emitted(104, 104) Source(103, 41) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3262,8 +3127,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>                                                                                ^^^^^^^^^^^^^^^^
 22>                                                                                                ^^
 23>                                                                                                  ^^^^^
-24>                                                                                                       ^
-25>                                                                                                        ^->
+24>                                                                                                       ^^->
 1->,
   >    
 2 >    { 
@@ -3290,7 +3154,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 22>                                                                                                
 23>                                                                                                  [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                      { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                       )
 1->Emitted(108, 5) Source(107, 5) + SourceIndex(0)
 2 >Emitted(108, 7) Source(107, 7) + SourceIndex(0)
 3 >Emitted(108, 11) Source(107, 11) + SourceIndex(0)
@@ -3314,39 +3177,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPattern2.ts
 21>Emitted(108, 97) Source(107, 79) + SourceIndex(0)
 22>Emitted(108, 99) Source(106, 49) + SourceIndex(0)
 23>Emitted(108, 104) Source(107, 79) + SourceIndex(0)
-24>Emitted(108, 105) Source(107, 80) + SourceIndex(0)
 ---
 >>>    _37 = _36[_35], name = _37.name, _38 = _37.skills, primary = _38.primary, secondary = _38.secondary;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^
-5 >                                   ^^
-6 >                                     ^^^^^^^^^^^^^^^^
-7 >                                                     ^^
-8 >                                                       ^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                            ^^
-10>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^^
+3 >                                   ^^
+4 >                                     ^^^^^^^^^^^^^^^^
+5 >                                                     ^^
+6 >                                                       ^^^^^^^^^^^^^^^^^^^^^
+7 >                                                                            ^^
+8 >                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name, skills: { primary, secondary } }
-3 >                  
-4 >                    name
-5 >                                   , 
-6 >                                     skills: { primary, secondary }
-7 >                                                     
-8 >                                                       primary
-9 >                                                                            , 
-10>                                                                              secondary
-1->Emitted(109, 5) Source(106, 6) + SourceIndex(0)
-2 >Emitted(109, 19) Source(106, 45) + SourceIndex(0)
-3 >Emitted(109, 21) Source(106, 7) + SourceIndex(0)
-4 >Emitted(109, 36) Source(106, 11) + SourceIndex(0)
-5 >Emitted(109, 38) Source(106, 13) + SourceIndex(0)
-6 >Emitted(109, 54) Source(106, 43) + SourceIndex(0)
-7 >Emitted(109, 56) Source(106, 23) + SourceIndex(0)
-8 >Emitted(109, 77) Source(106, 30) + SourceIndex(0)
-9 >Emitted(109, 79) Source(106, 32) + SourceIndex(0)
-10>Emitted(109, 104) Source(106, 41) + SourceIndex(0)
+2 >                    name
+3 >                                   , 
+4 >                                     skills: { primary, secondary }
+5 >                                                     
+6 >                                                       primary
+7 >                                                                            , 
+8 >                                                                              secondary
+1->Emitted(109, 21) Source(106, 7) + SourceIndex(0)
+2 >Emitted(109, 36) Source(106, 11) + SourceIndex(0)
+3 >Emitted(109, 38) Source(106, 13) + SourceIndex(0)
+4 >Emitted(109, 54) Source(106, 43) + SourceIndex(0)
+5 >Emitted(109, 56) Source(106, 23) + SourceIndex(0)
+6 >Emitted(109, 77) Source(106, 30) + SourceIndex(0)
+7 >Emitted(109, 79) Source(106, 32) + SourceIndex(0)
+8 >Emitted(109, 104) Source(106, 41) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js.map
index 89313ae9027..87f1e878b55 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAnC,0BAAsB,EAAtB,qCAAsB;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAxC,oBAAsB,EAAtB,qCAAsB;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAAzG,oBAAsB,EAAtB,qCAAsB;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CACkD,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IADvD,iCACqC,EADrC,sEACqC,EAD3B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAEnF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CACkD,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IAD5D,sBACqC,EADrC,sEACqC,EAD3B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAEnF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAEA,UAC0E,EAD1E,KAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAClF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD1E,cAC0E,EAD1E,IAC0E,CAAC;IAHpE,sBACqC,EADrC,sEACqC,EAD3B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAInF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAED,GAAG,CAAC,CAA6D,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAnE,qBAAwD,EAAnD,YAAsB,EAAtB,qCAAsB,EAAE,aAAyB,EAAzB,uCAAyB;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8D,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAzE,eAAyD,EAApD,YAAsB,EAAtB,qCAAsB,EAAE,aAAyB,EAAzB,uCAAyB;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8D,UAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,eAA4E,EAA5E,IAA4E,CAAC;IAA1I,iBAAyD,EAApD,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IANZ,4BAMJ,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IANjB,kBAMJ,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,CAAC;IAP1E,kBAMJ,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,GAAG,CAAC,CAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAlC,IAAA,sBAAsB,EAAtB,qCAAsB;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAvC,IAAA,gBAAsB,EAAtB,qCAAsB;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAkC,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAAxG,IAAA,gBAAsB,EAAtB,qCAAsB;IAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CACkD,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IADtD,IAAA,6BACqC,EADrC,sEACqC,EAD3B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAEnF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CACkD,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAD3D,IAAA,kBACqC,EADrC,sEACqC,EAD3B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAEnF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAEA,UAC0E,EAD1E,KAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAClF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD1E,cAC0E,EAD1E,IAC0E;IAHnE,IAAA,kBACqC,EADrC,sEACqC,EAD3B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAInF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAED,GAAG,CAAC,CAA6D,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAA9D,IAAA,iBAAoD,EAAnD,YAAsB,EAAtB,qCAAsB,EAAE,aAAyB,EAAzB,uCAAyB;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8D,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAApE,IAAA,WAAqD,EAApD,YAAsB,EAAtB,qCAAsB,EAAE,aAAyB,EAAzB,uCAAyB;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8D,UAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,eAA4E,EAA5E,IAA4E;IAArI,IAAA,aAAqD,EAApD,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;IANP,IAAA,wBAMR,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IANZ,IAAA,cAMR,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE;IAPrE,IAAA,cAMR,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.sourcemap.txt
index e63344455ae..2b43f2fc360 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.sourcemap.txt
@@ -320,8 +320,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^^^^^->
+12>                                                              ^^^^^^^^^->
 1->
   >
   >
@@ -335,7 +334,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(10, 1) Source(29, 1) + SourceIndex(0)
 2 >Emitted(10, 4) Source(29, 4) + SourceIndex(0)
 3 >Emitted(10, 5) Source(29, 5) + SourceIndex(0)
@@ -347,21 +345,23 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(10, 57) Source(29, 45) + SourceIndex(0)
 10>Emitted(10, 59) Source(29, 39) + SourceIndex(0)
 11>Emitted(10, 63) Source(29, 45) + SourceIndex(0)
-12>Emitted(10, 64) Source(29, 46) + SourceIndex(0)
 ---
 >>>    var _a = robots_1[_i].name, nameA = _a === void 0 ? "noName" : _a;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                              ^^
-4 >                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^
+4 >                              ^^
+5 >                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    name: nameA = "noName"
-3 >                              
-4 >                                name: nameA = "noName"
+2 >    
+3 >        name: nameA = "noName"
+4 >                              
+5 >                                name: nameA = "noName"
 1->Emitted(11, 5) Source(29, 11) + SourceIndex(0)
-2 >Emitted(11, 31) Source(29, 33) + SourceIndex(0)
-3 >Emitted(11, 33) Source(29, 11) + SourceIndex(0)
-4 >Emitted(11, 70) Source(29, 33) + SourceIndex(0)
+2 >Emitted(11, 9) Source(29, 11) + SourceIndex(0)
+3 >Emitted(11, 31) Source(29, 33) + SourceIndex(0)
+4 >Emitted(11, 33) Source(29, 11) + SourceIndex(0)
+5 >Emitted(11, 70) Source(29, 33) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -411,8 +411,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^^^^->
+14>                                                       ^^^^^^^^^^->
 1->
   >
 2 >for
@@ -427,7 +426,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(14, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(14, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(14, 5) Source(32, 5) + SourceIndex(0)
@@ -441,21 +439,23 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(14, 50) Source(32, 50) + SourceIndex(0)
 12>Emitted(14, 52) Source(32, 39) + SourceIndex(0)
 13>Emitted(14, 56) Source(32, 50) + SourceIndex(0)
-14>Emitted(14, 57) Source(32, 51) + SourceIndex(0)
 ---
 >>>    var _d = _c[_b].name, nameA = _d === void 0 ? "noName" : _d;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^
-4 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^
+4 >                        ^^
+5 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    name: nameA = "noName"
-3 >                        
-4 >                          name: nameA = "noName"
+2 >    
+3 >        name: nameA = "noName"
+4 >                        
+5 >                          name: nameA = "noName"
 1->Emitted(15, 5) Source(32, 11) + SourceIndex(0)
-2 >Emitted(15, 25) Source(32, 33) + SourceIndex(0)
-3 >Emitted(15, 27) Source(32, 11) + SourceIndex(0)
-4 >Emitted(15, 64) Source(32, 33) + SourceIndex(0)
+2 >Emitted(15, 9) Source(32, 11) + SourceIndex(0)
+3 >Emitted(15, 25) Source(32, 33) + SourceIndex(0)
+4 >Emitted(15, 27) Source(32, 11) + SourceIndex(0)
+5 >Emitted(15, 64) Source(32, 33) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -523,7 +523,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -556,7 +555,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(18, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(18, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(18, 5) Source(35, 5) + SourceIndex(0)
@@ -588,21 +586,23 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>Emitted(18, 115) Source(35, 115) + SourceIndex(0)
 30>Emitted(18, 117) Source(35, 39) + SourceIndex(0)
 31>Emitted(18, 121) Source(35, 115) + SourceIndex(0)
-32>Emitted(18, 122) Source(35, 116) + SourceIndex(0)
 ---
 >>>    var _g = _f[_e].name, nameA = _g === void 0 ? "noName" : _g;
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^
-4 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^
+4 >                        ^^
+5 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-2 >    name: nameA = "noName"
-3 >                        
-4 >                          name: nameA = "noName"
+2 >    
+3 >        name: nameA = "noName"
+4 >                        
+5 >                          name: nameA = "noName"
 1 >Emitted(19, 5) Source(35, 11) + SourceIndex(0)
-2 >Emitted(19, 25) Source(35, 33) + SourceIndex(0)
-3 >Emitted(19, 27) Source(35, 11) + SourceIndex(0)
-4 >Emitted(19, 64) Source(35, 33) + SourceIndex(0)
+2 >Emitted(19, 9) Source(35, 11) + SourceIndex(0)
+3 >Emitted(19, 25) Source(35, 33) + SourceIndex(0)
+4 >Emitted(19, 27) Source(35, 11) + SourceIndex(0)
+5 >Emitted(19, 64) Source(35, 33) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -650,8 +650,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -665,7 +664,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(22, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(22, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(22, 5) Source(38, 5) + SourceIndex(0)
@@ -677,47 +675,49 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(22, 72) Source(39, 66) + SourceIndex(0)
 10>Emitted(22, 74) Source(39, 55) + SourceIndex(0)
 11>Emitted(22, 78) Source(39, 66) + SourceIndex(0)
-12>Emitted(22, 79) Source(39, 67) + SourceIndex(0)
 ---
 >>>    var _j = multiRobots_1[_h].skills, _k = _j === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _j, _l = _k.primary, primaryA = _l === void 0 ? "primary" : _l, _m = _k.secondary, secondaryA = _m === void 0 ? "secondary" : _m;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                     ^^
-4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                                                             ^^
-6 >                                                                                                               ^^^^^^^^^^^^^^^
-7 >                                                                                                                              ^^
-8 >                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                                                         ^^
-10>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                            ^^
-12>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                     ^^
+5 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                                             ^^
+7 >                                                                                                               ^^^^^^^^^^^^^^^
+8 >                                                                                                                              ^^
+9 >                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                         ^^
+11>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                            ^^
+13>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
-  >        { primary: "nosKill", secondary: "noSkill" }
-3 >                                     
-4 >                                       skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
+2 >    
+3 >        skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
+  >            { primary: "nosKill", secondary: "noSkill" }
+4 >                                     
+5 >                                       skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
   >                                           { primary: "nosKill", secondary: "noSkill" }
-5 >                                                                                                             
-6 >                                                                                                               primary: primaryA = "primary"
-7 >                                                                                                                              
-8 >                                                                                                                                primary: primaryA = "primary"
-9 >                                                                                                                                                                         , 
-10>                                                                                                                                                                           secondary: secondaryA = "secondary"
-11>                                                                                                                                                                                            
-12>                                                                                                                                                                                              secondary: secondaryA = "secondary"
+6 >                                                                                                             
+7 >                                                                                                               primary: primaryA = "primary"
+8 >                                                                                                                              
+9 >                                                                                                                                primary: primaryA = "primary"
+10>                                                                                                                                                                         , 
+11>                                                                                                                                                                           secondary: secondaryA = "secondary"
+12>                                                                                                                                                                                            
+13>                                                                                                                                                                                              secondary: secondaryA = "secondary"
 1->Emitted(23, 5) Source(38, 12) + SourceIndex(0)
-2 >Emitted(23, 38) Source(39, 49) + SourceIndex(0)
-3 >Emitted(23, 40) Source(38, 12) + SourceIndex(0)
-4 >Emitted(23, 110) Source(39, 49) + SourceIndex(0)
-5 >Emitted(23, 112) Source(38, 22) + SourceIndex(0)
-6 >Emitted(23, 127) Source(38, 51) + SourceIndex(0)
-7 >Emitted(23, 129) Source(38, 22) + SourceIndex(0)
-8 >Emitted(23, 170) Source(38, 51) + SourceIndex(0)
-9 >Emitted(23, 172) Source(38, 53) + SourceIndex(0)
-10>Emitted(23, 189) Source(38, 88) + SourceIndex(0)
-11>Emitted(23, 191) Source(38, 53) + SourceIndex(0)
-12>Emitted(23, 236) Source(38, 88) + SourceIndex(0)
+2 >Emitted(23, 9) Source(38, 12) + SourceIndex(0)
+3 >Emitted(23, 38) Source(39, 49) + SourceIndex(0)
+4 >Emitted(23, 40) Source(38, 12) + SourceIndex(0)
+5 >Emitted(23, 110) Source(39, 49) + SourceIndex(0)
+6 >Emitted(23, 112) Source(38, 22) + SourceIndex(0)
+7 >Emitted(23, 127) Source(38, 51) + SourceIndex(0)
+8 >Emitted(23, 129) Source(38, 22) + SourceIndex(0)
+9 >Emitted(23, 170) Source(38, 51) + SourceIndex(0)
+10>Emitted(23, 172) Source(38, 53) + SourceIndex(0)
+11>Emitted(23, 189) Source(38, 88) + SourceIndex(0)
+12>Emitted(23, 191) Source(38, 53) + SourceIndex(0)
+13>Emitted(23, 236) Source(38, 88) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -768,8 +768,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -785,7 +784,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(26, 1) Source(42, 1) + SourceIndex(0)
 2 >Emitted(26, 4) Source(42, 4) + SourceIndex(0)
 3 >Emitted(26, 5) Source(42, 5) + SourceIndex(0)
@@ -799,47 +797,49 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(26, 55) Source(43, 71) + SourceIndex(0)
 12>Emitted(26, 57) Source(43, 55) + SourceIndex(0)
 13>Emitted(26, 61) Source(43, 71) + SourceIndex(0)
-14>Emitted(26, 62) Source(43, 72) + SourceIndex(0)
 ---
 >>>    var _q = _p[_o].skills, _r = _q === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _q, _s = _r.primary, primaryA = _s === void 0 ? "primary" : _s, _t = _r.secondary, secondaryA = _t === void 0 ? "secondary" : _t;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^
-4 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                                                  ^^
-6 >                                                                                                    ^^^^^^^^^^^^^^^
-7 >                                                                                                                   ^^
-8 >                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                                              ^^
-10>                                                                                                                                                                ^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                 ^^
-12>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^
+4 >                          ^^
+5 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                                  ^^
+7 >                                                                                                    ^^^^^^^^^^^^^^^
+8 >                                                                                                                   ^^
+9 >                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                              ^^
+11>                                                                                                                                                                ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                 ^^
+13>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
-  >        { primary: "nosKill", secondary: "noSkill" }
-3 >                          
-4 >                            skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
+2 >    
+3 >        skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
+  >            { primary: "nosKill", secondary: "noSkill" }
+4 >                          
+5 >                            skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
   >                                { primary: "nosKill", secondary: "noSkill" }
-5 >                                                                                                  
-6 >                                                                                                    primary: primaryA = "primary"
-7 >                                                                                                                   
-8 >                                                                                                                     primary: primaryA = "primary"
-9 >                                                                                                                                                              , 
-10>                                                                                                                                                                secondary: secondaryA = "secondary"
-11>                                                                                                                                                                                 
-12>                                                                                                                                                                                   secondary: secondaryA = "secondary"
+6 >                                                                                                  
+7 >                                                                                                    primary: primaryA = "primary"
+8 >                                                                                                                   
+9 >                                                                                                                     primary: primaryA = "primary"
+10>                                                                                                                                                              , 
+11>                                                                                                                                                                secondary: secondaryA = "secondary"
+12>                                                                                                                                                                                 
+13>                                                                                                                                                                                   secondary: secondaryA = "secondary"
 1->Emitted(27, 5) Source(42, 12) + SourceIndex(0)
-2 >Emitted(27, 27) Source(43, 49) + SourceIndex(0)
-3 >Emitted(27, 29) Source(42, 12) + SourceIndex(0)
-4 >Emitted(27, 99) Source(43, 49) + SourceIndex(0)
-5 >Emitted(27, 101) Source(42, 22) + SourceIndex(0)
-6 >Emitted(27, 116) Source(42, 51) + SourceIndex(0)
-7 >Emitted(27, 118) Source(42, 22) + SourceIndex(0)
-8 >Emitted(27, 159) Source(42, 51) + SourceIndex(0)
-9 >Emitted(27, 161) Source(42, 53) + SourceIndex(0)
-10>Emitted(27, 178) Source(42, 88) + SourceIndex(0)
-11>Emitted(27, 180) Source(42, 53) + SourceIndex(0)
-12>Emitted(27, 225) Source(42, 88) + SourceIndex(0)
+2 >Emitted(27, 9) Source(42, 12) + SourceIndex(0)
+3 >Emitted(27, 27) Source(43, 49) + SourceIndex(0)
+4 >Emitted(27, 29) Source(42, 12) + SourceIndex(0)
+5 >Emitted(27, 99) Source(43, 49) + SourceIndex(0)
+6 >Emitted(27, 101) Source(42, 22) + SourceIndex(0)
+7 >Emitted(27, 116) Source(42, 51) + SourceIndex(0)
+8 >Emitted(27, 118) Source(42, 22) + SourceIndex(0)
+9 >Emitted(27, 159) Source(42, 51) + SourceIndex(0)
+10>Emitted(27, 161) Source(42, 53) + SourceIndex(0)
+11>Emitted(27, 178) Source(42, 88) + SourceIndex(0)
+12>Emitted(27, 180) Source(42, 53) + SourceIndex(0)
+13>Emitted(27, 225) Source(42, 88) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -982,8 +982,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>                                                                                ^^^^^^^^^^^^^^
 22>                                                                                              ^^
 23>                                                                                                ^^^^
-24>                                                                                                    ^
-25>                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+24>                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    { 
@@ -1010,7 +1009,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 22>                                                                                              
 23>                                                                                                <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                    )
 1->Emitted(31, 5) Source(49, 5) + SourceIndex(0)
 2 >Emitted(31, 7) Source(49, 7) + SourceIndex(0)
 3 >Emitted(31, 11) Source(49, 11) + SourceIndex(0)
@@ -1034,47 +1032,49 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>Emitted(31, 95) Source(49, 79) + SourceIndex(0)
 22>Emitted(31, 97) Source(48, 5) + SourceIndex(0)
 23>Emitted(31, 101) Source(49, 79) + SourceIndex(0)
-24>Emitted(31, 102) Source(49, 80) + SourceIndex(0)
 ---
 >>>    var _w = _v[_u].skills, _x = _w === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _w, _y = _x.primary, primaryA = _y === void 0 ? "primary" : _y, _z = _x.secondary, secondaryA = _z === void 0 ? "secondary" : _z;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^
-4 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                                                  ^^
-6 >                                                                                                    ^^^^^^^^^^^^^^^
-7 >                                                                                                                   ^^
-8 >                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                                              ^^
-10>                                                                                                                                                                ^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                 ^^
-12>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^
+4 >                          ^^
+5 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                                  ^^
+7 >                                                                                                    ^^^^^^^^^^^^^^^
+8 >                                                                                                                   ^^
+9 >                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                              ^^
+11>                                                                                                                                                                ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                 ^^
+13>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
-  >        { primary: "nosKill", secondary: "noSkill" }
-3 >                          
-4 >                            skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
+2 >    
+3 >        skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
+  >            { primary: "nosKill", secondary: "noSkill" }
+4 >                          
+5 >                            skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
   >                                { primary: "nosKill", secondary: "noSkill" }
-5 >                                                                                                  
-6 >                                                                                                    primary: primaryA = "primary"
-7 >                                                                                                                   
-8 >                                                                                                                     primary: primaryA = "primary"
-9 >                                                                                                                                                              , 
-10>                                                                                                                                                                secondary: secondaryA = "secondary"
-11>                                                                                                                                                                                 
-12>                                                                                                                                                                                   secondary: secondaryA = "secondary"
+6 >                                                                                                  
+7 >                                                                                                    primary: primaryA = "primary"
+8 >                                                                                                                   
+9 >                                                                                                                     primary: primaryA = "primary"
+10>                                                                                                                                                              , 
+11>                                                                                                                                                                secondary: secondaryA = "secondary"
+12>                                                                                                                                                                                 
+13>                                                                                                                                                                                   secondary: secondaryA = "secondary"
 1->Emitted(32, 5) Source(46, 12) + SourceIndex(0)
-2 >Emitted(32, 27) Source(47, 49) + SourceIndex(0)
-3 >Emitted(32, 29) Source(46, 12) + SourceIndex(0)
-4 >Emitted(32, 99) Source(47, 49) + SourceIndex(0)
-5 >Emitted(32, 101) Source(46, 22) + SourceIndex(0)
-6 >Emitted(32, 116) Source(46, 51) + SourceIndex(0)
-7 >Emitted(32, 118) Source(46, 22) + SourceIndex(0)
-8 >Emitted(32, 159) Source(46, 51) + SourceIndex(0)
-9 >Emitted(32, 161) Source(46, 53) + SourceIndex(0)
-10>Emitted(32, 178) Source(46, 88) + SourceIndex(0)
-11>Emitted(32, 180) Source(46, 53) + SourceIndex(0)
-12>Emitted(32, 225) Source(46, 88) + SourceIndex(0)
+2 >Emitted(32, 9) Source(46, 12) + SourceIndex(0)
+3 >Emitted(32, 27) Source(47, 49) + SourceIndex(0)
+4 >Emitted(32, 29) Source(46, 12) + SourceIndex(0)
+5 >Emitted(32, 99) Source(47, 49) + SourceIndex(0)
+6 >Emitted(32, 101) Source(46, 22) + SourceIndex(0)
+7 >Emitted(32, 116) Source(46, 51) + SourceIndex(0)
+8 >Emitted(32, 118) Source(46, 22) + SourceIndex(0)
+9 >Emitted(32, 159) Source(46, 51) + SourceIndex(0)
+10>Emitted(32, 161) Source(46, 53) + SourceIndex(0)
+11>Emitted(32, 178) Source(46, 88) + SourceIndex(0)
+12>Emitted(32, 180) Source(46, 53) + SourceIndex(0)
+13>Emitted(32, 225) Source(46, 88) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1125,8 +1125,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1140,7 +1139,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(35, 1) Source(53, 1) + SourceIndex(0)
 2 >Emitted(35, 4) Source(53, 4) + SourceIndex(0)
 3 >Emitted(35, 5) Source(53, 5) + SourceIndex(0)
@@ -1152,39 +1150,41 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(35, 57) Source(53, 72) + SourceIndex(0)
 10>Emitted(35, 59) Source(53, 66) + SourceIndex(0)
 11>Emitted(35, 63) Source(53, 72) + SourceIndex(0)
-12>Emitted(35, 64) Source(53, 73) + SourceIndex(0)
 ---
 >>>    var _1 = robots_2[_0], _2 = _1.name, nameA = _2 === void 0 ? "noName" : _2, _3 = _1.skill, skillA = _3 === void 0 ? "noSkill" : _3;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^
-3 >                         ^^
-4 >                           ^^^^^^^^^^^^
-5 >                                       ^^
-6 >                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                              ^^
-8 >                                                                                ^^^^^^^^^^^^^
-9 >                                                                                             ^^
-10>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^
+4 >                         ^^
+5 >                           ^^^^^^^^^^^^
+6 >                                       ^^
+7 >                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                              ^^
+9 >                                                                                ^^^^^^^^^^^^^
+10>                                                                                             ^^
+11>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA = "noName", skill: skillA = "noSkill" }
-3 >                         
-4 >                           name: nameA = "noName"
-5 >                                       
-6 >                                         name: nameA = "noName"
-7 >                                                                              , 
-8 >                                                                                skill: skillA = "noSkill"
-9 >                                                                                             
-10>                                                                                               skill: skillA = "noSkill"
-1->Emitted(36, 5) Source(53, 6) + SourceIndex(0)
-2 >Emitted(36, 26) Source(53, 62) + SourceIndex(0)
-3 >Emitted(36, 28) Source(53, 11) + SourceIndex(0)
-4 >Emitted(36, 40) Source(53, 33) + SourceIndex(0)
-5 >Emitted(36, 42) Source(53, 11) + SourceIndex(0)
-6 >Emitted(36, 79) Source(53, 33) + SourceIndex(0)
-7 >Emitted(36, 81) Source(53, 35) + SourceIndex(0)
-8 >Emitted(36, 94) Source(53, 60) + SourceIndex(0)
-9 >Emitted(36, 96) Source(53, 35) + SourceIndex(0)
-10>Emitted(36, 135) Source(53, 60) + SourceIndex(0)
+2 >    
+3 >        {name: nameA = "noName", skill: skillA = "noSkill" }
+4 >                         
+5 >                           name: nameA = "noName"
+6 >                                       
+7 >                                         name: nameA = "noName"
+8 >                                                                              , 
+9 >                                                                                skill: skillA = "noSkill"
+10>                                                                                             
+11>                                                                                               skill: skillA = "noSkill"
+1->Emitted(36, 5) Source(53, 10) + SourceIndex(0)
+2 >Emitted(36, 9) Source(53, 10) + SourceIndex(0)
+3 >Emitted(36, 26) Source(53, 62) + SourceIndex(0)
+4 >Emitted(36, 28) Source(53, 11) + SourceIndex(0)
+5 >Emitted(36, 40) Source(53, 33) + SourceIndex(0)
+6 >Emitted(36, 42) Source(53, 11) + SourceIndex(0)
+7 >Emitted(36, 79) Source(53, 33) + SourceIndex(0)
+8 >Emitted(36, 81) Source(53, 35) + SourceIndex(0)
+9 >Emitted(36, 94) Source(53, 60) + SourceIndex(0)
+10>Emitted(36, 96) Source(53, 35) + SourceIndex(0)
+11>Emitted(36, 135) Source(53, 60) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1234,8 +1234,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1250,7 +1249,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(39, 1) Source(56, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(56, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(56, 5) + SourceIndex(0)
@@ -1264,39 +1262,41 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(39, 50) Source(56, 78) + SourceIndex(0)
 12>Emitted(39, 52) Source(56, 67) + SourceIndex(0)
 13>Emitted(39, 56) Source(56, 78) + SourceIndex(0)
-14>Emitted(39, 57) Source(56, 79) + SourceIndex(0)
 ---
 >>>    var _6 = _5[_4], _7 = _6.name, nameA = _7 === void 0 ? "noName" : _7, _8 = _6.skill, skillA = _8 === void 0 ? "noSkill" : _8;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^
-3 >                   ^^
-4 >                     ^^^^^^^^^^^^
-5 >                                 ^^
-6 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                        ^^
-8 >                                                                          ^^^^^^^^^^^^^
-9 >                                                                                       ^^
-10>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^
+4 >                   ^^
+5 >                     ^^^^^^^^^^^^
+6 >                                 ^^
+7 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                        ^^
+9 >                                                                          ^^^^^^^^^^^^^
+10>                                                                                       ^^
+11>                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA = "noName", skill: skillA = "noSkill"  }
-3 >                   
-4 >                     name: nameA = "noName"
-5 >                                 
-6 >                                   name: nameA = "noName"
-7 >                                                                        , 
-8 >                                                                          skill: skillA = "noSkill"
-9 >                                                                                       
-10>                                                                                         skill: skillA = "noSkill"
-1->Emitted(40, 5) Source(56, 6) + SourceIndex(0)
-2 >Emitted(40, 20) Source(56, 63) + SourceIndex(0)
-3 >Emitted(40, 22) Source(56, 11) + SourceIndex(0)
-4 >Emitted(40, 34) Source(56, 33) + SourceIndex(0)
-5 >Emitted(40, 36) Source(56, 11) + SourceIndex(0)
-6 >Emitted(40, 73) Source(56, 33) + SourceIndex(0)
-7 >Emitted(40, 75) Source(56, 35) + SourceIndex(0)
-8 >Emitted(40, 88) Source(56, 60) + SourceIndex(0)
-9 >Emitted(40, 90) Source(56, 35) + SourceIndex(0)
-10>Emitted(40, 129) Source(56, 60) + SourceIndex(0)
+2 >    
+3 >        {name: nameA = "noName", skill: skillA = "noSkill"  }
+4 >                   
+5 >                     name: nameA = "noName"
+6 >                                 
+7 >                                   name: nameA = "noName"
+8 >                                                                        , 
+9 >                                                                          skill: skillA = "noSkill"
+10>                                                                                       
+11>                                                                                         skill: skillA = "noSkill"
+1->Emitted(40, 5) Source(56, 10) + SourceIndex(0)
+2 >Emitted(40, 9) Source(56, 10) + SourceIndex(0)
+3 >Emitted(40, 20) Source(56, 63) + SourceIndex(0)
+4 >Emitted(40, 22) Source(56, 11) + SourceIndex(0)
+5 >Emitted(40, 34) Source(56, 33) + SourceIndex(0)
+6 >Emitted(40, 36) Source(56, 11) + SourceIndex(0)
+7 >Emitted(40, 73) Source(56, 33) + SourceIndex(0)
+8 >Emitted(40, 75) Source(56, 35) + SourceIndex(0)
+9 >Emitted(40, 88) Source(56, 60) + SourceIndex(0)
+10>Emitted(40, 90) Source(56, 35) + SourceIndex(0)
+11>Emitted(40, 129) Source(56, 60) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1364,8 +1364,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                     ^^^^^^^^^^^^^^^
 30>                                                                                                                    ^^
 31>                                                                                                                      ^^^^
-32>                                                                                                                          ^
-33>                                                                                                                           ^^^^^^^^^^^^^^^^^->
+32>                                                                                                                          ^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1398,7 +1397,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                     [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                    
 31>                                                                                                                      [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                          )
 1->Emitted(43, 1) Source(59, 1) + SourceIndex(0)
 2 >Emitted(43, 4) Source(59, 4) + SourceIndex(0)
 3 >Emitted(43, 5) Source(59, 5) + SourceIndex(0)
@@ -1430,39 +1428,41 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>Emitted(43, 117) Source(59, 143) + SourceIndex(0)
 30>Emitted(43, 119) Source(59, 67) + SourceIndex(0)
 31>Emitted(43, 123) Source(59, 143) + SourceIndex(0)
-32>Emitted(43, 124) Source(59, 144) + SourceIndex(0)
 ---
 >>>    var _11 = _10[_9], _12 = _11.name, nameA = _12 === void 0 ? "noName" : _12, _13 = _11.skill, skillA = _13 === void 0 ? "noSkill" : _13;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^
-4 >                       ^^^^^^^^^^^^^^
-5 >                                     ^^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                              ^^
-8 >                                                                                ^^^^^^^^^^^^^^^
-9 >                                                                                               ^^
-10>                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^
+4 >                     ^^
+5 >                       ^^^^^^^^^^^^^^
+6 >                                     ^^
+7 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                              ^^
+9 >                                                                                ^^^^^^^^^^^^^^^
+10>                                                                                               ^^
+11>                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {name: nameA = "noName", skill: skillA = "noSkill"  }
-3 >                     
-4 >                       name: nameA = "noName"
-5 >                                     
-6 >                                       name: nameA = "noName"
-7 >                                                                              , 
-8 >                                                                                skill: skillA = "noSkill"
-9 >                                                                                               
-10>                                                                                                 skill: skillA = "noSkill"
-1->Emitted(44, 5) Source(59, 6) + SourceIndex(0)
-2 >Emitted(44, 22) Source(59, 63) + SourceIndex(0)
-3 >Emitted(44, 24) Source(59, 11) + SourceIndex(0)
-4 >Emitted(44, 38) Source(59, 33) + SourceIndex(0)
-5 >Emitted(44, 40) Source(59, 11) + SourceIndex(0)
-6 >Emitted(44, 79) Source(59, 33) + SourceIndex(0)
-7 >Emitted(44, 81) Source(59, 35) + SourceIndex(0)
-8 >Emitted(44, 96) Source(59, 60) + SourceIndex(0)
-9 >Emitted(44, 98) Source(59, 35) + SourceIndex(0)
-10>Emitted(44, 139) Source(59, 60) + SourceIndex(0)
+2 >    
+3 >        {name: nameA = "noName", skill: skillA = "noSkill"  }
+4 >                     
+5 >                       name: nameA = "noName"
+6 >                                     
+7 >                                       name: nameA = "noName"
+8 >                                                                              , 
+9 >                                                                                skill: skillA = "noSkill"
+10>                                                                                               
+11>                                                                                                 skill: skillA = "noSkill"
+1->Emitted(44, 5) Source(59, 10) + SourceIndex(0)
+2 >Emitted(44, 9) Source(59, 10) + SourceIndex(0)
+3 >Emitted(44, 22) Source(59, 63) + SourceIndex(0)
+4 >Emitted(44, 24) Source(59, 11) + SourceIndex(0)
+5 >Emitted(44, 38) Source(59, 33) + SourceIndex(0)
+6 >Emitted(44, 40) Source(59, 11) + SourceIndex(0)
+7 >Emitted(44, 79) Source(59, 33) + SourceIndex(0)
+8 >Emitted(44, 81) Source(59, 35) + SourceIndex(0)
+9 >Emitted(44, 96) Source(59, 60) + SourceIndex(0)
+10>Emitted(44, 98) Source(59, 35) + SourceIndex(0)
+11>Emitted(44, 139) Source(59, 60) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1510,8 +1510,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1530,7 +1529,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(47, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(47, 4) Source(62, 4) + SourceIndex(0)
 3 >Emitted(47, 5) Source(62, 5) + SourceIndex(0)
@@ -1542,77 +1540,79 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(47, 74) Source(68, 17) + SourceIndex(0)
 10>Emitted(47, 76) Source(68, 6) + SourceIndex(0)
 11>Emitted(47, 81) Source(68, 17) + SourceIndex(0)
-12>Emitted(47, 82) Source(68, 18) + SourceIndex(0)
 ---
 >>>    var _15 = multiRobots_2[_14], _16 = _15.name, nameA = _16 === void 0 ? "noName" : _16, _17 = _15.skills, _18 = _17 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _17, _19 = _18.primary, primaryA = _19 === void 0 ? "primary" : _19, _20 = _18.secondary, secondaryA = _20 === void 0 ? "secondary" : _20;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                ^^
-4 >                                  ^^^^^^^^^^^^^^
-5 >                                                ^^
-6 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                         ^^
-8 >                                                                                           ^^^^^^^^^^^^^^^^
-9 >                                                                                                           ^^
-10>                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                      ^^
-12>                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                                         ^^
-14>                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                                      ^^
-16>                                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                           ^^
-18>                                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                ^^
+5 >                                  ^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                                         ^^
+9 >                                                                                           ^^^^^^^^^^^^^^^^
+10>                                                                                                           ^^
+11>                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                      ^^
+13>                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                         ^^
+15>                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                      ^^
+17>                                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                           ^^
+19>                                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {
-  >        name: nameA = "noName",
-  >        skills: {
-  >            primary: primaryA = "primary",
-  >            secondary: secondaryA = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                                
-4 >                                  name: nameA = "noName"
-5 >                                                
-6 >                                                  name: nameA = "noName"
-7 >                                                                                         ,
+2 >    
+3 >        {
+  >            name: nameA = "noName",
+  >            skills: {
+  >                primary: primaryA = "primary",
+  >                secondary: secondaryA = "secondary"
+  >            } = { primary: "noSkill", secondary: "noSkill" }
+  >        }
+4 >                                
+5 >                                  name: nameA = "noName"
+6 >                                                
+7 >                                                  name: nameA = "noName"
+8 >                                                                                         ,
   >                                                                                             
-8 >                                                                                           skills: {
+9 >                                                                                           skills: {
   >                                                                                                   primary: primaryA = "primary",
   >                                                                                                   secondary: secondaryA = "secondary"
   >                                                                                               } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                                           
-10>                                                                                                             skills: {
+10>                                                                                                           
+11>                                                                                                             skills: {
   >                                                                                                                     primary: primaryA = "primary",
   >                                                                                                                     secondary: secondaryA = "secondary"
   >                                                                                                                 } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                                      
-12>                                                                                                                                                                                        primary: primaryA = "primary"
-13>                                                                                                                                                                                                         
-14>                                                                                                                                                                                                           primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                                      ,
+12>                                                                                                                                                                                      
+13>                                                                                                                                                                                        primary: primaryA = "primary"
+14>                                                                                                                                                                                                         
+15>                                                                                                                                                                                                           primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                                      ,
   >                                                                                                                                                                                                                                                              
-16>                                                                                                                                                                                                                                                        secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                                           
-18>                                                                                                                                                                                                                                                                             secondary: secondaryA = "secondary"
-1->Emitted(48, 5) Source(62, 6) + SourceIndex(0)
-2 >Emitted(48, 33) Source(68, 2) + SourceIndex(0)
-3 >Emitted(48, 35) Source(63, 5) + SourceIndex(0)
-4 >Emitted(48, 49) Source(63, 27) + SourceIndex(0)
-5 >Emitted(48, 51) Source(63, 5) + SourceIndex(0)
-6 >Emitted(48, 90) Source(63, 27) + SourceIndex(0)
-7 >Emitted(48, 92) Source(64, 5) + SourceIndex(0)
-8 >Emitted(48, 108) Source(67, 53) + SourceIndex(0)
-9 >Emitted(48, 110) Source(64, 5) + SourceIndex(0)
-10>Emitted(48, 183) Source(67, 53) + SourceIndex(0)
-11>Emitted(48, 185) Source(65, 9) + SourceIndex(0)
-12>Emitted(48, 202) Source(65, 38) + SourceIndex(0)
-13>Emitted(48, 204) Source(65, 9) + SourceIndex(0)
-14>Emitted(48, 247) Source(65, 38) + SourceIndex(0)
-15>Emitted(48, 249) Source(66, 9) + SourceIndex(0)
-16>Emitted(48, 268) Source(66, 44) + SourceIndex(0)
-17>Emitted(48, 270) Source(66, 9) + SourceIndex(0)
-18>Emitted(48, 317) Source(66, 44) + SourceIndex(0)
+17>                                                                                                                                                                                                                                                        secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                                                           
+19>                                                                                                                                                                                                                                                                             secondary: secondaryA = "secondary"
+1->Emitted(48, 5) Source(62, 10) + SourceIndex(0)
+2 >Emitted(48, 9) Source(62, 10) + SourceIndex(0)
+3 >Emitted(48, 33) Source(68, 2) + SourceIndex(0)
+4 >Emitted(48, 35) Source(63, 5) + SourceIndex(0)
+5 >Emitted(48, 49) Source(63, 27) + SourceIndex(0)
+6 >Emitted(48, 51) Source(63, 5) + SourceIndex(0)
+7 >Emitted(48, 90) Source(63, 27) + SourceIndex(0)
+8 >Emitted(48, 92) Source(64, 5) + SourceIndex(0)
+9 >Emitted(48, 108) Source(67, 53) + SourceIndex(0)
+10>Emitted(48, 110) Source(64, 5) + SourceIndex(0)
+11>Emitted(48, 183) Source(67, 53) + SourceIndex(0)
+12>Emitted(48, 185) Source(65, 9) + SourceIndex(0)
+13>Emitted(48, 202) Source(65, 38) + SourceIndex(0)
+14>Emitted(48, 204) Source(65, 9) + SourceIndex(0)
+15>Emitted(48, 247) Source(65, 38) + SourceIndex(0)
+16>Emitted(48, 249) Source(66, 9) + SourceIndex(0)
+17>Emitted(48, 268) Source(66, 44) + SourceIndex(0)
+18>Emitted(48, 270) Source(66, 9) + SourceIndex(0)
+19>Emitted(48, 317) Source(66, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1664,8 +1664,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1686,7 +1685,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(51, 1) Source(71, 1) + SourceIndex(0)
 2 >Emitted(51, 4) Source(71, 4) + SourceIndex(0)
 3 >Emitted(51, 5) Source(71, 5) + SourceIndex(0)
@@ -1700,77 +1698,79 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(51, 59) Source(77, 22) + SourceIndex(0)
 12>Emitted(51, 61) Source(77, 6) + SourceIndex(0)
 13>Emitted(51, 66) Source(77, 22) + SourceIndex(0)
-14>Emitted(51, 67) Source(77, 23) + SourceIndex(0)
 ---
 >>>    var _23 = _22[_21], _24 = _23.name, nameA = _24 === void 0 ? "noName" : _24, _25 = _23.skills, _26 = _25 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _25, _27 = _26.primary, primaryA = _27 === void 0 ? "primary" : _27, _28 = _26.secondary, secondaryA = _28 === void 0 ? "secondary" : _28;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^
-5 >                                      ^^
-6 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^^^^^^^
-9 >                                                                                                 ^^
-10>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                            ^^
-12>                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                               ^^
-14>                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                            ^^
-16>                                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                 ^^
-18>                                                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^
+6 >                                      ^^
+7 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                               ^^
+9 >                                                                                 ^^^^^^^^^^^^^^^^
+10>                                                                                                 ^^
+11>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                            ^^
+13>                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                               ^^
+15>                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                            ^^
+17>                                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                 ^^
+19>                                                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {
-  >        name: nameA = "noName",
-  >        skills: {
-  >            primary: primaryA = "primary",
-  >            secondary: secondaryA = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                      
-4 >                        name: nameA = "noName"
-5 >                                      
-6 >                                        name: nameA = "noName"
-7 >                                                                               ,
+2 >    
+3 >        {
+  >            name: nameA = "noName",
+  >            skills: {
+  >                primary: primaryA = "primary",
+  >                secondary: secondaryA = "secondary"
+  >            } = { primary: "noSkill", secondary: "noSkill" }
+  >        }
+4 >                      
+5 >                        name: nameA = "noName"
+6 >                                      
+7 >                                        name: nameA = "noName"
+8 >                                                                               ,
   >                                                                                   
-8 >                                                                                 skills: {
+9 >                                                                                 skills: {
   >                                                                                         primary: primaryA = "primary",
   >                                                                                         secondary: secondaryA = "secondary"
   >                                                                                     } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                                 
-10>                                                                                                   skills: {
+10>                                                                                                 
+11>                                                                                                   skills: {
   >                                                                                                           primary: primaryA = "primary",
   >                                                                                                           secondary: secondaryA = "secondary"
   >                                                                                                       } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                            
-12>                                                                                                                                                                              primary: primaryA = "primary"
-13>                                                                                                                                                                                               
-14>                                                                                                                                                                                                 primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                            ,
+12>                                                                                                                                                                            
+13>                                                                                                                                                                              primary: primaryA = "primary"
+14>                                                                                                                                                                                               
+15>                                                                                                                                                                                                 primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                            ,
   >                                                                                                                                                                                                                                                    
-16>                                                                                                                                                                                                                                              secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                                 
-18>                                                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
-1->Emitted(52, 5) Source(71, 6) + SourceIndex(0)
-2 >Emitted(52, 23) Source(77, 2) + SourceIndex(0)
-3 >Emitted(52, 25) Source(72, 5) + SourceIndex(0)
-4 >Emitted(52, 39) Source(72, 27) + SourceIndex(0)
-5 >Emitted(52, 41) Source(72, 5) + SourceIndex(0)
-6 >Emitted(52, 80) Source(72, 27) + SourceIndex(0)
-7 >Emitted(52, 82) Source(73, 5) + SourceIndex(0)
-8 >Emitted(52, 98) Source(76, 53) + SourceIndex(0)
-9 >Emitted(52, 100) Source(73, 5) + SourceIndex(0)
-10>Emitted(52, 173) Source(76, 53) + SourceIndex(0)
-11>Emitted(52, 175) Source(74, 9) + SourceIndex(0)
-12>Emitted(52, 192) Source(74, 38) + SourceIndex(0)
-13>Emitted(52, 194) Source(74, 9) + SourceIndex(0)
-14>Emitted(52, 237) Source(74, 38) + SourceIndex(0)
-15>Emitted(52, 239) Source(75, 9) + SourceIndex(0)
-16>Emitted(52, 258) Source(75, 44) + SourceIndex(0)
-17>Emitted(52, 260) Source(75, 9) + SourceIndex(0)
-18>Emitted(52, 307) Source(75, 44) + SourceIndex(0)
+17>                                                                                                                                                                                                                                              secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                                                 
+19>                                                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
+1->Emitted(52, 5) Source(71, 10) + SourceIndex(0)
+2 >Emitted(52, 9) Source(71, 10) + SourceIndex(0)
+3 >Emitted(52, 23) Source(77, 2) + SourceIndex(0)
+4 >Emitted(52, 25) Source(72, 5) + SourceIndex(0)
+5 >Emitted(52, 39) Source(72, 27) + SourceIndex(0)
+6 >Emitted(52, 41) Source(72, 5) + SourceIndex(0)
+7 >Emitted(52, 80) Source(72, 27) + SourceIndex(0)
+8 >Emitted(52, 82) Source(73, 5) + SourceIndex(0)
+9 >Emitted(52, 98) Source(76, 53) + SourceIndex(0)
+10>Emitted(52, 100) Source(73, 5) + SourceIndex(0)
+11>Emitted(52, 173) Source(76, 53) + SourceIndex(0)
+12>Emitted(52, 175) Source(74, 9) + SourceIndex(0)
+13>Emitted(52, 192) Source(74, 38) + SourceIndex(0)
+14>Emitted(52, 194) Source(74, 9) + SourceIndex(0)
+15>Emitted(52, 237) Source(74, 38) + SourceIndex(0)
+16>Emitted(52, 239) Source(75, 9) + SourceIndex(0)
+17>Emitted(52, 258) Source(75, 44) + SourceIndex(0)
+18>Emitted(52, 260) Source(75, 9) + SourceIndex(0)
+19>Emitted(52, 307) Source(75, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -1918,8 +1918,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>                                                                                ^^^^^^^^^^^^^^^^
 22>                                                                                                ^^
 23>                                                                                                  ^^^^^
-24>                                                                                                       ^
-25>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+24>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    { 
@@ -1946,7 +1945,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 22>                                                                                                
 23>                                                                                                  <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                      { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                       )
 1->Emitted(56, 5) Source(87, 5) + SourceIndex(0)
 2 >Emitted(56, 7) Source(87, 7) + SourceIndex(0)
 3 >Emitted(56, 11) Source(87, 11) + SourceIndex(0)
@@ -1970,77 +1968,79 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>Emitted(56, 97) Source(87, 79) + SourceIndex(0)
 22>Emitted(56, 99) Source(86, 6) + SourceIndex(0)
 23>Emitted(56, 104) Source(87, 79) + SourceIndex(0)
-24>Emitted(56, 105) Source(87, 80) + SourceIndex(0)
 ---
 >>>    var _31 = _30[_29], _32 = _31.name, nameA = _32 === void 0 ? "noName" : _32, _33 = _31.skills, _34 = _33 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _33, _35 = _34.primary, primaryA = _35 === void 0 ? "primary" : _35, _36 = _34.secondary, secondaryA = _36 === void 0 ? "secondary" : _36;
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^
-5 >                                      ^^
-6 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^^^^^^^
-9 >                                                                                                 ^^
-10>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                            ^^
-12>                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                               ^^
-14>                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                            ^^
-16>                                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                 ^^
-18>                                                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^
+6 >                                      ^^
+7 >                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                               ^^
+9 >                                                                                 ^^^^^^^^^^^^^^^^
+10>                                                                                                 ^^
+11>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                            ^^
+13>                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                               ^^
+15>                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                            ^^
+17>                                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                 ^^
+19>                                                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    let {
-  >        name: nameA = "noName",
-  >        skills: {
-  >            primary: primaryA = "primary",
-  >            secondary: secondaryA = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                      
-4 >                        name: nameA = "noName"
-5 >                                      
-6 >                                        name: nameA = "noName"
-7 >                                                                               ,
+2 >    
+3 >        {
+  >            name: nameA = "noName",
+  >            skills: {
+  >                primary: primaryA = "primary",
+  >                secondary: secondaryA = "secondary"
+  >            } = { primary: "noSkill", secondary: "noSkill" }
+  >        }
+4 >                      
+5 >                        name: nameA = "noName"
+6 >                                      
+7 >                                        name: nameA = "noName"
+8 >                                                                               ,
   >                                                                                   
-8 >                                                                                 skills: {
+9 >                                                                                 skills: {
   >                                                                                         primary: primaryA = "primary",
   >                                                                                         secondary: secondaryA = "secondary"
   >                                                                                     } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                                 
-10>                                                                                                   skills: {
+10>                                                                                                 
+11>                                                                                                   skills: {
   >                                                                                                           primary: primaryA = "primary",
   >                                                                                                           secondary: secondaryA = "secondary"
   >                                                                                                       } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                            
-12>                                                                                                                                                                              primary: primaryA = "primary"
-13>                                                                                                                                                                                               
-14>                                                                                                                                                                                                 primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                            ,
+12>                                                                                                                                                                            
+13>                                                                                                                                                                              primary: primaryA = "primary"
+14>                                                                                                                                                                                               
+15>                                                                                                                                                                                                 primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                            ,
   >                                                                                                                                                                                                                                                    
-16>                                                                                                                                                                                                                                              secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                                 
-18>                                                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
-1->Emitted(57, 5) Source(80, 6) + SourceIndex(0)
-2 >Emitted(57, 23) Source(86, 2) + SourceIndex(0)
-3 >Emitted(57, 25) Source(81, 5) + SourceIndex(0)
-4 >Emitted(57, 39) Source(81, 27) + SourceIndex(0)
-5 >Emitted(57, 41) Source(81, 5) + SourceIndex(0)
-6 >Emitted(57, 80) Source(81, 27) + SourceIndex(0)
-7 >Emitted(57, 82) Source(82, 5) + SourceIndex(0)
-8 >Emitted(57, 98) Source(85, 53) + SourceIndex(0)
-9 >Emitted(57, 100) Source(82, 5) + SourceIndex(0)
-10>Emitted(57, 173) Source(85, 53) + SourceIndex(0)
-11>Emitted(57, 175) Source(83, 9) + SourceIndex(0)
-12>Emitted(57, 192) Source(83, 38) + SourceIndex(0)
-13>Emitted(57, 194) Source(83, 9) + SourceIndex(0)
-14>Emitted(57, 237) Source(83, 38) + SourceIndex(0)
-15>Emitted(57, 239) Source(84, 9) + SourceIndex(0)
-16>Emitted(57, 258) Source(84, 44) + SourceIndex(0)
-17>Emitted(57, 260) Source(84, 9) + SourceIndex(0)
-18>Emitted(57, 307) Source(84, 44) + SourceIndex(0)
+17>                                                                                                                                                                                                                                              secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                                                 
+19>                                                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
+1->Emitted(57, 5) Source(80, 10) + SourceIndex(0)
+2 >Emitted(57, 9) Source(80, 10) + SourceIndex(0)
+3 >Emitted(57, 23) Source(86, 2) + SourceIndex(0)
+4 >Emitted(57, 25) Source(81, 5) + SourceIndex(0)
+5 >Emitted(57, 39) Source(81, 27) + SourceIndex(0)
+6 >Emitted(57, 41) Source(81, 5) + SourceIndex(0)
+7 >Emitted(57, 80) Source(81, 27) + SourceIndex(0)
+8 >Emitted(57, 82) Source(82, 5) + SourceIndex(0)
+9 >Emitted(57, 98) Source(85, 53) + SourceIndex(0)
+10>Emitted(57, 100) Source(82, 5) + SourceIndex(0)
+11>Emitted(57, 173) Source(85, 53) + SourceIndex(0)
+12>Emitted(57, 175) Source(83, 9) + SourceIndex(0)
+13>Emitted(57, 192) Source(83, 38) + SourceIndex(0)
+14>Emitted(57, 194) Source(83, 9) + SourceIndex(0)
+15>Emitted(57, 237) Source(83, 38) + SourceIndex(0)
+16>Emitted(57, 239) Source(84, 9) + SourceIndex(0)
+17>Emitted(57, 258) Source(84, 44) + SourceIndex(0)
+18>Emitted(57, 260) Source(84, 9) + SourceIndex(0)
+19>Emitted(57, 307) Source(84, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map
index 0529919c803..645808f0709 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAA8B,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAAnC,sBAAsB,EAAtB,qCAAsB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8B,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAxC,gBAAsB,EAAtB,qCAAsB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8B,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAAzG,gBAAsB,EAAtB,qCAAsB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CACkD,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAD3D,6BACyC,EADzC,sEACyC,EAD/B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CACkD,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB,CAAC;IADhE,kBACyC,EADzC,sEACyC,EAD/B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAEA,UAC8E,EAD9E,KAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC9E,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9E,cAC8E,EAD9E,IAC8E,CAAC;IAH5E,kBACyC,EADzC,sEACyC,EAD/B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAI/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAED,GAAG,CAAC,CAAwB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,CAAC;IAA5B,sBAAe,EAAf,oCAAe;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAwB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW,CAAC;IAAjC,gBAAe,EAAf,oCAAe;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAwB,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E,CAAC;IAAlG,gBAAe,EAAf,oCAAe;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAKC,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,CAAC;IAJb,6BAGgD,EAHhD,uEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAKC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IAJlB,qBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAKC,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,CAAC;IAL3E,qBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAI3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAGD,GAAG,CAAC,CAAyD,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAA/D,mBAAoD,EAAnD,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA0D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAArE,cAAqD,EAApD,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA0D,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,CAAC;IAAtI,cAAqD,EAApD,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IANZ,wBAMJ,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IANjB,cAMJ,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,CAAC;IAP1E,cAMJ,EALG,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAA4C,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,CAAC;IAAlD,mBAAuC,EAArC,cAAe,EAAf,sCAAe,EAAE,eAAkB,EAAlB,wCAAkB;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,CAAC;IAAvD,cAAuC,EAArC,cAAe,EAAf,sCAAe,EAAE,eAAiB,EAAjB,wCAAiB;IACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,CAAC;IAAxH,cAAuC,EAArC,cAAe,EAAf,sCAAe,EAAE,eAAkB,EAAlB,wCAAkB;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,CAAC;IANZ,wBAMJ,EALG,cAAe,EAAf,sCAAe,EACf,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,CAAC;IANjB,cAMJ,EALG,cAAe,EAAf,sCAAe,EACf,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,CAAC;IAP1E,cAMJ,EALG,cAAe,EAAf,sCAAe,EACf,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAI3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E;IACI,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED;IACI,MAAM,CAAC,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAA8B,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAAlC,sBAAsB,EAAtB,qCAAsB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8B,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAvC,gBAAsB,EAAtB,qCAAsB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA8B,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAAxG,gBAAsB,EAAtB,qCAAsB;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CACkD,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAD1D,6BACyC,EADzC,sEACyC,EAD/B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CACkD,UAAgB,EAAhB,KAAA,cAAc,EAAE,EAAhB,cAAgB,EAAhB,IAAgB;IAD/D,kBACyC,EADzC,sEACyC,EAD/B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAEA,UAC8E,EAD9E,KAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC9E,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9E,cAC8E,EAD9E,IAC8E;IAH3E,kBACyC,EADzC,sEACyC,EAD/B,eAA6B,EAA7B,yCAA6B,EAAE,iBAAmC,EAAnC,6CAAmC;IAI/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAED,GAAG,CAAC,CAAwB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;IAA3B,sBAAe,EAAf,oCAAe;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAwB,UAAW,EAAX,KAAA,SAAS,EAAE,EAAX,cAAW,EAAX,IAAW;IAAhC,gBAAe,EAAf,oCAAe;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAAwB,UAA4E,EAA5E,MAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,cAA4E,EAA5E,IAA4E;IAAjG,gBAAe,EAAf,oCAAe;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAKC,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW;IAJZ,6BAGgD,EAHhD,uEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAKC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;IAJjB,qBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AACD,GAAG,CAAC,CAKC,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE;IAL1E,qBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAI3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;CACzB;AAGD,GAAG,CAAC,CAAyD,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;yBAA7D,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA0D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;oBAAnE,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA0D,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E;oBAApI,cAAsB,EAAtB,uCAAsB,EAAE,eAAyB,EAAzB,yCAAyB;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;8BALZ,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;oBALjB,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE;oBAN1E,cAAsB,EAAtB,uCAAsB,EACtB,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AAED,GAAG,CAAC,CAA4C,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM;yBAA/C,cAAe,EAAf,sCAAe,EAAE,eAAkB,EAAlB,wCAAkB;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW;oBAApD,cAAe,EAAf,sCAAe,EAAE,eAAiB,EAAjB,wCAAiB;IACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAA4C,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E;oBAArH,cAAe,EAAf,sCAAe,EAAE,eAAkB,EAAlB,wCAAkB;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW;8BALZ,cAAe,EAAf,sCAAe,EACf,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB;oBALjB,cAAe,EAAf,sCAAe,EACf,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB;AACD,GAAG,CAAC,CAMC,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE;oBAN1E,cAAe,EAAf,sCAAe,EACf,gBAGgD,EAHhD,yEAGgD,EAF5C,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAI3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;CACtB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.sourcemap.txt
index f80a065e9ce..82d95b72094 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.sourcemap.txt
@@ -394,8 +394,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^^->
+12>                                                              ^^^^^->
 1->
   >
   >
@@ -409,7 +408,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(12, 1) Source(32, 1) + SourceIndex(0)
 2 >Emitted(12, 4) Source(32, 4) + SourceIndex(0)
 3 >Emitted(12, 5) Source(32, 5) + SourceIndex(0)
@@ -421,7 +419,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(12, 57) Source(32, 41) + SourceIndex(0)
 10>Emitted(12, 59) Source(32, 35) + SourceIndex(0)
 11>Emitted(12, 63) Source(32, 41) + SourceIndex(0)
-12>Emitted(12, 64) Source(32, 42) + SourceIndex(0)
 ---
 >>>    _a = robots_1[_i].name, nameA = _a === void 0 ? "noName" : _a;
 1->^^^^
@@ -485,8 +482,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^^->
+14>                                                       ^^^^^^->
 1->
   >
 2 >for
@@ -501,7 +497,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(16, 1) Source(35, 1) + SourceIndex(0)
 2 >Emitted(16, 4) Source(35, 4) + SourceIndex(0)
 3 >Emitted(16, 5) Source(35, 5) + SourceIndex(0)
@@ -515,7 +510,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(16, 50) Source(35, 46) + SourceIndex(0)
 12>Emitted(16, 52) Source(35, 35) + SourceIndex(0)
 13>Emitted(16, 56) Source(35, 46) + SourceIndex(0)
-14>Emitted(16, 57) Source(35, 47) + SourceIndex(0)
 ---
 >>>    _d = _c[_b].name, nameA = _d === void 0 ? "noName" : _d;
 1->^^^^
@@ -597,7 +591,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -630,7 +623,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(20, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(20, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(20, 5) Source(38, 5) + SourceIndex(0)
@@ -662,7 +654,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>Emitted(20, 115) Source(38, 111) + SourceIndex(0)
 30>Emitted(20, 117) Source(38, 35) + SourceIndex(0)
 31>Emitted(20, 121) Source(38, 111) + SourceIndex(0)
-32>Emitted(20, 122) Source(38, 112) + SourceIndex(0)
 ---
 >>>    _g = _f[_e].name, nameA = _g === void 0 ? "noName" : _g;
 1 >^^^^
@@ -724,8 +715,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -739,7 +729,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(24, 1) Source(41, 1) + SourceIndex(0)
 2 >Emitted(24, 4) Source(41, 4) + SourceIndex(0)
 3 >Emitted(24, 5) Source(41, 5) + SourceIndex(0)
@@ -751,7 +740,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(24, 72) Source(42, 66) + SourceIndex(0)
 10>Emitted(24, 74) Source(42, 55) + SourceIndex(0)
 11>Emitted(24, 78) Source(42, 66) + SourceIndex(0)
-12>Emitted(24, 79) Source(42, 67) + SourceIndex(0)
 ---
 >>>    _j = multiRobots_1[_h].skills, _k = _j === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _j, _l = _k.primary, primaryA = _l === void 0 ? "primary" : _l, _m = _k.secondary, secondaryA = _m === void 0 ? "secondary" : _m;
 1->^^^^
@@ -842,8 +830,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                        ^^^^^^^^^^^^^^
 12>                                                      ^^
 13>                                                        ^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -859,7 +846,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                        getMultiRobots()
 12>                                                      
 13>                                                        getMultiRobots()
-14>                                                            )
 1->Emitted(28, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(28, 4) Source(45, 4) + SourceIndex(0)
 3 >Emitted(28, 5) Source(45, 5) + SourceIndex(0)
@@ -873,7 +859,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(28, 55) Source(46, 71) + SourceIndex(0)
 12>Emitted(28, 57) Source(46, 55) + SourceIndex(0)
 13>Emitted(28, 61) Source(46, 71) + SourceIndex(0)
-14>Emitted(28, 62) Source(46, 72) + SourceIndex(0)
 ---
 >>>    _q = _p[_o].skills, _r = _q === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _q, _s = _r.primary, primaryA = _s === void 0 ? "primary" : _s, _t = _r.secondary, secondaryA = _t === void 0 ? "secondary" : _t;
 1->^^^^
@@ -1056,8 +1041,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>                                                                                ^^^^^^^^^^^^^^
 22>                                                                                              ^^
 23>                                                                                                ^^^^
-24>                                                                                                    ^
-25>                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+24>                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >        
 2 >    { 
@@ -1084,7 +1068,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 22>                                                                                              
 23>                                                                                                <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                        { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                    )
 1->Emitted(33, 5) Source(52, 9) + SourceIndex(0)
 2 >Emitted(33, 7) Source(52, 11) + SourceIndex(0)
 3 >Emitted(33, 11) Source(52, 15) + SourceIndex(0)
@@ -1108,7 +1091,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>Emitted(33, 95) Source(52, 83) + SourceIndex(0)
 22>Emitted(33, 97) Source(51, 5) + SourceIndex(0)
 23>Emitted(33, 101) Source(52, 83) + SourceIndex(0)
-24>Emitted(33, 102) Source(52, 84) + SourceIndex(0)
 ---
 >>>    _w = _v[_u].skills, _x = _w === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _w, _y = _x.primary, primaryA = _y === void 0 ? "primary" : _y, _z = _x.secondary, secondaryA = _z === void 0 ? "secondary" : _z;
 1->^^^^
@@ -1199,8 +1181,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    ^^^^^^^^^^^^^^^^^^^^
 10>                                                        ^^
 11>                                                          ^^^^
-12>                                                              ^
-13>                                                               ^^^->
+12>                                                              ^^^^->
 1->
   >
   >
@@ -1214,7 +1195,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                    robots
 10>                                                        
 11>                                                          robots
-12>                                                              )
 1->Emitted(37, 1) Source(56, 1) + SourceIndex(0)
 2 >Emitted(37, 4) Source(56, 4) + SourceIndex(0)
 3 >Emitted(37, 5) Source(56, 5) + SourceIndex(0)
@@ -1226,7 +1206,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(37, 57) Source(56, 35) + SourceIndex(0)
 10>Emitted(37, 59) Source(56, 29) + SourceIndex(0)
 11>Emitted(37, 63) Source(56, 35) + SourceIndex(0)
-12>Emitted(37, 64) Source(56, 36) + SourceIndex(0)
 ---
 >>>    _1 = robots_2[_0].name, name = _1 === void 0 ? "noName" : _1;
 1->^^^^
@@ -1290,8 +1269,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   ^^^^^^^^^^^^^^
 12>                                                 ^^
 13>                                                   ^^^^
-14>                                                       ^
-15>                                                        ^^^^->
+14>                                                       ^^^^^->
 1->
   >
 2 >for
@@ -1306,7 +1284,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                   getRobots()
 12>                                                 
 13>                                                   getRobots()
-14>                                                       )
 1->Emitted(41, 1) Source(59, 1) + SourceIndex(0)
 2 >Emitted(41, 4) Source(59, 4) + SourceIndex(0)
 3 >Emitted(41, 5) Source(59, 5) + SourceIndex(0)
@@ -1320,7 +1297,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(41, 50) Source(59, 40) + SourceIndex(0)
 12>Emitted(41, 52) Source(59, 29) + SourceIndex(0)
 13>Emitted(41, 56) Source(59, 40) + SourceIndex(0)
-14>Emitted(41, 57) Source(59, 41) + SourceIndex(0)
 ---
 >>>    _4 = _3[_2].name, name = _4 === void 0 ? "noName" : _4;
 1->^^^^
@@ -1402,7 +1378,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                    ^^^^^^^^^^^^^^
 30>                                                                                                                  ^^
 31>                                                                                                                    ^^^^
-32>                                                                                                                        ^
 1->
   >
 2 >for
@@ -1435,7 +1410,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                  
 31>                                                                                                                    [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                        )
 1->Emitted(45, 1) Source(62, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(62, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(62, 5) + SourceIndex(0)
@@ -1467,7 +1441,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>Emitted(45, 115) Source(62, 105) + SourceIndex(0)
 30>Emitted(45, 117) Source(62, 29) + SourceIndex(0)
 31>Emitted(45, 121) Source(62, 105) + SourceIndex(0)
-32>Emitted(45, 122) Source(62, 106) + SourceIndex(0)
 ---
 >>>    _7 = _6[_5].name, name = _7 === void 0 ? "noName" : _7;
 1 >^^^^
@@ -1529,8 +1502,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                       ^^
 11>                                                                         ^^^^
-12>                                                                             ^
-13>                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1548,7 +1520,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                              multiRobots
 10>                                                                       
 11>                                                                         multiRobots
-12>                                                                             )
 1->Emitted(49, 1) Source(65, 1) + SourceIndex(0)
 2 >Emitted(49, 4) Source(65, 4) + SourceIndex(0)
 3 >Emitted(49, 5) Source(65, 5) + SourceIndex(0)
@@ -1560,7 +1531,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(49, 72) Source(70, 17) + SourceIndex(0)
 10>Emitted(49, 74) Source(70, 6) + SourceIndex(0)
 11>Emitted(49, 78) Source(70, 17) + SourceIndex(0)
-12>Emitted(49, 79) Source(70, 18) + SourceIndex(0)
 ---
 >>>    _9 = multiRobots_2[_8].skills, _10 = _9 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _9, _11 = _10.primary, primary = _11 === void 0 ? "primary" : _11, _12 = _10.secondary, secondary = _12 === void 0 ? "secondary" : _12;
 1->^^^^
@@ -1657,8 +1627,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -1678,7 +1647,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(53, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(53, 4) Source(73, 4) + SourceIndex(0)
 3 >Emitted(53, 5) Source(73, 5) + SourceIndex(0)
@@ -1692,7 +1660,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(53, 59) Source(78, 22) + SourceIndex(0)
 12>Emitted(53, 61) Source(78, 6) + SourceIndex(0)
 13>Emitted(53, 66) Source(78, 22) + SourceIndex(0)
-14>Emitted(53, 67) Source(78, 23) + SourceIndex(0)
 ---
 >>>    _15 = _14[_13].skills, _16 = _15 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _15, _17 = _16.primary, primary = _17 === void 0 ? "primary" : _17, _18 = _16.secondary, secondary = _18 === void 0 ? "secondary" : _18;
 1->^^^^
@@ -1881,8 +1848,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>                                                                                ^^^^^^^^^^^^^^^^
 22>                                                                                                ^^
 23>                                                                                                  ^^^^^
-24>                                                                                                       ^
-25>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+24>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    { 
@@ -1909,7 +1875,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 22>                                                                                                
 23>                                                                                                  [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                      { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                       )
 1->Emitted(58, 5) Source(87, 5) + SourceIndex(0)
 2 >Emitted(58, 7) Source(87, 7) + SourceIndex(0)
 3 >Emitted(58, 11) Source(87, 11) + SourceIndex(0)
@@ -1933,7 +1898,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>Emitted(58, 97) Source(87, 79) + SourceIndex(0)
 22>Emitted(58, 99) Source(86, 6) + SourceIndex(0)
 23>Emitted(58, 104) Source(87, 79) + SourceIndex(0)
-24>Emitted(58, 105) Source(87, 80) + SourceIndex(0)
 ---
 >>>    _21 = _20[_19].skills, _22 = _21 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _21, _23 = _22.primary, primary = _23 === void 0 ? "primary" : _23, _24 = _22.secondary, secondary = _24 === void 0 ? "secondary" : _24;
 1->^^^^
@@ -2029,8 +1993,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -2045,7 +2008,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(62, 1) Source(92, 1) + SourceIndex(0)
 2 >Emitted(62, 4) Source(92, 4) + SourceIndex(0)
 3 >Emitted(62, 5) Source(92, 5) + SourceIndex(0)
@@ -2057,39 +2019,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(62, 59) Source(92, 68) + SourceIndex(0)
 10>Emitted(62, 61) Source(92, 62) + SourceIndex(0)
 11>Emitted(62, 66) Source(92, 68) + SourceIndex(0)
-12>Emitted(62, 67) Source(92, 69) + SourceIndex(0)
 ---
 >>>    _26 = robots_3[_25], _27 = _26.name, nameA = _27 === void 0 ? "noName" : _27, _28 = _26.skill, skillA = _28 === void 0 ? "noSkill" : _28;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^
-5 >                                       ^^
-6 >                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                ^^
-8 >                                                                                  ^^^^^^^^^^^^^^^
-9 >                                                                                                 ^^
-10>                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                         ^^^^^^^^^^^^^^
+3 >                                       ^^
+4 >                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                                ^^
+6 >                                                                                  ^^^^^^^^^^^^^^^
+7 >                                                                                                 ^^
+8 >                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name: nameA = "noName", skill: skillA = "noSkill" }
-3 >                       
-4 >                         name: nameA = "noName"
-5 >                                       
-6 >                                         name: nameA = "noName"
-7 >                                                                                , 
-8 >                                                                                  skill: skillA = "noSkill"
-9 >                                                                                                 
-10>                                                                                                   skill: skillA = "noSkill"
-1->Emitted(63, 5) Source(92, 6) + SourceIndex(0)
-2 >Emitted(63, 24) Source(92, 58) + SourceIndex(0)
-3 >Emitted(63, 26) Source(92, 7) + SourceIndex(0)
-4 >Emitted(63, 40) Source(92, 29) + SourceIndex(0)
-5 >Emitted(63, 42) Source(92, 7) + SourceIndex(0)
-6 >Emitted(63, 81) Source(92, 29) + SourceIndex(0)
-7 >Emitted(63, 83) Source(92, 31) + SourceIndex(0)
-8 >Emitted(63, 98) Source(92, 56) + SourceIndex(0)
-9 >Emitted(63, 100) Source(92, 31) + SourceIndex(0)
-10>Emitted(63, 141) Source(92, 56) + SourceIndex(0)
+2 >                         name: nameA = "noName"
+3 >                                       
+4 >                                         name: nameA = "noName"
+5 >                                                                                , 
+6 >                                                                                  skill: skillA = "noSkill"
+7 >                                                                                                 
+8 >                                                                                                   skill: skillA = "noSkill"
+1->Emitted(63, 26) Source(92, 7) + SourceIndex(0)
+2 >Emitted(63, 40) Source(92, 29) + SourceIndex(0)
+3 >Emitted(63, 42) Source(92, 7) + SourceIndex(0)
+4 >Emitted(63, 81) Source(92, 29) + SourceIndex(0)
+5 >Emitted(63, 83) Source(92, 31) + SourceIndex(0)
+6 >Emitted(63, 98) Source(92, 56) + SourceIndex(0)
+7 >Emitted(63, 100) Source(92, 31) + SourceIndex(0)
+8 >Emitted(63, 141) Source(92, 56) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2139,8 +2094,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2155,7 +2109,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(66, 1) Source(95, 1) + SourceIndex(0)
 2 >Emitted(66, 4) Source(95, 4) + SourceIndex(0)
 3 >Emitted(66, 5) Source(95, 5) + SourceIndex(0)
@@ -2169,39 +2122,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(66, 54) Source(95, 74) + SourceIndex(0)
 12>Emitted(66, 56) Source(95, 63) + SourceIndex(0)
 13>Emitted(66, 61) Source(95, 74) + SourceIndex(0)
-14>Emitted(66, 62) Source(95, 75) + SourceIndex(0)
 ---
 >>>    _31 = _30[_29], _32 = _31.name, nameA = _32 === void 0 ? "noName" : _32, _33 = _31.skill, skillA = _33 === void 0 ? "noSkill" : _33;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^^^^^^
-9 >                                                                                            ^^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^^^^^^
+7 >                                                                                            ^^
+8 >                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name: nameA = "noName", skill: skillA = "noSkill"  }
-3 >                  
-4 >                    name: nameA = "noName"
-5 >                                  
-6 >                                    name: nameA = "noName"
-7 >                                                                           , 
-8 >                                                                             skill: skillA = "noSkill"
-9 >                                                                                            
-10>                                                                                              skill: skillA = "noSkill"
-1->Emitted(67, 5) Source(95, 6) + SourceIndex(0)
-2 >Emitted(67, 19) Source(95, 59) + SourceIndex(0)
-3 >Emitted(67, 21) Source(95, 7) + SourceIndex(0)
-4 >Emitted(67, 35) Source(95, 29) + SourceIndex(0)
-5 >Emitted(67, 37) Source(95, 7) + SourceIndex(0)
-6 >Emitted(67, 76) Source(95, 29) + SourceIndex(0)
-7 >Emitted(67, 78) Source(95, 31) + SourceIndex(0)
-8 >Emitted(67, 93) Source(95, 56) + SourceIndex(0)
-9 >Emitted(67, 95) Source(95, 31) + SourceIndex(0)
-10>Emitted(67, 136) Source(95, 56) + SourceIndex(0)
+2 >                    name: nameA = "noName"
+3 >                                  
+4 >                                    name: nameA = "noName"
+5 >                                                                           , 
+6 >                                                                             skill: skillA = "noSkill"
+7 >                                                                                            
+8 >                                                                                              skill: skillA = "noSkill"
+1->Emitted(67, 21) Source(95, 7) + SourceIndex(0)
+2 >Emitted(67, 35) Source(95, 29) + SourceIndex(0)
+3 >Emitted(67, 37) Source(95, 7) + SourceIndex(0)
+4 >Emitted(67, 76) Source(95, 29) + SourceIndex(0)
+5 >Emitted(67, 78) Source(95, 31) + SourceIndex(0)
+6 >Emitted(67, 93) Source(95, 56) + SourceIndex(0)
+7 >Emitted(67, 95) Source(95, 31) + SourceIndex(0)
+8 >Emitted(67, 136) Source(95, 56) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2269,8 +2215,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                      ^^^^^^^^^^^^^^^^
 30>                                                                                                                      ^^
 31>                                                                                                                        ^^^^^
-32>                                                                                                                             ^
-33>                                                                                                                              ^^^^^^^^^^^->
+32>                                                                                                                             ^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2303,7 +2248,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                      [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                      
 31>                                                                                                                        [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                             )
 1->Emitted(70, 1) Source(98, 1) + SourceIndex(0)
 2 >Emitted(70, 4) Source(98, 4) + SourceIndex(0)
 3 >Emitted(70, 5) Source(98, 5) + SourceIndex(0)
@@ -2335,39 +2279,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>Emitted(70, 119) Source(98, 139) + SourceIndex(0)
 30>Emitted(70, 121) Source(98, 63) + SourceIndex(0)
 31>Emitted(70, 126) Source(98, 139) + SourceIndex(0)
-32>Emitted(70, 127) Source(98, 140) + SourceIndex(0)
 ---
 >>>    _36 = _35[_34], _37 = _36.name, nameA = _37 === void 0 ? "noName" : _37, _38 = _36.skill, skillA = _38 === void 0 ? "noSkill" : _38;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^^^^^^
-9 >                                                                                            ^^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^^^^^^
+7 >                                                                                            ^^
+8 >                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {name: nameA = "noName", skill: skillA = "noSkill"  }
-3 >                  
-4 >                    name: nameA = "noName"
-5 >                                  
-6 >                                    name: nameA = "noName"
-7 >                                                                           , 
-8 >                                                                             skill: skillA = "noSkill"
-9 >                                                                                            
-10>                                                                                              skill: skillA = "noSkill"
-1->Emitted(71, 5) Source(98, 6) + SourceIndex(0)
-2 >Emitted(71, 19) Source(98, 59) + SourceIndex(0)
-3 >Emitted(71, 21) Source(98, 7) + SourceIndex(0)
-4 >Emitted(71, 35) Source(98, 29) + SourceIndex(0)
-5 >Emitted(71, 37) Source(98, 7) + SourceIndex(0)
-6 >Emitted(71, 76) Source(98, 29) + SourceIndex(0)
-7 >Emitted(71, 78) Source(98, 31) + SourceIndex(0)
-8 >Emitted(71, 93) Source(98, 56) + SourceIndex(0)
-9 >Emitted(71, 95) Source(98, 31) + SourceIndex(0)
-10>Emitted(71, 136) Source(98, 56) + SourceIndex(0)
+2 >                    name: nameA = "noName"
+3 >                                  
+4 >                                    name: nameA = "noName"
+5 >                                                                           , 
+6 >                                                                             skill: skillA = "noSkill"
+7 >                                                                                            
+8 >                                                                                              skill: skillA = "noSkill"
+1->Emitted(71, 21) Source(98, 7) + SourceIndex(0)
+2 >Emitted(71, 35) Source(98, 29) + SourceIndex(0)
+3 >Emitted(71, 37) Source(98, 7) + SourceIndex(0)
+4 >Emitted(71, 76) Source(98, 29) + SourceIndex(0)
+5 >Emitted(71, 78) Source(98, 31) + SourceIndex(0)
+6 >Emitted(71, 93) Source(98, 56) + SourceIndex(0)
+7 >Emitted(71, 95) Source(98, 31) + SourceIndex(0)
+8 >Emitted(71, 136) Source(98, 56) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2415,8 +2352,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2435,7 +2371,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(74, 1) Source(101, 1) + SourceIndex(0)
 2 >Emitted(74, 4) Source(101, 4) + SourceIndex(0)
 3 >Emitted(74, 5) Source(101, 5) + SourceIndex(0)
@@ -2447,77 +2382,64 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(74, 74) Source(107, 17) + SourceIndex(0)
 10>Emitted(74, 76) Source(107, 6) + SourceIndex(0)
 11>Emitted(74, 81) Source(107, 17) + SourceIndex(0)
-12>Emitted(74, 82) Source(107, 18) + SourceIndex(0)
 ---
 >>>    _40 = multiRobots_3[_39], _41 = _40.name, nameA = _41 === void 0 ? "noName" : _41, _42 = _40.skills, _43 = _42 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _42, _44 = _43.primary, primaryA = _44 === void 0 ? "primary" : _44, _45 = _43.secondary, secondaryA = _45 === void 0 ? "secondary" : _45;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                            ^^
-4 >                              ^^^^^^^^^^^^^^
-5 >                                            ^^
-6 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                     ^^
-8 >                                                                                       ^^^^^^^^^^^^^^^^
-9 >                                                                                                       ^^
-10>                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                  ^^
-12>                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                                     ^^
-14>                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                                  ^^
-16>                                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                       ^^
-18>                                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                              ^^^^^^^^^^^^^^
+3 >                                            ^^
+4 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                                     ^^
+6 >                                                                                       ^^^^^^^^^^^^^^^^
+7 >                                                                                                       ^^
+8 >                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                                  ^^
+10>                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                                     ^^
+12>                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                                                  ^^
+14>                                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                                                       ^^
+16>                                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {
-  >        name: nameA = "noName",
-  >        skills: {
-  >            primary: primaryA = "primary",
-  >            secondary: secondaryA = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                            
-4 >                              name: nameA = "noName"
-5 >                                            
-6 >                                              name: nameA = "noName"
-7 >                                                                                     ,
+2 >                              name: nameA = "noName"
+3 >                                            
+4 >                                              name: nameA = "noName"
+5 >                                                                                     ,
   >                                                                                         
-8 >                                                                                       skills: {
+6 >                                                                                       skills: {
   >                                                                                               primary: primaryA = "primary",
   >                                                                                               secondary: secondaryA = "secondary"
   >                                                                                           } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                                       
-10>                                                                                                         skills: {
+7 >                                                                                                       
+8 >                                                                                                         skills: {
   >                                                                                                                 primary: primaryA = "primary",
   >                                                                                                                 secondary: secondaryA = "secondary"
   >                                                                                                             } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                                  
-12>                                                                                                                                                                                    primary: primaryA = "primary"
-13>                                                                                                                                                                                                     
-14>                                                                                                                                                                                                       primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                                  ,
+9 >                                                                                                                                                                                  
+10>                                                                                                                                                                                    primary: primaryA = "primary"
+11>                                                                                                                                                                                                     
+12>                                                                                                                                                                                                       primary: primaryA = "primary"
+13>                                                                                                                                                                                                                                                  ,
   >                                                                                                                                                                                                                                                          
-16>                                                                                                                                                                                                                                                    secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                                       
-18>                                                                                                                                                                                                                                                                         secondary: secondaryA = "secondary"
-1->Emitted(75, 5) Source(101, 6) + SourceIndex(0)
-2 >Emitted(75, 29) Source(107, 2) + SourceIndex(0)
-3 >Emitted(75, 31) Source(102, 5) + SourceIndex(0)
-4 >Emitted(75, 45) Source(102, 27) + SourceIndex(0)
-5 >Emitted(75, 47) Source(102, 5) + SourceIndex(0)
-6 >Emitted(75, 86) Source(102, 27) + SourceIndex(0)
-7 >Emitted(75, 88) Source(103, 5) + SourceIndex(0)
-8 >Emitted(75, 104) Source(106, 53) + SourceIndex(0)
-9 >Emitted(75, 106) Source(103, 5) + SourceIndex(0)
-10>Emitted(75, 179) Source(106, 53) + SourceIndex(0)
-11>Emitted(75, 181) Source(104, 9) + SourceIndex(0)
-12>Emitted(75, 198) Source(104, 38) + SourceIndex(0)
-13>Emitted(75, 200) Source(104, 9) + SourceIndex(0)
-14>Emitted(75, 243) Source(104, 38) + SourceIndex(0)
-15>Emitted(75, 245) Source(105, 9) + SourceIndex(0)
-16>Emitted(75, 264) Source(105, 44) + SourceIndex(0)
-17>Emitted(75, 266) Source(105, 9) + SourceIndex(0)
-18>Emitted(75, 313) Source(105, 44) + SourceIndex(0)
+14>                                                                                                                                                                                                                                                    secondary: secondaryA = "secondary"
+15>                                                                                                                                                                                                                                                                       
+16>                                                                                                                                                                                                                                                                         secondary: secondaryA = "secondary"
+1->Emitted(75, 31) Source(102, 5) + SourceIndex(0)
+2 >Emitted(75, 45) Source(102, 27) + SourceIndex(0)
+3 >Emitted(75, 47) Source(102, 5) + SourceIndex(0)
+4 >Emitted(75, 86) Source(102, 27) + SourceIndex(0)
+5 >Emitted(75, 88) Source(103, 5) + SourceIndex(0)
+6 >Emitted(75, 104) Source(106, 53) + SourceIndex(0)
+7 >Emitted(75, 106) Source(103, 5) + SourceIndex(0)
+8 >Emitted(75, 179) Source(106, 53) + SourceIndex(0)
+9 >Emitted(75, 181) Source(104, 9) + SourceIndex(0)
+10>Emitted(75, 198) Source(104, 38) + SourceIndex(0)
+11>Emitted(75, 200) Source(104, 9) + SourceIndex(0)
+12>Emitted(75, 243) Source(104, 38) + SourceIndex(0)
+13>Emitted(75, 245) Source(105, 9) + SourceIndex(0)
+14>Emitted(75, 264) Source(105, 44) + SourceIndex(0)
+15>Emitted(75, 266) Source(105, 9) + SourceIndex(0)
+16>Emitted(75, 313) Source(105, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2569,8 +2491,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -2591,7 +2512,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(78, 1) Source(110, 1) + SourceIndex(0)
 2 >Emitted(78, 4) Source(110, 4) + SourceIndex(0)
 3 >Emitted(78, 5) Source(110, 5) + SourceIndex(0)
@@ -2605,77 +2525,64 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(78, 59) Source(116, 22) + SourceIndex(0)
 12>Emitted(78, 61) Source(116, 6) + SourceIndex(0)
 13>Emitted(78, 66) Source(116, 22) + SourceIndex(0)
-14>Emitted(78, 67) Source(116, 23) + SourceIndex(0)
 ---
 >>>    _48 = _47[_46], _49 = _48.name, nameA = _49 === void 0 ? "noName" : _49, _50 = _48.skills, _51 = _50 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _50, _52 = _51.primary, primaryA = _52 === void 0 ? "primary" : _52, _53 = _51.secondary, secondaryA = _53 === void 0 ? "secondary" : _53;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^^^^^^^
-9 >                                                                                             ^^
-10>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                        ^^
-12>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                           ^^
-14>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                        ^^
-16>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                             ^^
-18>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^^^^^^^
+7 >                                                                                             ^^
+8 >                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                        ^^
+10>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                           ^^
+12>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                                        ^^
+14>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                                             ^^
+16>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {
-  >        name: nameA = "noName",
-  >        skills: {
-  >            primary: primaryA = "primary",
-  >            secondary: secondaryA = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                  
-4 >                    name: nameA = "noName"
-5 >                                  
-6 >                                    name: nameA = "noName"
-7 >                                                                           ,
+2 >                    name: nameA = "noName"
+3 >                                  
+4 >                                    name: nameA = "noName"
+5 >                                                                           ,
   >                                                                               
-8 >                                                                             skills: {
+6 >                                                                             skills: {
   >                                                                                     primary: primaryA = "primary",
   >                                                                                     secondary: secondaryA = "secondary"
   >                                                                                 } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                             
-10>                                                                                               skills: {
+7 >                                                                                             
+8 >                                                                                               skills: {
   >                                                                                                       primary: primaryA = "primary",
   >                                                                                                       secondary: secondaryA = "secondary"
   >                                                                                                   } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                        
-12>                                                                                                                                                                          primary: primaryA = "primary"
-13>                                                                                                                                                                                           
-14>                                                                                                                                                                                             primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                        ,
+9 >                                                                                                                                                                        
+10>                                                                                                                                                                          primary: primaryA = "primary"
+11>                                                                                                                                                                                           
+12>                                                                                                                                                                                             primary: primaryA = "primary"
+13>                                                                                                                                                                                                                                        ,
   >                                                                                                                                                                                                                                                
-16>                                                                                                                                                                                                                                          secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                             
-18>                                                                                                                                                                                                                                                               secondary: secondaryA = "secondary"
-1->Emitted(79, 5) Source(110, 6) + SourceIndex(0)
-2 >Emitted(79, 19) Source(116, 2) + SourceIndex(0)
-3 >Emitted(79, 21) Source(111, 5) + SourceIndex(0)
-4 >Emitted(79, 35) Source(111, 27) + SourceIndex(0)
-5 >Emitted(79, 37) Source(111, 5) + SourceIndex(0)
-6 >Emitted(79, 76) Source(111, 27) + SourceIndex(0)
-7 >Emitted(79, 78) Source(112, 5) + SourceIndex(0)
-8 >Emitted(79, 94) Source(115, 53) + SourceIndex(0)
-9 >Emitted(79, 96) Source(112, 5) + SourceIndex(0)
-10>Emitted(79, 169) Source(115, 53) + SourceIndex(0)
-11>Emitted(79, 171) Source(113, 9) + SourceIndex(0)
-12>Emitted(79, 188) Source(113, 38) + SourceIndex(0)
-13>Emitted(79, 190) Source(113, 9) + SourceIndex(0)
-14>Emitted(79, 233) Source(113, 38) + SourceIndex(0)
-15>Emitted(79, 235) Source(114, 9) + SourceIndex(0)
-16>Emitted(79, 254) Source(114, 44) + SourceIndex(0)
-17>Emitted(79, 256) Source(114, 9) + SourceIndex(0)
-18>Emitted(79, 303) Source(114, 44) + SourceIndex(0)
+14>                                                                                                                                                                                                                                          secondary: secondaryA = "secondary"
+15>                                                                                                                                                                                                                                                             
+16>                                                                                                                                                                                                                                                               secondary: secondaryA = "secondary"
+1->Emitted(79, 21) Source(111, 5) + SourceIndex(0)
+2 >Emitted(79, 35) Source(111, 27) + SourceIndex(0)
+3 >Emitted(79, 37) Source(111, 5) + SourceIndex(0)
+4 >Emitted(79, 76) Source(111, 27) + SourceIndex(0)
+5 >Emitted(79, 78) Source(112, 5) + SourceIndex(0)
+6 >Emitted(79, 94) Source(115, 53) + SourceIndex(0)
+7 >Emitted(79, 96) Source(112, 5) + SourceIndex(0)
+8 >Emitted(79, 169) Source(115, 53) + SourceIndex(0)
+9 >Emitted(79, 171) Source(113, 9) + SourceIndex(0)
+10>Emitted(79, 188) Source(113, 38) + SourceIndex(0)
+11>Emitted(79, 190) Source(113, 9) + SourceIndex(0)
+12>Emitted(79, 233) Source(113, 38) + SourceIndex(0)
+13>Emitted(79, 235) Source(114, 9) + SourceIndex(0)
+14>Emitted(79, 254) Source(114, 44) + SourceIndex(0)
+15>Emitted(79, 256) Source(114, 9) + SourceIndex(0)
+16>Emitted(79, 303) Source(114, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2823,8 +2730,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>                                                                                ^^^^^^^^^^^^^^^^
 22>                                                                                                ^^
 23>                                                                                                  ^^^^^
-24>                                                                                                       ^
-25>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+24>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    { 
@@ -2851,7 +2757,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 22>                                                                                                
 23>                                                                                                  <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                      { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                       )
 1->Emitted(83, 5) Source(126, 5) + SourceIndex(0)
 2 >Emitted(83, 7) Source(126, 7) + SourceIndex(0)
 3 >Emitted(83, 11) Source(126, 11) + SourceIndex(0)
@@ -2875,77 +2780,64 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>Emitted(83, 97) Source(126, 79) + SourceIndex(0)
 22>Emitted(83, 99) Source(125, 6) + SourceIndex(0)
 23>Emitted(83, 104) Source(126, 79) + SourceIndex(0)
-24>Emitted(83, 105) Source(126, 80) + SourceIndex(0)
 ---
 >>>    _56 = _55[_54], _57 = _56.name, nameA = _57 === void 0 ? "noName" : _57, _58 = _56.skills, _59 = _58 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _58, _60 = _59.primary, primaryA = _60 === void 0 ? "primary" : _60, _61 = _59.secondary, secondaryA = _61 === void 0 ? "secondary" : _61;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                           ^^
-8 >                                                                             ^^^^^^^^^^^^^^^^
-9 >                                                                                             ^^
-10>                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                        ^^
-12>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                           ^^
-14>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                        ^^
-16>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                             ^^
-18>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                           ^^
+6 >                                                                             ^^^^^^^^^^^^^^^^
+7 >                                                                                             ^^
+8 >                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                        ^^
+10>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                           ^^
+12>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                                        ^^
+14>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                                             ^^
+16>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {
-  >        name: nameA = "noName",
-  >        skills: {
-  >            primary: primaryA = "primary",
-  >            secondary: secondaryA = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                  
-4 >                    name: nameA = "noName"
-5 >                                  
-6 >                                    name: nameA = "noName"
-7 >                                                                           ,
+2 >                    name: nameA = "noName"
+3 >                                  
+4 >                                    name: nameA = "noName"
+5 >                                                                           ,
   >                                                                               
-8 >                                                                             skills: {
+6 >                                                                             skills: {
   >                                                                                     primary: primaryA = "primary",
   >                                                                                     secondary: secondaryA = "secondary"
   >                                                                                 } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                             
-10>                                                                                               skills: {
+7 >                                                                                             
+8 >                                                                                               skills: {
   >                                                                                                       primary: primaryA = "primary",
   >                                                                                                       secondary: secondaryA = "secondary"
   >                                                                                                   } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                        
-12>                                                                                                                                                                          primary: primaryA = "primary"
-13>                                                                                                                                                                                           
-14>                                                                                                                                                                                             primary: primaryA = "primary"
-15>                                                                                                                                                                                                                                        ,
+9 >                                                                                                                                                                        
+10>                                                                                                                                                                          primary: primaryA = "primary"
+11>                                                                                                                                                                                           
+12>                                                                                                                                                                                             primary: primaryA = "primary"
+13>                                                                                                                                                                                                                                        ,
   >                                                                                                                                                                                                                                                
-16>                                                                                                                                                                                                                                          secondary: secondaryA = "secondary"
-17>                                                                                                                                                                                                                                                             
-18>                                                                                                                                                                                                                                                               secondary: secondaryA = "secondary"
-1->Emitted(84, 5) Source(119, 6) + SourceIndex(0)
-2 >Emitted(84, 19) Source(125, 2) + SourceIndex(0)
-3 >Emitted(84, 21) Source(120, 5) + SourceIndex(0)
-4 >Emitted(84, 35) Source(120, 27) + SourceIndex(0)
-5 >Emitted(84, 37) Source(120, 5) + SourceIndex(0)
-6 >Emitted(84, 76) Source(120, 27) + SourceIndex(0)
-7 >Emitted(84, 78) Source(121, 5) + SourceIndex(0)
-8 >Emitted(84, 94) Source(124, 53) + SourceIndex(0)
-9 >Emitted(84, 96) Source(121, 5) + SourceIndex(0)
-10>Emitted(84, 169) Source(124, 53) + SourceIndex(0)
-11>Emitted(84, 171) Source(122, 9) + SourceIndex(0)
-12>Emitted(84, 188) Source(122, 38) + SourceIndex(0)
-13>Emitted(84, 190) Source(122, 9) + SourceIndex(0)
-14>Emitted(84, 233) Source(122, 38) + SourceIndex(0)
-15>Emitted(84, 235) Source(123, 9) + SourceIndex(0)
-16>Emitted(84, 254) Source(123, 44) + SourceIndex(0)
-17>Emitted(84, 256) Source(123, 9) + SourceIndex(0)
-18>Emitted(84, 303) Source(123, 44) + SourceIndex(0)
+14>                                                                                                                                                                                                                                          secondary: secondaryA = "secondary"
+15>                                                                                                                                                                                                                                                             
+16>                                                                                                                                                                                                                                                               secondary: secondaryA = "secondary"
+1->Emitted(84, 21) Source(120, 5) + SourceIndex(0)
+2 >Emitted(84, 35) Source(120, 27) + SourceIndex(0)
+3 >Emitted(84, 37) Source(120, 5) + SourceIndex(0)
+4 >Emitted(84, 76) Source(120, 27) + SourceIndex(0)
+5 >Emitted(84, 78) Source(121, 5) + SourceIndex(0)
+6 >Emitted(84, 94) Source(124, 53) + SourceIndex(0)
+7 >Emitted(84, 96) Source(121, 5) + SourceIndex(0)
+8 >Emitted(84, 169) Source(124, 53) + SourceIndex(0)
+9 >Emitted(84, 171) Source(122, 9) + SourceIndex(0)
+10>Emitted(84, 188) Source(122, 38) + SourceIndex(0)
+11>Emitted(84, 190) Source(122, 9) + SourceIndex(0)
+12>Emitted(84, 233) Source(122, 38) + SourceIndex(0)
+13>Emitted(84, 235) Source(123, 9) + SourceIndex(0)
+14>Emitted(84, 254) Source(123, 44) + SourceIndex(0)
+15>Emitted(84, 256) Source(123, 9) + SourceIndex(0)
+16>Emitted(84, 303) Source(123, 44) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -2996,8 +2888,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                     ^^^^^^^^^^^^^^^^^^^^^
 10>                                                          ^^
 11>                                                            ^^^^^
-12>                                                                 ^
-13>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3011,7 +2902,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                     robots
 10>                                                          
 11>                                                            robots
-12>                                                                 )
 1->Emitted(87, 1) Source(130, 1) + SourceIndex(0)
 2 >Emitted(87, 4) Source(130, 4) + SourceIndex(0)
 3 >Emitted(87, 5) Source(130, 5) + SourceIndex(0)
@@ -3023,39 +2913,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(87, 59) Source(130, 55) + SourceIndex(0)
 10>Emitted(87, 61) Source(130, 49) + SourceIndex(0)
 11>Emitted(87, 66) Source(130, 55) + SourceIndex(0)
-12>Emitted(87, 67) Source(130, 56) + SourceIndex(0)
 ---
 >>>    _63 = robots_4[_62], _64 = _63.name, name = _64 === void 0 ? "noName" : _64, _65 = _63.skill, skill = _65 === void 0 ? "noSkill" : _65;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^
-5 >                                       ^^
-6 >                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                               ^^
-8 >                                                                                 ^^^^^^^^^^^^^^^
-9 >                                                                                                ^^
-10>                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                         ^^^^^^^^^^^^^^
+3 >                                       ^^
+4 >                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                               ^^
+6 >                                                                                 ^^^^^^^^^^^^^^^
+7 >                                                                                                ^^
+8 >                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    { name = "noName", skill  = "noSkill" }
-3 >                       
-4 >                         name = "noName"
-5 >                                       
-6 >                                         name = "noName"
-7 >                                                                               , 
-8 >                                                                                 skill  = "noSkill"
-9 >                                                                                                
-10>                                                                                                  skill  = "noSkill"
-1->Emitted(88, 5) Source(130, 6) + SourceIndex(0)
-2 >Emitted(88, 24) Source(130, 45) + SourceIndex(0)
-3 >Emitted(88, 26) Source(130, 8) + SourceIndex(0)
-4 >Emitted(88, 40) Source(130, 23) + SourceIndex(0)
-5 >Emitted(88, 42) Source(130, 8) + SourceIndex(0)
-6 >Emitted(88, 80) Source(130, 23) + SourceIndex(0)
-7 >Emitted(88, 82) Source(130, 25) + SourceIndex(0)
-8 >Emitted(88, 97) Source(130, 43) + SourceIndex(0)
-9 >Emitted(88, 99) Source(130, 25) + SourceIndex(0)
-10>Emitted(88, 139) Source(130, 43) + SourceIndex(0)
+2 >                         name = "noName"
+3 >                                       
+4 >                                         name = "noName"
+5 >                                                                               , 
+6 >                                                                                 skill  = "noSkill"
+7 >                                                                                                
+8 >                                                                                                  skill  = "noSkill"
+1->Emitted(88, 26) Source(130, 8) + SourceIndex(0)
+2 >Emitted(88, 40) Source(130, 23) + SourceIndex(0)
+3 >Emitted(88, 42) Source(130, 8) + SourceIndex(0)
+4 >Emitted(88, 80) Source(130, 23) + SourceIndex(0)
+5 >Emitted(88, 82) Source(130, 25) + SourceIndex(0)
+6 >Emitted(88, 97) Source(130, 43) + SourceIndex(0)
+7 >Emitted(88, 99) Source(130, 25) + SourceIndex(0)
+8 >Emitted(88, 139) Source(130, 43) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3105,8 +2988,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                     ^^^^^^^^^^^^^^^^
 12>                                                     ^^
 13>                                                       ^^^^^
-14>                                                            ^
-15>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -3121,7 +3003,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                     getRobots()
 12>                                                     
 13>                                                       getRobots()
-14>                                                            )
 1->Emitted(91, 1) Source(133, 1) + SourceIndex(0)
 2 >Emitted(91, 4) Source(133, 4) + SourceIndex(0)
 3 >Emitted(91, 5) Source(133, 5) + SourceIndex(0)
@@ -3135,39 +3016,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(91, 54) Source(133, 60) + SourceIndex(0)
 12>Emitted(91, 56) Source(133, 49) + SourceIndex(0)
 13>Emitted(91, 61) Source(133, 60) + SourceIndex(0)
-14>Emitted(91, 62) Source(133, 61) + SourceIndex(0)
 ---
 >>>    _68 = _67[_66], _69 = _68.name, name = _69 === void 0 ? "noName" : _69, _70 = _68.skill, skill = _70 === void 0 ? "noSkill" : _70;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^^^^
-9 >                                                                                           ^^
-10>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                          ^^
+6 >                                                                            ^^^^^^^^^^^^^^^
+7 >                                                                                           ^^
+8 >                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    { name = "noName", skill = "noSkill"  }
-3 >                  
-4 >                    name = "noName"
-5 >                                  
-6 >                                    name = "noName"
-7 >                                                                          , 
-8 >                                                                            skill = "noSkill"
-9 >                                                                                           
-10>                                                                                             skill = "noSkill"
-1->Emitted(92, 5) Source(133, 6) + SourceIndex(0)
-2 >Emitted(92, 19) Source(133, 45) + SourceIndex(0)
-3 >Emitted(92, 21) Source(133, 8) + SourceIndex(0)
-4 >Emitted(92, 35) Source(133, 23) + SourceIndex(0)
-5 >Emitted(92, 37) Source(133, 8) + SourceIndex(0)
-6 >Emitted(92, 75) Source(133, 23) + SourceIndex(0)
-7 >Emitted(92, 77) Source(133, 25) + SourceIndex(0)
-8 >Emitted(92, 92) Source(133, 42) + SourceIndex(0)
-9 >Emitted(92, 94) Source(133, 25) + SourceIndex(0)
-10>Emitted(92, 134) Source(133, 42) + SourceIndex(0)
+2 >                    name = "noName"
+3 >                                  
+4 >                                    name = "noName"
+5 >                                                                          , 
+6 >                                                                            skill = "noSkill"
+7 >                                                                                           
+8 >                                                                                             skill = "noSkill"
+1->Emitted(92, 21) Source(133, 8) + SourceIndex(0)
+2 >Emitted(92, 35) Source(133, 23) + SourceIndex(0)
+3 >Emitted(92, 37) Source(133, 8) + SourceIndex(0)
+4 >Emitted(92, 75) Source(133, 23) + SourceIndex(0)
+5 >Emitted(92, 77) Source(133, 25) + SourceIndex(0)
+6 >Emitted(92, 92) Source(133, 42) + SourceIndex(0)
+7 >Emitted(92, 94) Source(133, 25) + SourceIndex(0)
+8 >Emitted(92, 134) Source(133, 42) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3235,8 +3109,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                      ^^^^^^^^^^^^^^^^
 30>                                                                                                                      ^^
 31>                                                                                                                        ^^^^^
-32>                                                                                                                             ^
-33>                                                                                                                              ^^^^^^^^^->
+32>                                                                                                                             ^^^^^^^^^^->
 1->
   >
 2 >for
@@ -3269,7 +3142,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>                                                                                                      [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
 30>                                                                                                                      
 31>                                                                                                                        [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]
-32>                                                                                                                             )
 1->Emitted(95, 1) Source(136, 1) + SourceIndex(0)
 2 >Emitted(95, 4) Source(136, 4) + SourceIndex(0)
 3 >Emitted(95, 5) Source(136, 5) + SourceIndex(0)
@@ -3301,39 +3173,32 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 29>Emitted(95, 119) Source(136, 125) + SourceIndex(0)
 30>Emitted(95, 121) Source(136, 49) + SourceIndex(0)
 31>Emitted(95, 126) Source(136, 125) + SourceIndex(0)
-32>Emitted(95, 127) Source(136, 126) + SourceIndex(0)
 ---
 >>>    _73 = _72[_71], _74 = _73.name, name = _74 === void 0 ? "noName" : _74, _75 = _73.skill, skill = _75 === void 0 ? "noSkill" : _75;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^^^^
-9 >                                                                                           ^^
-10>                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                          ^^
+6 >                                                                            ^^^^^^^^^^^^^^^
+7 >                                                                                           ^^
+8 >                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    { name = "noName", skill  = "noSkill" }
-3 >                  
-4 >                    name = "noName"
-5 >                                  
-6 >                                    name = "noName"
-7 >                                                                          , 
-8 >                                                                            skill  = "noSkill"
-9 >                                                                                           
-10>                                                                                             skill  = "noSkill"
-1->Emitted(96, 5) Source(136, 6) + SourceIndex(0)
-2 >Emitted(96, 19) Source(136, 45) + SourceIndex(0)
-3 >Emitted(96, 21) Source(136, 8) + SourceIndex(0)
-4 >Emitted(96, 35) Source(136, 23) + SourceIndex(0)
-5 >Emitted(96, 37) Source(136, 8) + SourceIndex(0)
-6 >Emitted(96, 75) Source(136, 23) + SourceIndex(0)
-7 >Emitted(96, 77) Source(136, 25) + SourceIndex(0)
-8 >Emitted(96, 92) Source(136, 43) + SourceIndex(0)
-9 >Emitted(96, 94) Source(136, 25) + SourceIndex(0)
-10>Emitted(96, 134) Source(136, 43) + SourceIndex(0)
+2 >                    name = "noName"
+3 >                                  
+4 >                                    name = "noName"
+5 >                                                                          , 
+6 >                                                                            skill  = "noSkill"
+7 >                                                                                           
+8 >                                                                                             skill  = "noSkill"
+1->Emitted(96, 21) Source(136, 8) + SourceIndex(0)
+2 >Emitted(96, 35) Source(136, 23) + SourceIndex(0)
+3 >Emitted(96, 37) Source(136, 8) + SourceIndex(0)
+4 >Emitted(96, 75) Source(136, 23) + SourceIndex(0)
+5 >Emitted(96, 77) Source(136, 25) + SourceIndex(0)
+6 >Emitted(96, 92) Source(136, 43) + SourceIndex(0)
+7 >Emitted(96, 94) Source(136, 25) + SourceIndex(0)
+8 >Emitted(96, 134) Source(136, 43) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3381,8 +3246,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 10>                                                                         ^^
 11>                                                                           ^^^^^
-12>                                                                                ^
-13>                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -3401,7 +3265,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >                                               multiRobots
 10>                                                                         
 11>                                                                           multiRobots
-12>                                                                                )
 1->Emitted(99, 1) Source(139, 1) + SourceIndex(0)
 2 >Emitted(99, 4) Source(139, 4) + SourceIndex(0)
 3 >Emitted(99, 5) Source(139, 5) + SourceIndex(0)
@@ -3413,77 +3276,64 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 9 >Emitted(99, 74) Source(145, 17) + SourceIndex(0)
 10>Emitted(99, 76) Source(145, 6) + SourceIndex(0)
 11>Emitted(99, 81) Source(145, 17) + SourceIndex(0)
-12>Emitted(99, 82) Source(145, 18) + SourceIndex(0)
 ---
 >>>    _77 = multiRobots_4[_76], _78 = _77.name, name = _78 === void 0 ? "noName" : _78, _79 = _77.skills, _80 = _79 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _79, _81 = _80.primary, primary = _81 === void 0 ? "primary" : _81, _82 = _80.secondary, secondary = _82 === void 0 ? "secondary" : _82;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                            ^^
-4 >                              ^^^^^^^^^^^^^^
-5 >                                            ^^
-6 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^^^
-9 >                                                                                                      ^^
-10>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                 ^^
-12>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                                    ^^
-14>                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                                ^^
-16>                                                                                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                     ^^
-18>                                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                              ^^^^^^^^^^^^^^
+3 >                                            ^^
+4 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                                    ^^
+6 >                                                                                      ^^^^^^^^^^^^^^^^
+7 >                                                                                                      ^^
+8 >                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                                 ^^
+10>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                                    ^^
+12>                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                                                ^^
+14>                                                                                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                                                     ^^
+16>                                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {
-  >        name = "noName",
-  >        skills: {
-  >            primary = "primary",
-  >            secondary = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                            
-4 >                              name = "noName"
-5 >                                            
-6 >                                              name = "noName"
-7 >                                                                                    ,
+2 >                              name = "noName"
+3 >                                            
+4 >                                              name = "noName"
+5 >                                                                                    ,
   >                                                                                        
-8 >                                                                                      skills: {
+6 >                                                                                      skills: {
   >                                                                                              primary = "primary",
   >                                                                                              secondary = "secondary"
   >                                                                                          } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                                      
-10>                                                                                                        skills: {
+7 >                                                                                                      
+8 >                                                                                                        skills: {
   >                                                                                                                primary = "primary",
   >                                                                                                                secondary = "secondary"
   >                                                                                                            } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                                 
-12>                                                                                                                                                                                   primary = "primary"
-13>                                                                                                                                                                                                    
-14>                                                                                                                                                                                                      primary = "primary"
-15>                                                                                                                                                                                                                                                ,
+9 >                                                                                                                                                                                 
+10>                                                                                                                                                                                   primary = "primary"
+11>                                                                                                                                                                                                    
+12>                                                                                                                                                                                                      primary = "primary"
+13>                                                                                                                                                                                                                                                ,
   >                                                                                                                                                                                                                                                        
-16>                                                                                                                                                                                                                                                  secondary = "secondary"
-17>                                                                                                                                                                                                                                                                     
-18>                                                                                                                                                                                                                                                                       secondary = "secondary"
-1->Emitted(100, 5) Source(139, 6) + SourceIndex(0)
-2 >Emitted(100, 29) Source(145, 2) + SourceIndex(0)
-3 >Emitted(100, 31) Source(140, 5) + SourceIndex(0)
-4 >Emitted(100, 45) Source(140, 20) + SourceIndex(0)
-5 >Emitted(100, 47) Source(140, 5) + SourceIndex(0)
-6 >Emitted(100, 85) Source(140, 20) + SourceIndex(0)
-7 >Emitted(100, 87) Source(141, 5) + SourceIndex(0)
-8 >Emitted(100, 103) Source(144, 53) + SourceIndex(0)
-9 >Emitted(100, 105) Source(141, 5) + SourceIndex(0)
-10>Emitted(100, 178) Source(144, 53) + SourceIndex(0)
-11>Emitted(100, 180) Source(142, 9) + SourceIndex(0)
-12>Emitted(100, 197) Source(142, 28) + SourceIndex(0)
-13>Emitted(100, 199) Source(142, 9) + SourceIndex(0)
-14>Emitted(100, 241) Source(142, 28) + SourceIndex(0)
-15>Emitted(100, 243) Source(143, 9) + SourceIndex(0)
-16>Emitted(100, 262) Source(143, 32) + SourceIndex(0)
-17>Emitted(100, 264) Source(143, 9) + SourceIndex(0)
-18>Emitted(100, 310) Source(143, 32) + SourceIndex(0)
+14>                                                                                                                                                                                                                                                  secondary = "secondary"
+15>                                                                                                                                                                                                                                                                     
+16>                                                                                                                                                                                                                                                                       secondary = "secondary"
+1->Emitted(100, 31) Source(140, 5) + SourceIndex(0)
+2 >Emitted(100, 45) Source(140, 20) + SourceIndex(0)
+3 >Emitted(100, 47) Source(140, 5) + SourceIndex(0)
+4 >Emitted(100, 85) Source(140, 20) + SourceIndex(0)
+5 >Emitted(100, 87) Source(141, 5) + SourceIndex(0)
+6 >Emitted(100, 103) Source(144, 53) + SourceIndex(0)
+7 >Emitted(100, 105) Source(141, 5) + SourceIndex(0)
+8 >Emitted(100, 178) Source(144, 53) + SourceIndex(0)
+9 >Emitted(100, 180) Source(142, 9) + SourceIndex(0)
+10>Emitted(100, 197) Source(142, 28) + SourceIndex(0)
+11>Emitted(100, 199) Source(142, 9) + SourceIndex(0)
+12>Emitted(100, 241) Source(142, 28) + SourceIndex(0)
+13>Emitted(100, 243) Source(143, 9) + SourceIndex(0)
+14>Emitted(100, 262) Source(143, 32) + SourceIndex(0)
+15>Emitted(100, 264) Source(143, 9) + SourceIndex(0)
+16>Emitted(100, 310) Source(143, 32) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3535,8 +3385,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          ^^^^^^^^^^^^^^^^
 12>                                                          ^^
 13>                                                            ^^^^^
-14>                                                                 ^
-15>                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >for
@@ -3557,7 +3406,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>                                          getMultiRobots()
 12>                                                          
 13>                                                            getMultiRobots()
-14>                                                                 )
 1->Emitted(103, 1) Source(148, 1) + SourceIndex(0)
 2 >Emitted(103, 4) Source(148, 4) + SourceIndex(0)
 3 >Emitted(103, 5) Source(148, 5) + SourceIndex(0)
@@ -3571,77 +3419,64 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 11>Emitted(103, 59) Source(154, 22) + SourceIndex(0)
 12>Emitted(103, 61) Source(154, 6) + SourceIndex(0)
 13>Emitted(103, 66) Source(154, 22) + SourceIndex(0)
-14>Emitted(103, 67) Source(154, 23) + SourceIndex(0)
 ---
 >>>    _85 = _84[_83], _86 = _85.name, name = _86 === void 0 ? "noName" : _86, _87 = _85.skills, _88 = _87 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _87, _89 = _88.primary, primary = _89 === void 0 ? "primary" : _89, _90 = _88.secondary, secondary = _90 === void 0 ? "secondary" : _90;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^^^^^
-9 >                                                                                            ^^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                       ^^
-12>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                          ^^
-14>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                      ^^
-16>                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                           ^^
-18>                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                          ^^
+6 >                                                                            ^^^^^^^^^^^^^^^^
+7 >                                                                                            ^^
+8 >                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                       ^^
+10>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                          ^^
+12>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                                      ^^
+14>                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                                           ^^
+16>                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {
-  >        name = "noName",
-  >        skills: {
-  >            primary = "primary",
-  >            secondary = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                  
-4 >                    name = "noName"
-5 >                                  
-6 >                                    name = "noName"
-7 >                                                                          ,
+2 >                    name = "noName"
+3 >                                  
+4 >                                    name = "noName"
+5 >                                                                          ,
   >                                                                              
-8 >                                                                            skills: {
+6 >                                                                            skills: {
   >                                                                                    primary = "primary",
   >                                                                                    secondary = "secondary"
   >                                                                                } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                            
-10>                                                                                              skills: {
+7 >                                                                                            
+8 >                                                                                              skills: {
   >                                                                                                      primary = "primary",
   >                                                                                                      secondary = "secondary"
   >                                                                                                  } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                       
-12>                                                                                                                                                                         primary = "primary"
-13>                                                                                                                                                                                          
-14>                                                                                                                                                                                            primary = "primary"
-15>                                                                                                                                                                                                                                      ,
+9 >                                                                                                                                                                       
+10>                                                                                                                                                                         primary = "primary"
+11>                                                                                                                                                                                          
+12>                                                                                                                                                                                            primary = "primary"
+13>                                                                                                                                                                                                                                      ,
   >                                                                                                                                                                                                                                              
-16>                                                                                                                                                                                                                                        secondary = "secondary"
-17>                                                                                                                                                                                                                                                           
-18>                                                                                                                                                                                                                                                             secondary = "secondary"
-1->Emitted(104, 5) Source(148, 6) + SourceIndex(0)
-2 >Emitted(104, 19) Source(154, 2) + SourceIndex(0)
-3 >Emitted(104, 21) Source(149, 5) + SourceIndex(0)
-4 >Emitted(104, 35) Source(149, 20) + SourceIndex(0)
-5 >Emitted(104, 37) Source(149, 5) + SourceIndex(0)
-6 >Emitted(104, 75) Source(149, 20) + SourceIndex(0)
-7 >Emitted(104, 77) Source(150, 5) + SourceIndex(0)
-8 >Emitted(104, 93) Source(153, 53) + SourceIndex(0)
-9 >Emitted(104, 95) Source(150, 5) + SourceIndex(0)
-10>Emitted(104, 168) Source(153, 53) + SourceIndex(0)
-11>Emitted(104, 170) Source(151, 9) + SourceIndex(0)
-12>Emitted(104, 187) Source(151, 28) + SourceIndex(0)
-13>Emitted(104, 189) Source(151, 9) + SourceIndex(0)
-14>Emitted(104, 231) Source(151, 28) + SourceIndex(0)
-15>Emitted(104, 233) Source(152, 9) + SourceIndex(0)
-16>Emitted(104, 252) Source(152, 32) + SourceIndex(0)
-17>Emitted(104, 254) Source(152, 9) + SourceIndex(0)
-18>Emitted(104, 300) Source(152, 32) + SourceIndex(0)
+14>                                                                                                                                                                                                                                        secondary = "secondary"
+15>                                                                                                                                                                                                                                                           
+16>                                                                                                                                                                                                                                                             secondary = "secondary"
+1->Emitted(104, 21) Source(149, 5) + SourceIndex(0)
+2 >Emitted(104, 35) Source(149, 20) + SourceIndex(0)
+3 >Emitted(104, 37) Source(149, 5) + SourceIndex(0)
+4 >Emitted(104, 75) Source(149, 20) + SourceIndex(0)
+5 >Emitted(104, 77) Source(150, 5) + SourceIndex(0)
+6 >Emitted(104, 93) Source(153, 53) + SourceIndex(0)
+7 >Emitted(104, 95) Source(150, 5) + SourceIndex(0)
+8 >Emitted(104, 168) Source(153, 53) + SourceIndex(0)
+9 >Emitted(104, 170) Source(151, 9) + SourceIndex(0)
+10>Emitted(104, 187) Source(151, 28) + SourceIndex(0)
+11>Emitted(104, 189) Source(151, 9) + SourceIndex(0)
+12>Emitted(104, 231) Source(151, 28) + SourceIndex(0)
+13>Emitted(104, 233) Source(152, 9) + SourceIndex(0)
+14>Emitted(104, 252) Source(152, 32) + SourceIndex(0)
+15>Emitted(104, 254) Source(152, 9) + SourceIndex(0)
+16>Emitted(104, 300) Source(152, 32) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
@@ -3786,8 +3621,7 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>                                                                                ^^^^^^^^^^^^^^^^
 22>                                                                                                ^^
 23>                                                                                                  ^^^^^
-24>                                                                                                       ^
-25>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+24>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    { 
@@ -3814,7 +3648,6 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 22>                                                                                                
 23>                                                                                                  [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
   >                                                                                                      { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]
-24>                                                                                                       )
 1->Emitted(108, 5) Source(164, 5) + SourceIndex(0)
 2 >Emitted(108, 7) Source(164, 7) + SourceIndex(0)
 3 >Emitted(108, 11) Source(164, 11) + SourceIndex(0)
@@ -3838,77 +3671,64 @@ sourceFile:sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValue
 21>Emitted(108, 97) Source(164, 79) + SourceIndex(0)
 22>Emitted(108, 99) Source(163, 6) + SourceIndex(0)
 23>Emitted(108, 104) Source(164, 79) + SourceIndex(0)
-24>Emitted(108, 105) Source(164, 80) + SourceIndex(0)
 ---
 >>>    _93 = _92[_91], _94 = _93.name, name = _94 === void 0 ? "noName" : _94, _95 = _93.skills, _96 = _95 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _95, _97 = _96.primary, primary = _97 === void 0 ? "primary" : _97, _98 = _96.secondary, secondary = _98 === void 0 ? "secondary" : _98;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^
-5 >                                  ^^
-6 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                          ^^
-8 >                                                                            ^^^^^^^^^^^^^^^^
-9 >                                                                                            ^^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                       ^^
-12>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                          ^^
-14>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                      ^^
-16>                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                           ^^
-18>                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->^^^^^^^^^^^^^^^^^^^^
+2 >                    ^^^^^^^^^^^^^^
+3 >                                  ^^
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                                          ^^
+6 >                                                                            ^^^^^^^^^^^^^^^^
+7 >                                                                                            ^^
+8 >                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+9 >                                                                                                                                                                       ^^
+10>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
+11>                                                                                                                                                                                          ^^
+12>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                                                                                                      ^^
+14>                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                                                           ^^
+16>                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-2 >    {
-  >        name = "noName",
-  >        skills: {
-  >            primary = "primary",
-  >            secondary = "secondary"
-  >        } = { primary: "noSkill", secondary: "noSkill" }
-  >    }
-3 >                  
-4 >                    name = "noName"
-5 >                                  
-6 >                                    name = "noName"
-7 >                                                                          ,
+2 >                    name = "noName"
+3 >                                  
+4 >                                    name = "noName"
+5 >                                                                          ,
   >                                                                              
-8 >                                                                            skills: {
+6 >                                                                            skills: {
   >                                                                                    primary = "primary",
   >                                                                                    secondary = "secondary"
   >                                                                                } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                            
-10>                                                                                              skills: {
+7 >                                                                                            
+8 >                                                                                              skills: {
   >                                                                                                      primary = "primary",
   >                                                                                                      secondary = "secondary"
   >                                                                                                  } = { primary: "noSkill", secondary: "noSkill" }
-11>                                                                                                                                                                       
-12>                                                                                                                                                                         primary = "primary"
-13>                                                                                                                                                                                          
-14>                                                                                                                                                                                            primary = "primary"
-15>                                                                                                                                                                                                                                      ,
+9 >                                                                                                                                                                       
+10>                                                                                                                                                                         primary = "primary"
+11>                                                                                                                                                                                          
+12>                                                                                                                                                                                            primary = "primary"
+13>                                                                                                                                                                                                                                      ,
   >                                                                                                                                                                                                                                              
-16>                                                                                                                                                                                                                                        secondary = "secondary"
-17>                                                                                                                                                                                                                                                           
-18>                                                                                                                                                                                                                                                             secondary = "secondary"
-1->Emitted(109, 5) Source(157, 6) + SourceIndex(0)
-2 >Emitted(109, 19) Source(163, 2) + SourceIndex(0)
-3 >Emitted(109, 21) Source(158, 5) + SourceIndex(0)
-4 >Emitted(109, 35) Source(158, 20) + SourceIndex(0)
-5 >Emitted(109, 37) Source(158, 5) + SourceIndex(0)
-6 >Emitted(109, 75) Source(158, 20) + SourceIndex(0)
-7 >Emitted(109, 77) Source(159, 5) + SourceIndex(0)
-8 >Emitted(109, 93) Source(162, 53) + SourceIndex(0)
-9 >Emitted(109, 95) Source(159, 5) + SourceIndex(0)
-10>Emitted(109, 168) Source(162, 53) + SourceIndex(0)
-11>Emitted(109, 170) Source(160, 9) + SourceIndex(0)
-12>Emitted(109, 187) Source(160, 28) + SourceIndex(0)
-13>Emitted(109, 189) Source(160, 9) + SourceIndex(0)
-14>Emitted(109, 231) Source(160, 28) + SourceIndex(0)
-15>Emitted(109, 233) Source(161, 9) + SourceIndex(0)
-16>Emitted(109, 252) Source(161, 32) + SourceIndex(0)
-17>Emitted(109, 254) Source(161, 9) + SourceIndex(0)
-18>Emitted(109, 300) Source(161, 32) + SourceIndex(0)
+14>                                                                                                                                                                                                                                        secondary = "secondary"
+15>                                                                                                                                                                                                                                                           
+16>                                                                                                                                                                                                                                                             secondary = "secondary"
+1->Emitted(109, 21) Source(158, 5) + SourceIndex(0)
+2 >Emitted(109, 35) Source(158, 20) + SourceIndex(0)
+3 >Emitted(109, 37) Source(158, 5) + SourceIndex(0)
+4 >Emitted(109, 75) Source(158, 20) + SourceIndex(0)
+5 >Emitted(109, 77) Source(159, 5) + SourceIndex(0)
+6 >Emitted(109, 93) Source(162, 53) + SourceIndex(0)
+7 >Emitted(109, 95) Source(159, 5) + SourceIndex(0)
+8 >Emitted(109, 168) Source(162, 53) + SourceIndex(0)
+9 >Emitted(109, 170) Source(160, 9) + SourceIndex(0)
+10>Emitted(109, 187) Source(160, 28) + SourceIndex(0)
+11>Emitted(109, 189) Source(160, 9) + SourceIndex(0)
+12>Emitted(109, 231) Source(160, 28) + SourceIndex(0)
+13>Emitted(109, 233) Source(161, 9) + SourceIndex(0)
+14>Emitted(109, 252) Source(161, 32) + SourceIndex(0)
+15>Emitted(109, 254) Source(161, 9) + SourceIndex(0)
+16>Emitted(109, 300) Source(161, 32) + SourceIndex(0)
 ---
 >>>    console.log(nameA);
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.js.map
index 17d9a9b0411..d23d39085be 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatement.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatement.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatement.ts"],"names":[],"mappings":"AAOA,IAAI,KAAK,GAAG,OAAO,CAAC;AACpB,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACvD,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AACrD,uBAAW,CAAY;AACvB,uBAAW,EAAE,qBAAa,CAAY;AAC5C,IAAA,8CAA8E,EAAxE,eAAW,EAAE,iBAAa,CAA+C;AAC/E,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatement.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatement.ts"],"names":[],"mappings":"AAOA,IAAI,KAAK,GAAG,OAAO,CAAC;AACpB,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACvD,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AACrD,IAAA,mBAAW,CAAY;AACvB,IAAA,mBAAW,EAAE,qBAAa,CAAY;AACxC,IAAA,8CAA0E,EAAxE,eAAW,EAAE,iBAAa,CAA+C;AAC/E,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.sourcemap.txt
index f066ec465cf..c017267f22a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.sourcemap.txt
@@ -129,35 +129,41 @@ sourceFile:sourceMapValidationDestructuringVariableStatement.ts
 ---
 >>>var nameA = robotA.name;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^
-4 >                        ^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var { 
-2 >name: nameA
-3 >                        } = robotA;
+2 >
+3 >    name: nameA
+4 >                        } = robotA;
 1 >Emitted(4, 1) Source(11, 7) + SourceIndex(0)
-2 >Emitted(4, 24) Source(11, 18) + SourceIndex(0)
-3 >Emitted(4, 25) Source(11, 30) + SourceIndex(0)
+2 >Emitted(4, 5) Source(11, 7) + SourceIndex(0)
+3 >Emitted(4, 24) Source(11, 18) + SourceIndex(0)
+4 >Emitted(4, 25) Source(11, 30) + SourceIndex(0)
 ---
 >>>var nameB = robotB.name, skillB = robotB.skill;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^
-5 >                                              ^
-6 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^^^^
+6 >                                              ^
+7 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >var { 
-2 >name: nameB
-3 >                       , 
-4 >                         skill: skillB
-5 >                                               } = robotB;
+2 >
+3 >    name: nameB
+4 >                       , 
+5 >                         skill: skillB
+6 >                                               } = robotB;
 1->Emitted(5, 1) Source(12, 7) + SourceIndex(0)
-2 >Emitted(5, 24) Source(12, 18) + SourceIndex(0)
-3 >Emitted(5, 26) Source(12, 20) + SourceIndex(0)
-4 >Emitted(5, 47) Source(12, 33) + SourceIndex(0)
-5 >Emitted(5, 48) Source(12, 45) + SourceIndex(0)
+2 >Emitted(5, 5) Source(12, 7) + SourceIndex(0)
+3 >Emitted(5, 24) Source(12, 18) + SourceIndex(0)
+4 >Emitted(5, 26) Source(12, 20) + SourceIndex(0)
+5 >Emitted(5, 47) Source(12, 33) + SourceIndex(0)
+6 >Emitted(5, 48) Source(12, 45) + SourceIndex(0)
 ---
 >>>var _a = { name: "Edger", skill: "cutting edges" }, nameC = _a.name, skillC = _a.skill;
 1->
@@ -169,16 +175,16 @@ sourceFile:sourceMapValidationDestructuringVariableStatement.ts
 7 >                                                                     ^^^^^^^^^^^^^^^^^
 8 >                                                                                      ^
 1->
-  >
+  >var 
 2 >
-3 >    var { name: nameC, skill: skillC } = { name: "Edger", skill: "cutting edges" }
+3 >    { name: nameC, skill: skillC } = { name: "Edger", skill: "cutting edges" }
 4 >                                                  
 5 >                                                    name: nameC
 6 >                                                                   , 
 7 >                                                                     skill: skillC
 8 >                                                                                       } = { name: "Edger", skill: "cutting edges" };
-1->Emitted(6, 1) Source(13, 1) + SourceIndex(0)
-2 >Emitted(6, 5) Source(13, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(13, 5) + SourceIndex(0)
+2 >Emitted(6, 5) Source(13, 5) + SourceIndex(0)
 3 >Emitted(6, 51) Source(13, 79) + SourceIndex(0)
 4 >Emitted(6, 53) Source(13, 7) + SourceIndex(0)
 5 >Emitted(6, 68) Source(13, 18) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.js.map
index cc2ae54143d..ad8a81464b4 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatement1.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatement1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatement1.ts"],"names":[],"mappings":"AAOA,IAAI,KAAK,GAAG,OAAO,CAAC;AACpB,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACvD,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AAC3D,IAAI,CAAS,EAAI,mBAAW,CAAY;AACxC,IAAI,CAAS,EAAI,mBAAW,EAAE,qBAAa,CAAY;AACvD,IAAI,CAAS,EAAE,8CAA0E,EAAxE,eAAW,EAAE,iBAAa,CAA+C;AAEpF,uBAAW,EAAa,CAAC,GAAG,KAAK,CAAC;AAClC,uBAAW,EAAE,qBAAa,EAAa,CAAC,GAAG,QAAQ,CAAC;AAC1D,IAAA,8CAA8E,EAAxE,eAAW,EAAE,iBAAa,EAAgD,CAAC,GAAG,KAAK,CAAC;AAE1F,IAAI,CAAC,GAAG,KAAK,EAAI,mBAAW,EAAa,EAAE,GAAE,OAAO,CAAC;AACrD,IAAI,CAAC,GAAG,KAAK,EAAI,mBAAW,EAAE,qBAAa,EAAa,EAAE,GAAG,OAAO,CAAC;AACrE,IAAI,CAAC,GAAG,KAAK,EAAE,8CAA0E,EAAxE,eAAW,EAAE,iBAAa,EAAgD,EAAE,GAAG,KAAK,CAAC;AACtG,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatement1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatement1.ts"],"names":[],"mappings":"AAOA,IAAI,KAAK,GAAG,OAAO,CAAC;AACpB,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACvD,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AACvD,IAAA,CAAS,EAAI,mBAAW,CAAY;AACpC,IAAA,CAAS,EAAI,mBAAW,EAAE,qBAAa,CAAY;AACnD,IAAA,CAAS,EAAE,8CAA0E,EAAxE,eAAW,EAAE,iBAAa,CAA+C;AAEpF,IAAA,mBAAW,EAAa,CAAC,GAAG,KAAK,CAAC;AAClC,IAAA,mBAAW,EAAE,qBAAa,EAAa,CAAC,GAAG,QAAQ,CAAC;AACtD,IAAA,8CAA0E,EAAxE,eAAW,EAAE,iBAAa,EAAgD,CAAC,GAAG,KAAK,CAAC;AAE1F,IAAI,CAAC,GAAG,KAAK,EAAI,mBAAW,EAAa,EAAE,GAAE,OAAO,CAAC;AACrD,IAAI,CAAC,GAAG,KAAK,EAAI,mBAAW,EAAE,qBAAa,EAAa,EAAE,GAAG,OAAO,CAAC;AACrE,IAAI,CAAC,GAAG,KAAK,EAAE,8CAA0E,EAAxE,eAAW,EAAE,iBAAa,EAAgD,EAAE,GAAG,KAAK,CAAC;AACtG,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.sourcemap.txt
index 70407ad9f81..889170266b3 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.sourcemap.txt
@@ -136,13 +136,13 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 6 >                          ^
 7 >                           ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >
-2 >var 
+  >var 
+2 >
 3 >    a: string
 4 >     , { 
 5 >       name: nameA
 6 >                           } = robotA;
-1 >Emitted(4, 1) Source(11, 1) + SourceIndex(0)
+1 >Emitted(4, 1) Source(11, 5) + SourceIndex(0)
 2 >Emitted(4, 5) Source(11, 5) + SourceIndex(0)
 3 >Emitted(4, 6) Source(11, 14) + SourceIndex(0)
 4 >Emitted(4, 8) Source(11, 18) + SourceIndex(0)
@@ -160,15 +160,15 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 8 >                                                 ^
 9 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
-  >
-2 >var 
+  >var 
+2 >
 3 >    b: string
 4 >     , { 
 5 >       name: nameB
 6 >                          , 
 7 >                            skill: skillB
 8 >                                                  } = robotB;
-1->Emitted(5, 1) Source(12, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(12, 5) + SourceIndex(0)
 2 >Emitted(5, 5) Source(12, 5) + SourceIndex(0)
 3 >Emitted(5, 6) Source(12, 14) + SourceIndex(0)
 4 >Emitted(5, 8) Source(12, 18) + SourceIndex(0)
@@ -189,8 +189,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 9 >                                                                        ^^^^^^^^^^^^^^^^^
 10>                                                                                         ^
 1->
-  >
-2 >var 
+  >var 
+2 >
 3 >    c: string
 4 >     , 
 5 >       { name: nameC, skill: skillC } = { name: "Edger", skill: "cutting edges" }
@@ -199,7 +199,7 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 8 >                                                                      , 
 9 >                                                                        skill: skillC
 10>                                                                                          } = { name: "Edger", skill: "cutting edges" };
-1->Emitted(6, 1) Source(13, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(13, 5) + SourceIndex(0)
 2 >Emitted(6, 5) Source(13, 5) + SourceIndex(0)
 3 >Emitted(6, 6) Source(13, 14) + SourceIndex(0)
 4 >Emitted(6, 8) Source(13, 16) + SourceIndex(0)
@@ -212,60 +212,66 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 ---
 >>>var nameA = robotA.name, a = hello;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^
-5 >                          ^^^
-6 >                             ^^^^^
-7 >                                  ^
-8 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^
+6 >                          ^^^
+7 >                             ^^^^^
+8 >                                  ^
+9 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
   >var { 
-2 >name: nameA
-3 >                        } = robotA, 
-4 >                         a
-5 >                           = 
-6 >                             hello
-7 >                                  ;
+2 >
+3 >    name: nameA
+4 >                        } = robotA, 
+5 >                         a
+6 >                           = 
+7 >                             hello
+8 >                                  ;
 1 >Emitted(7, 1) Source(15, 7) + SourceIndex(0)
-2 >Emitted(7, 24) Source(15, 18) + SourceIndex(0)
-3 >Emitted(7, 26) Source(15, 31) + SourceIndex(0)
-4 >Emitted(7, 27) Source(15, 32) + SourceIndex(0)
-5 >Emitted(7, 30) Source(15, 35) + SourceIndex(0)
-6 >Emitted(7, 35) Source(15, 40) + SourceIndex(0)
-7 >Emitted(7, 36) Source(15, 41) + SourceIndex(0)
+2 >Emitted(7, 5) Source(15, 7) + SourceIndex(0)
+3 >Emitted(7, 24) Source(15, 18) + SourceIndex(0)
+4 >Emitted(7, 26) Source(15, 31) + SourceIndex(0)
+5 >Emitted(7, 27) Source(15, 32) + SourceIndex(0)
+6 >Emitted(7, 30) Source(15, 35) + SourceIndex(0)
+7 >Emitted(7, 35) Source(15, 40) + SourceIndex(0)
+8 >Emitted(7, 36) Source(15, 41) + SourceIndex(0)
 ---
 >>>var nameB = robotB.name, skillB = robotB.skill, b = " hello";
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^
-5 >                                              ^^
-6 >                                                ^
-7 >                                                 ^^^
-8 >                                                    ^^^^^^^^
-9 >                                                            ^
-10>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^^^^
+6 >                                              ^^
+7 >                                                ^
+8 >                                                 ^^^
+9 >                                                    ^^^^^^^^
+10>                                                            ^
+11>                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >var { 
-2 >name: nameB
-3 >                       , 
-4 >                         skill: skillB
-5 >                                               } = robotB, 
-6 >                                                b
-7 >                                                  = 
-8 >                                                    " hello"
-9 >                                                            ;
+2 >
+3 >    name: nameB
+4 >                       , 
+5 >                         skill: skillB
+6 >                                               } = robotB, 
+7 >                                                b
+8 >                                                  = 
+9 >                                                    " hello"
+10>                                                            ;
 1->Emitted(8, 1) Source(16, 7) + SourceIndex(0)
-2 >Emitted(8, 24) Source(16, 18) + SourceIndex(0)
-3 >Emitted(8, 26) Source(16, 20) + SourceIndex(0)
-4 >Emitted(8, 47) Source(16, 33) + SourceIndex(0)
-5 >Emitted(8, 49) Source(16, 46) + SourceIndex(0)
-6 >Emitted(8, 50) Source(16, 47) + SourceIndex(0)
-7 >Emitted(8, 53) Source(16, 50) + SourceIndex(0)
-8 >Emitted(8, 61) Source(16, 58) + SourceIndex(0)
-9 >Emitted(8, 62) Source(16, 59) + SourceIndex(0)
+2 >Emitted(8, 5) Source(16, 7) + SourceIndex(0)
+3 >Emitted(8, 24) Source(16, 18) + SourceIndex(0)
+4 >Emitted(8, 26) Source(16, 20) + SourceIndex(0)
+5 >Emitted(8, 47) Source(16, 33) + SourceIndex(0)
+6 >Emitted(8, 49) Source(16, 46) + SourceIndex(0)
+7 >Emitted(8, 50) Source(16, 47) + SourceIndex(0)
+8 >Emitted(8, 53) Source(16, 50) + SourceIndex(0)
+9 >Emitted(8, 61) Source(16, 58) + SourceIndex(0)
+10>Emitted(8, 62) Source(16, 59) + SourceIndex(0)
 ---
 >>>var _b = { name: "Edger", skill: "cutting edges" }, nameC = _b.name, skillC = _b.skill, c = hello;
 1->
@@ -281,9 +287,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 11>                                                                                            ^^^^^
 12>                                                                                                 ^
 1->
-  >
+  >var 
 2 >
-3 >    var { name: nameC, skill: skillC } = { name: "Edger", skill: "cutting edges" }
+3 >    { name: nameC, skill: skillC } = { name: "Edger", skill: "cutting edges" }
 4 >                                                  
 5 >                                                    name: nameC
 6 >                                                                   , 
@@ -293,8 +299,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatement1.ts
 10>                                                                                          = 
 11>                                                                                            hello
 12>                                                                                                 ;
-1->Emitted(9, 1) Source(17, 1) + SourceIndex(0)
-2 >Emitted(9, 5) Source(17, 1) + SourceIndex(0)
+1->Emitted(9, 1) Source(17, 5) + SourceIndex(0)
+2 >Emitted(9, 5) Source(17, 5) + SourceIndex(0)
 3 >Emitted(9, 51) Source(17, 79) + SourceIndex(0)
 4 >Emitted(9, 53) Source(17, 7) + SourceIndex(0)
 5 >Emitted(9, 68) Source(17, 18) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js.map
index cf91be353da..85d004a7ec6 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern.ts"],"names":[],"mappings":"AAIA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAGxC,qBAAK,CAAW;AAClB,uBAAO,CAAW;AAClB,wBAAQ,EAAE,kBAAM,EAAE,mBAAO,CAAW;AAEpC,iDAAQ,CAAoC;AACjD,IAAA,oCAA8D,EAAzD,eAAO,EAAE,aAAK,EAAE,cAAM,CAAoC;AAE1D,wBAAQ,EAAE,4BAAa,CAAW;AAEvC,EAAE,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern.ts"],"names":[],"mappings":"AAIA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAGxC,IAAA,iBAAK,CAAW;AAClB,IAAA,mBAAO,CAAW;AAClB,IAAA,oBAAQ,EAAE,kBAAM,EAAE,mBAAO,CAAW;AAEpC,IAAA,6CAAQ,CAAoC;AAC7C,IAAA,oCAA0D,EAAzD,eAAO,EAAE,aAAK,EAAE,cAAM,CAAoC;AAE1D,IAAA,oBAAQ,EAAE,4BAAa,CAAW;AAEvC,EAAE,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.sourcemap.txt
index 43bcf108a9d..fbb082b4ecc 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.sourcemap.txt
@@ -92,69 +92,81 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern.
 ---
 >>>var nameA = robotA[1];
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^
-3 >                     ^
-4 >                      ^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^
+4 >                     ^
+5 >                      ^^^->
 1 >
   >
   >
   >let [, 
-2 >nameA
-3 >                     ] = robotA;
+2 >
+3 >    nameA
+4 >                     ] = robotA;
 1 >Emitted(3, 1) Source(9, 8) + SourceIndex(0)
-2 >Emitted(3, 22) Source(9, 13) + SourceIndex(0)
-3 >Emitted(3, 23) Source(9, 24) + SourceIndex(0)
+2 >Emitted(3, 5) Source(9, 8) + SourceIndex(0)
+3 >Emitted(3, 22) Source(9, 13) + SourceIndex(0)
+4 >Emitted(3, 23) Source(9, 24) + SourceIndex(0)
 ---
 >>>var numberB = robotB[0];
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^
-4 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >let [
-2 >numberB
-3 >                       ] = robotB;
+2 >
+3 >    numberB
+4 >                       ] = robotB;
 1->Emitted(4, 1) Source(10, 6) + SourceIndex(0)
-2 >Emitted(4, 24) Source(10, 13) + SourceIndex(0)
-3 >Emitted(4, 25) Source(10, 24) + SourceIndex(0)
+2 >Emitted(4, 5) Source(10, 6) + SourceIndex(0)
+3 >Emitted(4, 24) Source(10, 13) + SourceIndex(0)
+4 >Emitted(4, 25) Source(10, 24) + SourceIndex(0)
 ---
 >>>var numberA2 = robotA[0], nameA2 = robotA[1], skillA2 = robotA[2];
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^
-4 >                          ^^^^^^^^^^^^^^^^^^
-5 >                                            ^^
-6 >                                              ^^^^^^^^^^^^^^^^^^^
-7 >                                                                 ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^
+4 >                        ^^
+5 >                          ^^^^^^^^^^^^^^^^^^
+6 >                                            ^^
+7 >                                              ^^^^^^^^^^^^^^^^^^^
+8 >                                                                 ^
 1->
   >let [
-2 >numberA2
-3 >                        , 
-4 >                          nameA2
-5 >                                            , 
-6 >                                              skillA2
-7 >                                                                 ] = robotA;
+2 >
+3 >    numberA2
+4 >                        , 
+5 >                          nameA2
+6 >                                            , 
+7 >                                              skillA2
+8 >                                                                 ] = robotA;
 1->Emitted(5, 1) Source(11, 6) + SourceIndex(0)
-2 >Emitted(5, 25) Source(11, 14) + SourceIndex(0)
-3 >Emitted(5, 27) Source(11, 16) + SourceIndex(0)
-4 >Emitted(5, 45) Source(11, 22) + SourceIndex(0)
-5 >Emitted(5, 47) Source(11, 24) + SourceIndex(0)
-6 >Emitted(5, 66) Source(11, 31) + SourceIndex(0)
-7 >Emitted(5, 67) Source(11, 42) + SourceIndex(0)
+2 >Emitted(5, 5) Source(11, 6) + SourceIndex(0)
+3 >Emitted(5, 25) Source(11, 14) + SourceIndex(0)
+4 >Emitted(5, 27) Source(11, 16) + SourceIndex(0)
+5 >Emitted(5, 45) Source(11, 22) + SourceIndex(0)
+6 >Emitted(5, 47) Source(11, 24) + SourceIndex(0)
+7 >Emitted(5, 66) Source(11, 31) + SourceIndex(0)
+8 >Emitted(5, 67) Source(11, 42) + SourceIndex(0)
 ---
 >>>var numberC2 = [3, "edging", "Trimming edges"][0];
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                                 ^
-4 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                                 ^
+5 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
   >let [
-2 >numberC2
-3 >                                                 ] = [3, "edging", "Trimming edges"];
+2 >
+3 >    numberC2
+4 >                                                 ] = [3, "edging", "Trimming edges"];
 1 >Emitted(6, 1) Source(13, 6) + SourceIndex(0)
-2 >Emitted(6, 50) Source(13, 14) + SourceIndex(0)
-3 >Emitted(6, 51) Source(13, 50) + SourceIndex(0)
+2 >Emitted(6, 5) Source(13, 6) + SourceIndex(0)
+3 >Emitted(6, 50) Source(13, 14) + SourceIndex(0)
+4 >Emitted(6, 51) Source(13, 50) + SourceIndex(0)
 ---
 >>>var _a = [3, "edging", "Trimming edges"], numberC = _a[0], nameC = _a[1], skillC = _a[2];
 1->
@@ -168,9 +180,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern.
 9 >                                                                          ^^^^^^^^^^^^^^
 10>                                                                                        ^
 1->
-  >
+  >let 
 2 >
-3 >    let [numberC, nameC, skillC] = [3, "edging", "Trimming edges"]
+3 >    [numberC, nameC, skillC] = [3, "edging", "Trimming edges"]
 4 >                                        
 5 >                                          numberC
 6 >                                                         , 
@@ -178,8 +190,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern.
 8 >                                                                        , 
 9 >                                                                          skillC
 10>                                                                                        ] = [3, "edging", "Trimming edges"];
-1->Emitted(7, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(7, 5) Source(14, 1) + SourceIndex(0)
+1->Emitted(7, 1) Source(14, 5) + SourceIndex(0)
+2 >Emitted(7, 5) Source(14, 5) + SourceIndex(0)
 3 >Emitted(7, 41) Source(14, 63) + SourceIndex(0)
 4 >Emitted(7, 43) Source(14, 6) + SourceIndex(0)
 5 >Emitted(7, 58) Source(14, 13) + SourceIndex(0)
@@ -191,22 +203,25 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern.
 ---
 >>>var numberA3 = robotA[0], robotAInfo = robotA.slice(1);
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^
-4 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                      ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^
+4 >                        ^^
+5 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                      ^
 1 >
   >
   >let [
-2 >numberA3
-3 >                        , 
-4 >                          ...robotAInfo
-5 >                                                      ] = robotA;
+2 >
+3 >    numberA3
+4 >                        , 
+5 >                          ...robotAInfo
+6 >                                                      ] = robotA;
 1 >Emitted(8, 1) Source(16, 6) + SourceIndex(0)
-2 >Emitted(8, 25) Source(16, 14) + SourceIndex(0)
-3 >Emitted(8, 27) Source(16, 16) + SourceIndex(0)
-4 >Emitted(8, 55) Source(16, 29) + SourceIndex(0)
-5 >Emitted(8, 56) Source(16, 40) + SourceIndex(0)
+2 >Emitted(8, 5) Source(16, 6) + SourceIndex(0)
+3 >Emitted(8, 25) Source(16, 14) + SourceIndex(0)
+4 >Emitted(8, 27) Source(16, 16) + SourceIndex(0)
+5 >Emitted(8, 55) Source(16, 29) + SourceIndex(0)
+6 >Emitted(8, 56) Source(16, 40) + SourceIndex(0)
 ---
 >>>if (nameA == nameA2) {
 1 >
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js.map
index 6d0bcc3b9b2..30ce8c0ea8a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.ts"],"names":[],"mappings":"AAIA,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AAElE,2BAAM,CAAgB;AACxB,2BAAM,CAAgB;AACtB,2BAAM,EAAE,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,CAAiB;AAExD,iDAAM,CAAsC;AACjD,IAAA,sCAAmF,EAA9E,eAAO,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,CAAuC;AAE/E,0CAAkB,CAAgB;AAEvC,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.ts"],"names":[],"mappings":"AAIA,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AAElE,IAAA,uBAAM,CAAgB;AACxB,IAAA,uBAAM,CAAgB;AACtB,IAAA,uBAAM,EAAE,mBAAgC,EAA/B,qBAAa,EAAE,uBAAe,CAAiB;AAExD,IAAA,6CAAM,CAAsC;AAC7C,IAAA,sCAA+E,EAA9E,eAAO,EAAE,UAAgC,EAA/B,qBAAa,EAAE,uBAAe,CAAuC;AAE/E,IAAA,sCAAkB,CAAgB;AAEvC,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.sourcemap.txt
index 64e22a28771..fb2170d1b46 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.sourcemap.txt
@@ -104,74 +104,86 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern2
 ---
 >>>var skillA = multiRobotA[1];
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^
-4 >                            ^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^
+4 >                           ^
+5 >                            ^->
 1 >
   >
   >let [, 
-2 >skillA
-3 >                           ] = multiRobotA;
+2 >
+3 >    skillA
+4 >                           ] = multiRobotA;
 1 >Emitted(3, 1) Source(8, 8) + SourceIndex(0)
-2 >Emitted(3, 28) Source(8, 14) + SourceIndex(0)
-3 >Emitted(3, 29) Source(8, 30) + SourceIndex(0)
+2 >Emitted(3, 5) Source(8, 8) + SourceIndex(0)
+3 >Emitted(3, 28) Source(8, 14) + SourceIndex(0)
+4 >Emitted(3, 29) Source(8, 30) + SourceIndex(0)
 ---
 >>>var nameMB = multiRobotB[0];
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^
-4 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^
+4 >                           ^
+5 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >let [
-2 >nameMB
-3 >                           ] = multiRobotB;
+2 >
+3 >    nameMB
+4 >                           ] = multiRobotB;
 1->Emitted(4, 1) Source(9, 6) + SourceIndex(0)
-2 >Emitted(4, 28) Source(9, 12) + SourceIndex(0)
-3 >Emitted(4, 29) Source(9, 28) + SourceIndex(0)
+2 >Emitted(4, 5) Source(9, 6) + SourceIndex(0)
+3 >Emitted(4, 28) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 29) Source(9, 28) + SourceIndex(0)
 ---
 >>>var nameMA = multiRobotA[0], _a = multiRobotA[1], primarySkillA = _a[0], secondarySkillA = _a[1];
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^^
-4 >                             ^^^^^^^^^^^^^^^^^^^
-5 >                                                ^^
-6 >                                                  ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                       ^^
-8 >                                                                         ^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^
+4 >                           ^^
+5 >                             ^^^^^^^^^^^^^^^^^^^
+6 >                                                ^^
+7 >                                                  ^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                       ^^
+9 >                                                                         ^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                ^
 1->
   >let [
-2 >nameMA
-3 >                           , 
-4 >                             [primarySkillA, secondarySkillA]
-5 >                                                
-6 >                                                  primarySkillA
-7 >                                                                       , 
-8 >                                                                         secondarySkillA
-9 >                                                                                                ]] = multiRobotA;
+2 >
+3 >    nameMA
+4 >                           , 
+5 >                             [primarySkillA, secondarySkillA]
+6 >                                                
+7 >                                                  primarySkillA
+8 >                                                                       , 
+9 >                                                                         secondarySkillA
+10>                                                                                                ]] = multiRobotA;
 1->Emitted(5, 1) Source(10, 6) + SourceIndex(0)
-2 >Emitted(5, 28) Source(10, 12) + SourceIndex(0)
-3 >Emitted(5, 30) Source(10, 14) + SourceIndex(0)
-4 >Emitted(5, 49) Source(10, 46) + SourceIndex(0)
-5 >Emitted(5, 51) Source(10, 15) + SourceIndex(0)
-6 >Emitted(5, 72) Source(10, 28) + SourceIndex(0)
-7 >Emitted(5, 74) Source(10, 30) + SourceIndex(0)
-8 >Emitted(5, 97) Source(10, 45) + SourceIndex(0)
-9 >Emitted(5, 98) Source(10, 62) + SourceIndex(0)
+2 >Emitted(5, 5) Source(10, 6) + SourceIndex(0)
+3 >Emitted(5, 28) Source(10, 12) + SourceIndex(0)
+4 >Emitted(5, 30) Source(10, 14) + SourceIndex(0)
+5 >Emitted(5, 49) Source(10, 46) + SourceIndex(0)
+6 >Emitted(5, 51) Source(10, 15) + SourceIndex(0)
+7 >Emitted(5, 72) Source(10, 28) + SourceIndex(0)
+8 >Emitted(5, 74) Source(10, 30) + SourceIndex(0)
+9 >Emitted(5, 97) Source(10, 45) + SourceIndex(0)
+10>Emitted(5, 98) Source(10, 62) + SourceIndex(0)
 ---
 >>>var nameMC = ["roomba", ["vaccum", "mopping"]][0];
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                                 ^
-4 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                                 ^
+5 >                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
   >let [
-2 >nameMC
-3 >                                                 ] = ["roomba", ["vaccum", "mopping"]];
+2 >
+3 >    nameMC
+4 >                                                 ] = ["roomba", ["vaccum", "mopping"]];
 1 >Emitted(6, 1) Source(12, 6) + SourceIndex(0)
-2 >Emitted(6, 50) Source(12, 12) + SourceIndex(0)
-3 >Emitted(6, 51) Source(12, 50) + SourceIndex(0)
+2 >Emitted(6, 5) Source(12, 6) + SourceIndex(0)
+3 >Emitted(6, 50) Source(12, 12) + SourceIndex(0)
+4 >Emitted(6, 51) Source(12, 50) + SourceIndex(0)
 ---
 >>>var _b = ["roomba", ["vaccum", "mopping"]], nameMC2 = _b[0], _c = _b[1], primarySkillC = _c[0], secondarySkillC = _c[1];
 1->
@@ -187,9 +199,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern2
 11>                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^
 12>                                                                                                                       ^
 1->
-  >
+  >let 
 2 >
-3 >    let [nameMC2, [primarySkillC, secondarySkillC]] = ["roomba", ["vaccum", "mopping"]]
+3 >    [nameMC2, [primarySkillC, secondarySkillC]] = ["roomba", ["vaccum", "mopping"]]
 4 >                                          
 5 >                                            nameMC2
 6 >                                                           , 
@@ -199,8 +211,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern2
 10>                                                                                              , 
 11>                                                                                                secondarySkillC
 12>                                                                                                                       ]] = ["roomba", ["vaccum", "mopping"]];
-1->Emitted(7, 1) Source(13, 1) + SourceIndex(0)
-2 >Emitted(7, 5) Source(13, 1) + SourceIndex(0)
+1->Emitted(7, 1) Source(13, 5) + SourceIndex(0)
+2 >Emitted(7, 5) Source(13, 5) + SourceIndex(0)
 3 >Emitted(7, 43) Source(13, 84) + SourceIndex(0)
 4 >Emitted(7, 45) Source(13, 6) + SourceIndex(0)
 5 >Emitted(7, 60) Source(13, 13) + SourceIndex(0)
@@ -214,16 +226,19 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern2
 ---
 >>>var multiRobotAInfo = multiRobotA.slice(0);
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                          ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                          ^
 1 >
   >
   >let [
-2 >...multiRobotAInfo
-3 >                                          ] = multiRobotA;
+2 >
+3 >    ...multiRobotAInfo
+4 >                                          ] = multiRobotA;
 1 >Emitted(8, 1) Source(15, 6) + SourceIndex(0)
-2 >Emitted(8, 43) Source(15, 24) + SourceIndex(0)
-3 >Emitted(8, 44) Source(15, 40) + SourceIndex(0)
+2 >Emitted(8, 5) Source(15, 6) + SourceIndex(0)
+3 >Emitted(8, 43) Source(15, 24) + SourceIndex(0)
+4 >Emitted(8, 44) Source(15, 40) + SourceIndex(0)
 ---
 >>>if (nameMB == nameMA) {
 1 >
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map
index 96fd86faa4e..faa5e070b0a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts"],"names":[],"mappings":"AACK,iBAAC,CAAW"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts"],"names":[],"mappings":"AACK,IAAA,aAAC,CAAW"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt
index a52c7701db2..0499d382d10 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt
@@ -10,15 +10,18 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern4
 -------------------------------------------------------------------
 >>>var x = [1, 2][0];
 1 >
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^
-4 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^
+4 >                 ^
+5 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var [
-2 >x
-3 >                 ] = [1, 2];
+2 >
+3 >    x
+4 >                 ] = [1, 2];
 1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0)
-2 >Emitted(1, 18) Source(2, 7) + SourceIndex(0)
-3 >Emitted(1, 19) Source(2, 18) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 6) + SourceIndex(0)
+3 >Emitted(1, 18) Source(2, 7) + SourceIndex(0)
+4 >Emitted(1, 19) Source(2, 18) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map
index 337a73240b9..31ad84b4b44 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts"],"names":[],"mappings":"AACK,iBAAC,CAAW;AACjB,IAAA,WAAmB,EAAd,SAAC,EAAE,SAAC,CAAW"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts"],"names":[],"mappings":"AACK,IAAA,aAAC,CAAW;AACb,IAAA,WAAe,EAAd,SAAC,EAAE,SAAC,CAAW"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt
index 338b6424185..1775f60ffe0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt
@@ -10,16 +10,19 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern5
 -------------------------------------------------------------------
 >>>var x = [1, 2][0];
 1 >
-2 >^^^^^^^^^^^^^^^^^
-3 >                 ^
-4 >                  ^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^
+4 >                 ^
+5 >                  ^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var [
-2 >x
-3 >                 ] = [1, 2];
+2 >
+3 >    x
+4 >                 ] = [1, 2];
 1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0)
-2 >Emitted(1, 18) Source(2, 7) + SourceIndex(0)
-3 >Emitted(1, 19) Source(2, 18) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 6) + SourceIndex(0)
+3 >Emitted(1, 18) Source(2, 7) + SourceIndex(0)
+4 >Emitted(1, 19) Source(2, 18) + SourceIndex(0)
 ---
 >>>var _a = [1, 2], y = _a[0], z = _a[1];
 1->
@@ -32,16 +35,16 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern5
 8 >                                     ^
 9 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
-  >
+  >var 
 2 >
-3 >    var [y, z] = [1, 2]
+3 >    [y, z] = [1, 2]
 4 >               
 5 >                 y
 6 >                          , 
 7 >                            z
 8 >                                     ] = [1, 2];
-1->Emitted(2, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(2, 1) Source(3, 5) + SourceIndex(0)
+2 >Emitted(2, 5) Source(3, 5) + SourceIndex(0)
 3 >Emitted(2, 16) Source(3, 20) + SourceIndex(0)
 4 >Emitted(2, 18) Source(3, 6) + SourceIndex(0)
 5 >Emitted(2, 27) Source(3, 7) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map
index 9594cc22809..1271129d1c9 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts"],"names":[],"mappings":"AACK,kBAAM,EAAN,2BAAM,CAAW"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts"],"names":[],"mappings":"AACK,IAAA,cAAM,EAAN,2BAAM,CAAW"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt
index 90ebe4dc9ac..2dadb2f5352 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt
@@ -10,21 +10,24 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern6
 -------------------------------------------------------------------
 >>>var _a = [1, 2][0], x = _a === void 0 ? 20 : _a;
 1 >
-2 >^^^^^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                               ^
-6 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^
+4 >                  ^^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                               ^
+7 >                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var [
-2 >x = 20
-3 >                  
-4 >                    x = 20
-5 >                                               ] = [1, 2];
+2 >
+3 >    x = 20
+4 >                  
+5 >                    x = 20
+6 >                                               ] = [1, 2];
 1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0)
-2 >Emitted(1, 19) Source(2, 12) + SourceIndex(0)
-3 >Emitted(1, 21) Source(2, 6) + SourceIndex(0)
-4 >Emitted(1, 48) Source(2, 12) + SourceIndex(0)
-5 >Emitted(1, 49) Source(2, 23) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 6) + SourceIndex(0)
+3 >Emitted(1, 19) Source(2, 12) + SourceIndex(0)
+4 >Emitted(1, 21) Source(2, 6) + SourceIndex(0)
+5 >Emitted(1, 48) Source(2, 12) + SourceIndex(0)
+6 >Emitted(1, 49) Source(2, 23) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map
index 0def6b1a730..eb0df6f9ca2 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts"],"names":[],"mappings":"AACA,IAAA,WAAwB,EAAnB,UAAM,EAAN,2BAAM,EAAE,SAAC,CAAW"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts"],"names":[],"mappings":"AACI,IAAA,WAAoB,EAAnB,UAAM,EAAN,2BAAM,EAAE,SAAC,CAAW"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt
index f2a95375f2a..e4b2c871cb1 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt
@@ -21,9 +21,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern7
 10>                                                                   ^
 11>                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >
+  >var 
 2 >
-3 >    var [x = 20, j] = [1, 2]
+3 >    [x = 20, j] = [1, 2]
 4 >               
 5 >                 x = 20
 6 >                           
@@ -31,8 +31,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern7
 8 >                                                        , 
 9 >                                                          j
 10>                                                                   ] = [1, 2];
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0)
+1 >Emitted(1, 1) Source(2, 5) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
 3 >Emitted(1, 16) Source(2, 25) + SourceIndex(0)
 4 >Emitted(1, 18) Source(2, 6) + SourceIndex(0)
 5 >Emitted(1, 28) Source(2, 12) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js.map
index ce017fbbbcd..eb622ca275b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAIA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAExC,kBAAgB,EAAhB,qCAAgB,CAAW;AAC7B,kBAAY,EAAZ,iCAAY,CAAW;AACvB,kBAAa,EAAb,kCAAa,EAAE,cAAiB,EAAjB,sCAAiB,EAAE,cAAmB,EAAnB,wCAAmB,CAAW;AAEhE,2CAAa,EAAb,kCAAa,CAAoC;AACtD,IAAA,oCAA0F,EAArF,UAAY,EAAZ,iCAAY,EAAE,UAAgB,EAAhB,qCAAgB,EAAE,UAAkB,EAAlB,uCAAkB,CAAoC;AAEtF,kBAAa,EAAb,kCAAa,EAAE,4BAAa,CAAW;AAE5C,EAAE,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.ts"],"names":[],"mappings":"AAIA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAExC,IAAA,cAAgB,EAAhB,qCAAgB,CAAW;AAC7B,IAAA,cAAY,EAAZ,iCAAY,CAAW;AACvB,IAAA,cAAa,EAAb,kCAAa,EAAE,cAAiB,EAAjB,sCAAiB,EAAE,cAAmB,EAAnB,wCAAmB,CAAW;AAEhE,IAAA,uCAAa,EAAb,kCAAa,CAAoC;AAClD,IAAA,oCAAsF,EAArF,UAAY,EAAZ,iCAAY,EAAE,UAAgB,EAAhB,qCAAgB,EAAE,UAAkB,EAAlB,uCAAkB,CAAoC;AAEtF,IAAA,cAAa,EAAb,kCAAa,EAAE,4BAAa,CAAW;AAE5C,EAAE,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.sourcemap.txt
index 9df44518ca1..93c8e84f4cd 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.sourcemap.txt
@@ -93,103 +93,115 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 ---
 >>>var _a = robotA[1], nameA = _a === void 0 ? "noName" : _a;
 1->
-2 >^^^^^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                         ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^
+4 >                  ^^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                         ^
 1->
   >
   >let [, 
-2 >nameA = "noName"
-3 >                  
-4 >                    nameA = "noName"
-5 >                                                         ] = robotA;
+2 >
+3 >    nameA = "noName"
+4 >                  
+5 >                    nameA = "noName"
+6 >                                                         ] = robotA;
 1->Emitted(3, 1) Source(8, 8) + SourceIndex(0)
-2 >Emitted(3, 19) Source(8, 24) + SourceIndex(0)
-3 >Emitted(3, 21) Source(8, 8) + SourceIndex(0)
-4 >Emitted(3, 58) Source(8, 24) + SourceIndex(0)
-5 >Emitted(3, 59) Source(8, 35) + SourceIndex(0)
+2 >Emitted(3, 5) Source(8, 8) + SourceIndex(0)
+3 >Emitted(3, 19) Source(8, 24) + SourceIndex(0)
+4 >Emitted(3, 21) Source(8, 8) + SourceIndex(0)
+5 >Emitted(3, 58) Source(8, 24) + SourceIndex(0)
+6 >Emitted(3, 59) Source(8, 35) + SourceIndex(0)
 ---
 >>>var _b = robotB[0], numberB = _b === void 0 ? -1 : _b;
 1 >
-2 >^^^^^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                     ^
-6 >                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^
+4 >                  ^^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                     ^
+7 >                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >let [
-2 >numberB = -1
-3 >                  
-4 >                    numberB = -1
-5 >                                                     ] = robotB;
+2 >
+3 >    numberB = -1
+4 >                  
+5 >                    numberB = -1
+6 >                                                     ] = robotB;
 1 >Emitted(4, 1) Source(9, 6) + SourceIndex(0)
-2 >Emitted(4, 19) Source(9, 18) + SourceIndex(0)
-3 >Emitted(4, 21) Source(9, 6) + SourceIndex(0)
-4 >Emitted(4, 54) Source(9, 18) + SourceIndex(0)
-5 >Emitted(4, 55) Source(9, 29) + SourceIndex(0)
+2 >Emitted(4, 5) Source(9, 6) + SourceIndex(0)
+3 >Emitted(4, 19) Source(9, 18) + SourceIndex(0)
+4 >Emitted(4, 21) Source(9, 6) + SourceIndex(0)
+5 >Emitted(4, 54) Source(9, 18) + SourceIndex(0)
+6 >Emitted(4, 55) Source(9, 29) + SourceIndex(0)
 ---
 >>>var _c = robotA[0], numberA2 = _c === void 0 ? -1 : _c, _d = robotA[1], nameA2 = _d === void 0 ? "noName" : _d, _e = robotA[2], skillA2 = _e === void 0 ? "noSkill" : _e;
 1->
-2 >^^^^^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                      ^^
-6 >                                                        ^^^^^^^^^^^^^^
-7 >                                                                      ^^
-8 >                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                              ^^
-10>                                                                                                                ^^^^^^^^^^^^^^
-11>                                                                                                                              ^^
-12>                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                        ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^
+4 >                  ^^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                      ^^
+7 >                                                        ^^^^^^^^^^^^^^
+8 >                                                                      ^^
+9 >                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                              ^^
+11>                                                                                                                ^^^^^^^^^^^^^^
+12>                                                                                                                              ^^
+13>                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                        ^
 1->
   >let [
-2 >numberA2 = -1
-3 >                  
-4 >                    numberA2 = -1
-5 >                                                      , 
-6 >                                                        nameA2 = "noName"
-7 >                                                                      
-8 >                                                                        nameA2 = "noName"
-9 >                                                                                                              , 
-10>                                                                                                                skillA2 = "noSkill"
-11>                                                                                                                              
-12>                                                                                                                                skillA2 = "noSkill"
-13>                                                                                                                                                                        ] = robotA;
+2 >
+3 >    numberA2 = -1
+4 >                  
+5 >                    numberA2 = -1
+6 >                                                      , 
+7 >                                                        nameA2 = "noName"
+8 >                                                                      
+9 >                                                                        nameA2 = "noName"
+10>                                                                                                              , 
+11>                                                                                                                skillA2 = "noSkill"
+12>                                                                                                                              
+13>                                                                                                                                skillA2 = "noSkill"
+14>                                                                                                                                                                        ] = robotA;
 1->Emitted(5, 1) Source(10, 6) + SourceIndex(0)
-2 >Emitted(5, 19) Source(10, 19) + SourceIndex(0)
-3 >Emitted(5, 21) Source(10, 6) + SourceIndex(0)
-4 >Emitted(5, 55) Source(10, 19) + SourceIndex(0)
-5 >Emitted(5, 57) Source(10, 21) + SourceIndex(0)
-6 >Emitted(5, 71) Source(10, 38) + SourceIndex(0)
-7 >Emitted(5, 73) Source(10, 21) + SourceIndex(0)
-8 >Emitted(5, 111) Source(10, 38) + SourceIndex(0)
-9 >Emitted(5, 113) Source(10, 40) + SourceIndex(0)
-10>Emitted(5, 127) Source(10, 59) + SourceIndex(0)
-11>Emitted(5, 129) Source(10, 40) + SourceIndex(0)
-12>Emitted(5, 169) Source(10, 59) + SourceIndex(0)
-13>Emitted(5, 170) Source(10, 70) + SourceIndex(0)
+2 >Emitted(5, 5) Source(10, 6) + SourceIndex(0)
+3 >Emitted(5, 19) Source(10, 19) + SourceIndex(0)
+4 >Emitted(5, 21) Source(10, 6) + SourceIndex(0)
+5 >Emitted(5, 55) Source(10, 19) + SourceIndex(0)
+6 >Emitted(5, 57) Source(10, 21) + SourceIndex(0)
+7 >Emitted(5, 71) Source(10, 38) + SourceIndex(0)
+8 >Emitted(5, 73) Source(10, 21) + SourceIndex(0)
+9 >Emitted(5, 111) Source(10, 38) + SourceIndex(0)
+10>Emitted(5, 113) Source(10, 40) + SourceIndex(0)
+11>Emitted(5, 127) Source(10, 59) + SourceIndex(0)
+12>Emitted(5, 129) Source(10, 40) + SourceIndex(0)
+13>Emitted(5, 169) Source(10, 59) + SourceIndex(0)
+14>Emitted(5, 170) Source(10, 70) + SourceIndex(0)
 ---
 >>>var _f = [3, "edging", "Trimming edges"][0], numberC2 = _f === void 0 ? -1 : _f;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                           ^^
-4 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                               ^
-6 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                           ^^
+5 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                               ^
+7 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
   >let [
-2 >numberC2 = -1
-3 >                                           
-4 >                                             numberC2 = -1
-5 >                                                                               ] = [3, "edging", "Trimming edges"];
+2 >
+3 >    numberC2 = -1
+4 >                                           
+5 >                                             numberC2 = -1
+6 >                                                                               ] = [3, "edging", "Trimming edges"];
 1 >Emitted(6, 1) Source(12, 6) + SourceIndex(0)
-2 >Emitted(6, 44) Source(12, 19) + SourceIndex(0)
-3 >Emitted(6, 46) Source(12, 6) + SourceIndex(0)
-4 >Emitted(6, 80) Source(12, 19) + SourceIndex(0)
-5 >Emitted(6, 81) Source(12, 55) + SourceIndex(0)
+2 >Emitted(6, 5) Source(12, 6) + SourceIndex(0)
+3 >Emitted(6, 44) Source(12, 19) + SourceIndex(0)
+4 >Emitted(6, 46) Source(12, 6) + SourceIndex(0)
+5 >Emitted(6, 80) Source(12, 19) + SourceIndex(0)
+6 >Emitted(6, 81) Source(12, 55) + SourceIndex(0)
 ---
 >>>var _g = [3, "edging", "Trimming edges"], _h = _g[0], numberC = _h === void 0 ? -1 : _h, _j = _g[1], nameC = _j === void 0 ? "noName" : _j, _k = _g[2], skillC = _k === void 0 ? "noSkill" : _k;
 1->
@@ -209,9 +221,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 15>                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 16>                                                                                                                                                                                               ^
 1->
-  >
+  >let 
 2 >
-3 >    let [numberC = -1, nameC = "noName", skillC = "noSkill"] = [3, "edging", "Trimming edges"]
+3 >    [numberC = -1, nameC = "noName", skillC = "noSkill"] = [3, "edging", "Trimming edges"]
 4 >                                        
 5 >                                          numberC = -1
 6 >                                                    
@@ -225,8 +237,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 14>                                                                                                                                                      
 15>                                                                                                                                                        skillC = "noSkill"
 16>                                                                                                                                                                                               ] = [3, "edging", "Trimming edges"];
-1->Emitted(7, 1) Source(13, 1) + SourceIndex(0)
-2 >Emitted(7, 5) Source(13, 1) + SourceIndex(0)
+1->Emitted(7, 1) Source(13, 5) + SourceIndex(0)
+2 >Emitted(7, 5) Source(13, 5) + SourceIndex(0)
 3 >Emitted(7, 41) Source(13, 91) + SourceIndex(0)
 4 >Emitted(7, 43) Source(13, 6) + SourceIndex(0)
 5 >Emitted(7, 53) Source(13, 18) + SourceIndex(0)
@@ -244,28 +256,31 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 ---
 >>>var _l = robotA[0], numberA3 = _l === void 0 ? -1 : _l, robotAInfo = robotA.slice(1);
 1 >
-2 >^^^^^^^^^^^^^^^^^^
-3 >                  ^^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                      ^^
-6 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^
+4 >                  ^^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                      ^^
+7 >                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                                    ^
 1 >
   >
   >let [
-2 >numberA3 = -1
-3 >                  
-4 >                    numberA3 = -1
-5 >                                                      , 
-6 >                                                        ...robotAInfo
-7 >                                                                                    ] = robotA;
+2 >
+3 >    numberA3 = -1
+4 >                  
+5 >                    numberA3 = -1
+6 >                                                      , 
+7 >                                                        ...robotAInfo
+8 >                                                                                    ] = robotA;
 1 >Emitted(8, 1) Source(15, 6) + SourceIndex(0)
-2 >Emitted(8, 19) Source(15, 19) + SourceIndex(0)
-3 >Emitted(8, 21) Source(15, 6) + SourceIndex(0)
-4 >Emitted(8, 55) Source(15, 19) + SourceIndex(0)
-5 >Emitted(8, 57) Source(15, 21) + SourceIndex(0)
-6 >Emitted(8, 85) Source(15, 34) + SourceIndex(0)
-7 >Emitted(8, 86) Source(15, 45) + SourceIndex(0)
+2 >Emitted(8, 5) Source(15, 6) + SourceIndex(0)
+3 >Emitted(8, 19) Source(15, 19) + SourceIndex(0)
+4 >Emitted(8, 21) Source(15, 6) + SourceIndex(0)
+5 >Emitted(8, 55) Source(15, 19) + SourceIndex(0)
+6 >Emitted(8, 57) Source(15, 21) + SourceIndex(0)
+7 >Emitted(8, 85) Source(15, 34) + SourceIndex(0)
+8 >Emitted(8, 86) Source(15, 45) + SourceIndex(0)
 ---
 >>>if (nameA == nameA2) {
 1 >
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js.map
index 11ca67c19ad..d7290353064 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAIA,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AAElE,uBAA+B,EAA/B,oDAA+B,CAAgB;AACjD,uBAAiB,EAAjB,sCAAiB,CAAiB;AAClC,uBAAiB,EAAjB,sCAAiB,EAAE,mBAAiF,EAAjF,gDAAiF,EAAhF,UAAyB,EAAzB,8CAAyB,EAAE,UAA2B,EAA3B,gDAA2B,CAA0C;AAEpH,6CAAiB,EAAjB,sCAAiB,CAAuC;AAC7D,IAAA,sCAA+I,EAA1I,UAAkB,EAAlB,uCAAkB,EAAE,UAAiF,EAAjF,gDAAiF,EAAhF,UAAyB,EAAzB,8CAAyB,EAAE,UAA2B,EAA3B,gDAA2B,CAAgE;AAEhJ,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAIA,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AAElE,IAAA,mBAA+B,EAA/B,oDAA+B,CAAgB;AACjD,IAAA,mBAAiB,EAAjB,sCAAiB,CAAiB;AAClC,IAAA,mBAAiB,EAAjB,sCAAiB,EAAE,mBAAiF,EAAjF,gDAAiF,EAAhF,UAAyB,EAAzB,8CAAyB,EAAE,UAA2B,EAA3B,gDAA2B,CAA0C;AAEpH,IAAA,yCAAiB,EAAjB,sCAAiB,CAAuC;AACzD,IAAA,sCAA2I,EAA1I,UAAkB,EAAlB,uCAAkB,EAAE,UAAiF,EAAjF,gDAAiF,EAAhF,UAAyB,EAAzB,8CAAyB,EAAE,UAA2B,EAA3B,gDAA2B,CAAgE;AAEhJ,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.sourcemap.txt
index 30f2ee65592..fc4aa48b1ce 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.sourcemap.txt
@@ -105,115 +105,127 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 ---
 >>>var _a = multiRobotA[1], skillA = _a === void 0 ? ["noSkill", "noSkill"] : _a;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                             ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                             ^
 1->
   >
   >let [, 
-2 >skillA = ["noSkill", "noSkill"]
-3 >                       
-4 >                         skillA = ["noSkill", "noSkill"]
-5 >                                                                             ] = multiRobotA;
+2 >
+3 >    skillA = ["noSkill", "noSkill"]
+4 >                       
+5 >                         skillA = ["noSkill", "noSkill"]
+6 >                                                                             ] = multiRobotA;
 1->Emitted(3, 1) Source(8, 8) + SourceIndex(0)
-2 >Emitted(3, 24) Source(8, 39) + SourceIndex(0)
-3 >Emitted(3, 26) Source(8, 8) + SourceIndex(0)
-4 >Emitted(3, 78) Source(8, 39) + SourceIndex(0)
-5 >Emitted(3, 79) Source(8, 55) + SourceIndex(0)
+2 >Emitted(3, 5) Source(8, 8) + SourceIndex(0)
+3 >Emitted(3, 24) Source(8, 39) + SourceIndex(0)
+4 >Emitted(3, 26) Source(8, 8) + SourceIndex(0)
+5 >Emitted(3, 78) Source(8, 39) + SourceIndex(0)
+6 >Emitted(3, 79) Source(8, 55) + SourceIndex(0)
 ---
 >>>var _b = multiRobotB[0], nameMB = _b === void 0 ? "noName" : _b;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                               ^
-6 >                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                               ^
+7 >                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >let [
-2 >nameMB = "noName"
-3 >                       
-4 >                         nameMB = "noName"
-5 >                                                                ] = multiRobotB;
+2 >
+3 >    nameMB = "noName"
+4 >                       
+5 >                         nameMB = "noName"
+6 >                                                                ] = multiRobotB;
 1 >Emitted(4, 1) Source(9, 6) + SourceIndex(0)
-2 >Emitted(4, 24) Source(9, 23) + SourceIndex(0)
-3 >Emitted(4, 26) Source(9, 6) + SourceIndex(0)
-4 >Emitted(4, 64) Source(9, 23) + SourceIndex(0)
-5 >Emitted(4, 65) Source(9, 40) + SourceIndex(0)
+2 >Emitted(4, 5) Source(9, 6) + SourceIndex(0)
+3 >Emitted(4, 24) Source(9, 23) + SourceIndex(0)
+4 >Emitted(4, 26) Source(9, 6) + SourceIndex(0)
+5 >Emitted(4, 64) Source(9, 23) + SourceIndex(0)
+6 >Emitted(4, 65) Source(9, 40) + SourceIndex(0)
 ---
 >>>var _c = multiRobotA[0], nameMA = _c === void 0 ? "noName" : _c, _d = multiRobotA[1], _e = _d === void 0 ? ["noSkill", "noSkill"] : _d, _f = _e[0], primarySkillA = _f === void 0 ? "noSkill" : _f, _g = _e[1], secondarySkillA = _g === void 0 ? "noSkill" : _g;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                               ^^
-6 >                                                                 ^^^^^^^^^^^^^^^^^^^
-7 >                                                                                    ^^
-8 >                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                      ^^
-10>                                                                                                                                        ^^^^^^^^^^
-11>                                                                                                                                                  ^^
-12>                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                                  ^^
-14>                                                                                                                                                                                                    ^^^^^^^^^^
-15>                                                                                                                                                                                                              ^^
-16>                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                ^
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                               ^^
+7 >                                                                 ^^^^^^^^^^^^^^^^^^^
+8 >                                                                                    ^^
+9 >                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                      ^^
+11>                                                                                                                                        ^^^^^^^^^^
+12>                                                                                                                                                  ^^
+13>                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                  ^^
+15>                                                                                                                                                                                                    ^^^^^^^^^^
+16>                                                                                                                                                                                                              ^^
+17>                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                ^
 1->
   >let [
-2 >nameMA = "noName"
-3 >                       
-4 >                         nameMA = "noName"
-5 >                                                               , 
-6 >                                                                 [primarySkillA = "noSkill", secondarySkillA = "noSkill"] = ["noSkill", "noSkill"]
-7 >                                                                                    
-8 >                                                                                      [primarySkillA = "noSkill", secondarySkillA = "noSkill"] = ["noSkill", "noSkill"]
-9 >                                                                                                                                      
-10>                                                                                                                                        primarySkillA = "noSkill"
-11>                                                                                                                                                  
-12>                                                                                                                                                    primarySkillA = "noSkill"
-13>                                                                                                                                                                                                  , 
-14>                                                                                                                                                                                                    secondarySkillA = "noSkill"
-15>                                                                                                                                                                                                              
-16>                                                                                                                                                                                                                secondarySkillA = "noSkill"
-17>                                                                                                                                                                                                                                                                ] = ["noSkill", "noSkill"]] = multiRobotA;
+2 >
+3 >    nameMA = "noName"
+4 >                       
+5 >                         nameMA = "noName"
+6 >                                                               , 
+7 >                                                                 [primarySkillA = "noSkill", secondarySkillA = "noSkill"] = ["noSkill", "noSkill"]
+8 >                                                                                    
+9 >                                                                                      [primarySkillA = "noSkill", secondarySkillA = "noSkill"] = ["noSkill", "noSkill"]
+10>                                                                                                                                      
+11>                                                                                                                                        primarySkillA = "noSkill"
+12>                                                                                                                                                  
+13>                                                                                                                                                    primarySkillA = "noSkill"
+14>                                                                                                                                                                                                  , 
+15>                                                                                                                                                                                                    secondarySkillA = "noSkill"
+16>                                                                                                                                                                                                              
+17>                                                                                                                                                                                                                secondarySkillA = "noSkill"
+18>                                                                                                                                                                                                                                                                ] = ["noSkill", "noSkill"]] = multiRobotA;
 1->Emitted(5, 1) Source(10, 6) + SourceIndex(0)
-2 >Emitted(5, 24) Source(10, 23) + SourceIndex(0)
-3 >Emitted(5, 26) Source(10, 6) + SourceIndex(0)
-4 >Emitted(5, 64) Source(10, 23) + SourceIndex(0)
-5 >Emitted(5, 66) Source(10, 25) + SourceIndex(0)
-6 >Emitted(5, 85) Source(10, 106) + SourceIndex(0)
-7 >Emitted(5, 87) Source(10, 25) + SourceIndex(0)
-8 >Emitted(5, 135) Source(10, 106) + SourceIndex(0)
-9 >Emitted(5, 137) Source(10, 26) + SourceIndex(0)
-10>Emitted(5, 147) Source(10, 51) + SourceIndex(0)
-11>Emitted(5, 149) Source(10, 26) + SourceIndex(0)
-12>Emitted(5, 195) Source(10, 51) + SourceIndex(0)
-13>Emitted(5, 197) Source(10, 53) + SourceIndex(0)
-14>Emitted(5, 207) Source(10, 80) + SourceIndex(0)
-15>Emitted(5, 209) Source(10, 53) + SourceIndex(0)
-16>Emitted(5, 257) Source(10, 80) + SourceIndex(0)
-17>Emitted(5, 258) Source(10, 122) + SourceIndex(0)
+2 >Emitted(5, 5) Source(10, 6) + SourceIndex(0)
+3 >Emitted(5, 24) Source(10, 23) + SourceIndex(0)
+4 >Emitted(5, 26) Source(10, 6) + SourceIndex(0)
+5 >Emitted(5, 64) Source(10, 23) + SourceIndex(0)
+6 >Emitted(5, 66) Source(10, 25) + SourceIndex(0)
+7 >Emitted(5, 85) Source(10, 106) + SourceIndex(0)
+8 >Emitted(5, 87) Source(10, 25) + SourceIndex(0)
+9 >Emitted(5, 135) Source(10, 106) + SourceIndex(0)
+10>Emitted(5, 137) Source(10, 26) + SourceIndex(0)
+11>Emitted(5, 147) Source(10, 51) + SourceIndex(0)
+12>Emitted(5, 149) Source(10, 26) + SourceIndex(0)
+13>Emitted(5, 195) Source(10, 51) + SourceIndex(0)
+14>Emitted(5, 197) Source(10, 53) + SourceIndex(0)
+15>Emitted(5, 207) Source(10, 80) + SourceIndex(0)
+16>Emitted(5, 209) Source(10, 53) + SourceIndex(0)
+17>Emitted(5, 257) Source(10, 80) + SourceIndex(0)
+18>Emitted(5, 258) Source(10, 122) + SourceIndex(0)
 ---
 >>>var _h = ["roomba", ["vaccum", "mopping"]][0], nameMC = _h === void 0 ? "noName" : _h;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                             ^^
-4 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                                     ^
-6 >                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                             ^^
+5 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                     ^
+7 >                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
   >let [
-2 >nameMC = "noName"
-3 >                                             
-4 >                                               nameMC = "noName"
-5 >                                                                                      ] = ["roomba", ["vaccum", "mopping"]];
+2 >
+3 >    nameMC = "noName"
+4 >                                             
+5 >                                               nameMC = "noName"
+6 >                                                                                      ] = ["roomba", ["vaccum", "mopping"]];
 1 >Emitted(6, 1) Source(12, 6) + SourceIndex(0)
-2 >Emitted(6, 46) Source(12, 23) + SourceIndex(0)
-3 >Emitted(6, 48) Source(12, 6) + SourceIndex(0)
-4 >Emitted(6, 86) Source(12, 23) + SourceIndex(0)
-5 >Emitted(6, 87) Source(12, 62) + SourceIndex(0)
+2 >Emitted(6, 5) Source(12, 6) + SourceIndex(0)
+3 >Emitted(6, 46) Source(12, 23) + SourceIndex(0)
+4 >Emitted(6, 48) Source(12, 6) + SourceIndex(0)
+5 >Emitted(6, 86) Source(12, 23) + SourceIndex(0)
+6 >Emitted(6, 87) Source(12, 62) + SourceIndex(0)
 ---
 >>>var _j = ["roomba", ["vaccum", "mopping"]], _k = _j[0], nameMC2 = _k === void 0 ? "noName" : _k, _l = _j[1], _m = _l === void 0 ? ["noSkill", "noSkill"] : _l, _o = _m[0], primarySkillC = _o === void 0 ? "noSkill" : _o, _p = _m[1], secondarySkillC = _p === void 0 ? "noSkill" : _p;
 1->
@@ -237,9 +249,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 19>                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 20>                                                                                                                                                                                                                                                                                       ^
 1->
-  >
+  >let 
 2 >
-3 >    let [nameMC2 = "noName", [primarySkillC = "noSkill", secondarySkillC = "noSkill"] = ["noSkill", "noSkill"]] = ["roomba", ["vaccum", "mopping"]]
+3 >    [nameMC2 = "noName", [primarySkillC = "noSkill", secondarySkillC = "noSkill"] = ["noSkill", "noSkill"]] = ["roomba", ["vaccum", "mopping"]]
 4 >                                          
 5 >                                            nameMC2 = "noName"
 6 >                                                      
@@ -257,8 +269,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPatternD
 18>                                                                                                                                                                                                                                     
 19>                                                                                                                                                                                                                                       secondarySkillC = "noSkill"
 20>                                                                                                                                                                                                                                                                                       ] = ["noSkill", "noSkill"]] = ["roomba", ["vaccum", "mopping"]];
-1->Emitted(7, 1) Source(13, 1) + SourceIndex(0)
-2 >Emitted(7, 5) Source(13, 1) + SourceIndex(0)
+1->Emitted(7, 1) Source(13, 5) + SourceIndex(0)
+2 >Emitted(7, 5) Source(13, 5) + SourceIndex(0)
 3 >Emitted(7, 43) Source(13, 144) + SourceIndex(0)
 4 >Emitted(7, 45) Source(13, 6) + SourceIndex(0)
 5 >Emitted(7, 55) Source(13, 24) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.js.map
index d85d9d2d669..75b4ebb7e4c 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementDefaultValues.ts"],"names":[],"mappings":"AAOA,IAAI,KAAK,GAAG,OAAO,CAAC;AACpB,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACvD,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AACrD,oBAAwB,EAAxB,uCAAwB,CAAY;AACpC,oBAAwB,EAAxB,uCAAwB,EAAE,iBAAoC,EAApC,kDAAoC,CAAY;AAChF,IAAA,8CAAkH,EAA5G,YAAwB,EAAxB,uCAAwB,EAAE,aAAoC,EAApC,kDAAoC,CAA+C;AACnH,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementDefaultValues.ts"],"names":[],"mappings":"AAOA,IAAI,KAAK,GAAG,OAAO,CAAC;AACpB,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACvD,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AACrD,IAAA,gBAAwB,EAAxB,uCAAwB,CAAY;AACpC,IAAA,gBAAwB,EAAxB,uCAAwB,EAAE,iBAAoC,EAApC,kDAAoC,CAAY;AAC5E,IAAA,8CAA8G,EAA5G,YAAwB,EAAxB,uCAAwB,EAAE,aAAoC,EAApC,kDAAoC,CAA+C;AACnH,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.sourcemap.txt
index 12e5526e77c..e11d56c5037 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.sourcemap.txt
@@ -130,53 +130,59 @@ sourceFile:sourceMapValidationDestructuringVariableStatementDefaultValues.ts
 ---
 >>>var _a = robotA.name, nameA = _a === void 0 ? "<NoName>" : _a;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^
-4 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                             ^
-6 >                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^
+4 >                    ^^
+5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                             ^
+7 >                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >var { 
-2 >name: nameA = "<NoName>"
-3 >                    
-4 >                      name: nameA = "<NoName>"
-5 >                                                              } = robotA;
+2 >
+3 >    name: nameA = "<NoName>"
+4 >                    
+5 >                      name: nameA = "<NoName>"
+6 >                                                              } = robotA;
 1->Emitted(4, 1) Source(11, 7) + SourceIndex(0)
-2 >Emitted(4, 21) Source(11, 31) + SourceIndex(0)
-3 >Emitted(4, 23) Source(11, 7) + SourceIndex(0)
-4 >Emitted(4, 62) Source(11, 31) + SourceIndex(0)
-5 >Emitted(4, 63) Source(11, 43) + SourceIndex(0)
+2 >Emitted(4, 5) Source(11, 7) + SourceIndex(0)
+3 >Emitted(4, 21) Source(11, 31) + SourceIndex(0)
+4 >Emitted(4, 23) Source(11, 7) + SourceIndex(0)
+5 >Emitted(4, 62) Source(11, 31) + SourceIndex(0)
+6 >Emitted(4, 63) Source(11, 43) + SourceIndex(0)
 ---
 >>>var _b = robotB.name, nameB = _b === void 0 ? "<NoName>" : _b, _c = robotB.skill, skillB = _c === void 0 ? "<skillUnspecified>" : _c;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^
-4 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                             ^^
-6 >                                                               ^^^^^^^^^^^^^^^^^
-7 >                                                                                ^^
-8 >                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                    ^
-10>                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^
+4 >                    ^^
+5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                             ^^
+7 >                                                               ^^^^^^^^^^^^^^^^^
+8 >                                                                                ^^
+9 >                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                    ^
+11>                                                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >var { 
-2 >name: nameB = "<NoName>"
-3 >                    
-4 >                      name: nameB = "<NoName>"
-5 >                                                             , 
-6 >                                                               skill: skillB = "<skillUnspecified>"
-7 >                                                                                
-8 >                                                                                  skill: skillB = "<skillUnspecified>"
-9 >                                                                                                                                     } = robotB;
+2 >
+3 >    name: nameB = "<NoName>"
+4 >                    
+5 >                      name: nameB = "<NoName>"
+6 >                                                             , 
+7 >                                                               skill: skillB = "<skillUnspecified>"
+8 >                                                                                
+9 >                                                                                  skill: skillB = "<skillUnspecified>"
+10>                                                                                                                                     } = robotB;
 1->Emitted(5, 1) Source(12, 7) + SourceIndex(0)
-2 >Emitted(5, 21) Source(12, 31) + SourceIndex(0)
-3 >Emitted(5, 23) Source(12, 7) + SourceIndex(0)
-4 >Emitted(5, 62) Source(12, 31) + SourceIndex(0)
-5 >Emitted(5, 64) Source(12, 33) + SourceIndex(0)
-6 >Emitted(5, 81) Source(12, 69) + SourceIndex(0)
-7 >Emitted(5, 83) Source(12, 33) + SourceIndex(0)
-8 >Emitted(5, 133) Source(12, 69) + SourceIndex(0)
-9 >Emitted(5, 134) Source(12, 81) + SourceIndex(0)
+2 >Emitted(5, 5) Source(12, 7) + SourceIndex(0)
+3 >Emitted(5, 21) Source(12, 31) + SourceIndex(0)
+4 >Emitted(5, 23) Source(12, 7) + SourceIndex(0)
+5 >Emitted(5, 62) Source(12, 31) + SourceIndex(0)
+6 >Emitted(5, 64) Source(12, 33) + SourceIndex(0)
+7 >Emitted(5, 81) Source(12, 69) + SourceIndex(0)
+8 >Emitted(5, 83) Source(12, 33) + SourceIndex(0)
+9 >Emitted(5, 133) Source(12, 69) + SourceIndex(0)
+10>Emitted(5, 134) Source(12, 81) + SourceIndex(0)
 ---
 >>>var _d = { name: "Edger", skill: "cutting edges" }, _e = _d.name, nameC = _e === void 0 ? "<NoName>" : _e, _f = _d.skill, skillC = _f === void 0 ? "<skillUnspecified>" : _f;
 1->
@@ -192,9 +198,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementDefaultValues.ts
 11>                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 12>                                                                                                                                                                            ^
 1->
-  >
+  >var 
 2 >
-3 >    var { name: nameC = "<NoName>", skill: skillC = "<skillUnspecified>" } = { name: "Edger", skill: "cutting edges" }
+3 >    { name: nameC = "<NoName>", skill: skillC = "<skillUnspecified>" } = { name: "Edger", skill: "cutting edges" }
 4 >                                                  
 5 >                                                    name: nameC = "<NoName>"
 6 >                                                                
@@ -204,8 +210,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementDefaultValues.ts
 10>                                                                                                                        
 11>                                                                                                                          skill: skillC = "<skillUnspecified>"
 12>                                                                                                                                                                             } = { name: "Edger", skill: "cutting edges" };
-1->Emitted(6, 1) Source(13, 1) + SourceIndex(0)
-2 >Emitted(6, 5) Source(13, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(13, 5) + SourceIndex(0)
+2 >Emitted(6, 5) Source(13, 5) + SourceIndex(0)
 3 >Emitted(6, 51) Source(13, 115) + SourceIndex(0)
 4 >Emitted(6, 53) Source(13, 7) + SourceIndex(0)
 5 >Emitted(6, 65) Source(13, 31) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js.map
index cd7a9813374..c0f2dad3fd5 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts"],"names":[],"mappings":"AAUA,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACxF,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC;AAExF,sBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,CAAc;AAChE,uBAAW,EAAE,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,CAAc;AACnF,IAAA,mFAA0J,EAApJ,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,CAAsF;AAE3J,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts"],"names":[],"mappings":"AAUA,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACxF,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC;AAExF,IAAA,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,CAAc;AAChE,IAAA,mBAAW,EAAE,kBAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,CAAc;AAC/E,IAAA,mFAAsJ,EAApJ,eAAW,EAAE,cAAoD,EAA1C,qBAAiB,EAAE,yBAAqB,CAAsF;AAE3J,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.sourcemap.txt
index 4d0845e1a75..32fcd1552b3 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.sourcemap.txt
@@ -158,60 +158,66 @@ sourceFile:sourceMapValidationDestructuringVariableStatementNestedObjectBindingP
 ---
 >>>var _a = robotA.skills, primaryA = _a.primary, secondaryA = _a.secondary;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^^^^^^^^
-5 >                                             ^^
-6 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                        ^
-8 >                                                                         ^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^
+6 >                                             ^^
+7 >                                               ^^^^^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                        ^
+9 >                                                                         ^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
   >var { 
-2 >skills: { primary: primaryA, secondary: secondaryA }
-3 >                      
-4 >                        primary: primaryA
-5 >                                             , 
-6 >                                               secondary: secondaryA
-7 >                                                                         } } = robotA;
+2 >
+3 >    skills: { primary: primaryA, secondary: secondaryA }
+4 >                      
+5 >                        primary: primaryA
+6 >                                             , 
+7 >                                               secondary: secondaryA
+8 >                                                                         } } = robotA;
 1 >Emitted(3, 1) Source(14, 7) + SourceIndex(0)
-2 >Emitted(3, 23) Source(14, 59) + SourceIndex(0)
-3 >Emitted(3, 25) Source(14, 17) + SourceIndex(0)
-4 >Emitted(3, 46) Source(14, 34) + SourceIndex(0)
-5 >Emitted(3, 48) Source(14, 36) + SourceIndex(0)
-6 >Emitted(3, 73) Source(14, 57) + SourceIndex(0)
-7 >Emitted(3, 74) Source(14, 71) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 7) + SourceIndex(0)
+3 >Emitted(3, 23) Source(14, 59) + SourceIndex(0)
+4 >Emitted(3, 25) Source(14, 17) + SourceIndex(0)
+5 >Emitted(3, 46) Source(14, 34) + SourceIndex(0)
+6 >Emitted(3, 48) Source(14, 36) + SourceIndex(0)
+7 >Emitted(3, 73) Source(14, 57) + SourceIndex(0)
+8 >Emitted(3, 74) Source(14, 71) + SourceIndex(0)
 ---
 >>>var nameB = robotB.name, _b = robotB.skills, primaryB = _b.primary, secondaryB = _b.secondary;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^
-3 >                       ^^
-4 >                         ^^^^^^^^^^^^^^^^^^
-5 >                                           ^^
-6 >                                             ^^^^^^^^^^^^^^^^^^^^^
-7 >                                                                  ^^
-8 >                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                             ^
-10>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^^
+4 >                       ^^
+5 >                         ^^^^^^^^^^^^^^^^^^
+6 >                                           ^^
+7 >                                             ^^^^^^^^^^^^^^^^^^^^^
+8 >                                                                  ^^
+9 >                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                             ^
+11>                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >var { 
-2 >name: nameB
-3 >                       , 
-4 >                         skills: { primary: primaryB, secondary: secondaryB }
-5 >                                           
-6 >                                             primary: primaryB
-7 >                                                                  , 
-8 >                                                                    secondary: secondaryB
-9 >                                                                                              } } = robotB;
+2 >
+3 >    name: nameB
+4 >                       , 
+5 >                         skills: { primary: primaryB, secondary: secondaryB }
+6 >                                           
+7 >                                             primary: primaryB
+8 >                                                                  , 
+9 >                                                                    secondary: secondaryB
+10>                                                                                              } } = robotB;
 1->Emitted(4, 1) Source(15, 7) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 18) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 20) + SourceIndex(0)
-4 >Emitted(4, 44) Source(15, 72) + SourceIndex(0)
-5 >Emitted(4, 46) Source(15, 30) + SourceIndex(0)
-6 >Emitted(4, 67) Source(15, 47) + SourceIndex(0)
-7 >Emitted(4, 69) Source(15, 49) + SourceIndex(0)
-8 >Emitted(4, 94) Source(15, 70) + SourceIndex(0)
-9 >Emitted(4, 95) Source(15, 84) + SourceIndex(0)
+2 >Emitted(4, 5) Source(15, 7) + SourceIndex(0)
+3 >Emitted(4, 24) Source(15, 18) + SourceIndex(0)
+4 >Emitted(4, 26) Source(15, 20) + SourceIndex(0)
+5 >Emitted(4, 44) Source(15, 72) + SourceIndex(0)
+6 >Emitted(4, 46) Source(15, 30) + SourceIndex(0)
+7 >Emitted(4, 67) Source(15, 47) + SourceIndex(0)
+8 >Emitted(4, 69) Source(15, 49) + SourceIndex(0)
+9 >Emitted(4, 94) Source(15, 70) + SourceIndex(0)
+10>Emitted(4, 95) Source(15, 84) + SourceIndex(0)
 ---
 >>>var _c = { name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }, nameC = _c.name, _d = _c.skills, primaryB = _d.primary, secondaryB = _d.secondary;
 1->
@@ -227,9 +233,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementNestedObjectBindingP
 11>                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
 12>                                                                                                                                                                          ^
 1->
-  >
+  >var 
 2 >
-3 >    var { name: nameC, skills: { primary: primaryB, secondary: secondaryB } } = { name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }
+3 >    { name: nameC, skills: { primary: primaryB, secondary: secondaryB } } = { name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }
 4 >                                                                                       
 5 >                                                                                         name: nameC
 6 >                                                                                                        , 
@@ -239,8 +245,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementNestedObjectBindingP
 10>                                                                                                                                               , 
 11>                                                                                                                                                 secondary: secondaryB
 12>                                                                                                                                                                           } } = { name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } };
-1->Emitted(5, 1) Source(16, 1) + SourceIndex(0)
-2 >Emitted(5, 5) Source(16, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(16, 5) + SourceIndex(0)
+2 >Emitted(5, 5) Source(16, 5) + SourceIndex(0)
 3 >Emitted(5, 88) Source(16, 155) + SourceIndex(0)
 4 >Emitted(5, 90) Source(16, 7) + SourceIndex(0)
 5 >Emitted(5, 105) Source(16, 18) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js.map
index 9ad442f4698..80bfe76492a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts"],"names":[],"mappings":"AAUA,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACxF,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC;AAG1F,sBAGgD,EAHhD,sEAGgD,EAF5C,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAiC,EAAjC,2CAAiC,CAE9B;AAEP,oBAA+B,EAA/B,8CAA+B,EAC/B,kBAGgD,EAHhD,sEAGgD,EAF5C,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAiC,EAAjC,2CAAiC,CAE9B;AACX,IAAA,mFAMyF,EALrF,YAA+B,EAA/B,8CAA+B,EAC/B,cAGgD,EAHhD,sEAGgD,EAF5C,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAiC,EAAjC,2CAAiC,CAEiD;AAE1F,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts"],"names":[],"mappings":"AAUA,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACxF,IAAI,MAAM,GAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC;AAG1F,IAAA,kBAGgD,EAHhD,sEAGgD,EAF5C,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAiC,EAAjC,2CAAiC,CAE9B;AAEP,IAAA,gBAA+B,EAA/B,8CAA+B,EAC/B,kBAGgD,EAHhD,sEAGgD,EAF5C,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAiC,EAAjC,2CAAiC,CAE9B;AACP,IAAA,mFAMqF,EALrF,YAA+B,EAA/B,8CAA+B,EAC/B,cAGgD,EAHhD,sEAGgD,EAF5C,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAiC,EAAjC,2CAAiC,CAEiD;AAE1F,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,IAAI,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.sourcemap.txt
index 5e007440890..cf4629d28d0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.sourcemap.txt
@@ -159,123 +159,129 @@ sourceFile:sourceMapValidationDestructuringVariableStatementNestedObjectBindingP
 ---
 >>>var _a = robotA.skills, _b = _a === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _a, _c = _b.primary, primaryA = _c === void 0 ? "noSkill" : _c, _d = _b.secondary, secondaryA = _d === void 0 ? "noSkill" : _d;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^
-3 >                      ^^
-4 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                                              ^^
-6 >                                                                                                ^^^^^^^^^^^^^^^
-7 >                                                                                                               ^^
-8 >                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                                          ^^
-10>                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-11>                                                                                                                                                                             ^^
-12>                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                                                          ^
-14>                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^^^
+4 >                      ^^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                              ^^
+7 >                                                                                                ^^^^^^^^^^^^^^^
+8 >                                                                                                               ^^
+9 >                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                          ^^
+11>                                                                                                                                                            ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                             ^^
+13>                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                          ^
+15>                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >var {
   >    
-2 >skills: {
-  >        primary: primaryA = "noSkill",
-  >        secondary: secondaryA = "noSkill"
-  >    } = { primary: "noSkill", secondary: "noSkill" }
-3 >                      
-4 >                        skills: {
+2 >
+3 >    skills: {
+  >            primary: primaryA = "noSkill",
+  >            secondary: secondaryA = "noSkill"
+  >        } = { primary: "noSkill", secondary: "noSkill" }
+4 >                      
+5 >                        skills: {
   >                                primary: primaryA = "noSkill",
   >                                secondary: secondaryA = "noSkill"
   >                            } = { primary: "noSkill", secondary: "noSkill" }
-5 >                                                                                              
-6 >                                                                                                primary: primaryA = "noSkill"
-7 >                                                                                                               
-8 >                                                                                                                 primary: primaryA = "noSkill"
-9 >                                                                                                                                                          ,
+6 >                                                                                              
+7 >                                                                                                primary: primaryA = "noSkill"
+8 >                                                                                                               
+9 >                                                                                                                 primary: primaryA = "noSkill"
+10>                                                                                                                                                          ,
   >                                                                                                                                                                  
-10>                                                                                                                                                            secondary: secondaryA = "noSkill"
-11>                                                                                                                                                                             
-12>                                                                                                                                                                               secondary: secondaryA = "noSkill"
-13>                                                                                                                                                                                                                          
+11>                                                                                                                                                            secondary: secondaryA = "noSkill"
+12>                                                                                                                                                                             
+13>                                                                                                                                                                               secondary: secondaryA = "noSkill"
+14>                                                                                                                                                                                                                          
   >                                                                                                                                                                                                                              } = { primary: "noSkill", secondary: "noSkill" }
   >                                                                                                                                                                                                                          } = robotA;
 1->Emitted(3, 1) Source(15, 5) + SourceIndex(0)
-2 >Emitted(3, 23) Source(18, 53) + SourceIndex(0)
-3 >Emitted(3, 25) Source(15, 5) + SourceIndex(0)
-4 >Emitted(3, 95) Source(18, 53) + SourceIndex(0)
-5 >Emitted(3, 97) Source(16, 9) + SourceIndex(0)
-6 >Emitted(3, 112) Source(16, 38) + SourceIndex(0)
-7 >Emitted(3, 114) Source(16, 9) + SourceIndex(0)
-8 >Emitted(3, 155) Source(16, 38) + SourceIndex(0)
-9 >Emitted(3, 157) Source(17, 9) + SourceIndex(0)
-10>Emitted(3, 174) Source(17, 42) + SourceIndex(0)
-11>Emitted(3, 176) Source(17, 9) + SourceIndex(0)
-12>Emitted(3, 219) Source(17, 42) + SourceIndex(0)
-13>Emitted(3, 220) Source(19, 12) + SourceIndex(0)
+2 >Emitted(3, 5) Source(15, 5) + SourceIndex(0)
+3 >Emitted(3, 23) Source(18, 53) + SourceIndex(0)
+4 >Emitted(3, 25) Source(15, 5) + SourceIndex(0)
+5 >Emitted(3, 95) Source(18, 53) + SourceIndex(0)
+6 >Emitted(3, 97) Source(16, 9) + SourceIndex(0)
+7 >Emitted(3, 112) Source(16, 38) + SourceIndex(0)
+8 >Emitted(3, 114) Source(16, 9) + SourceIndex(0)
+9 >Emitted(3, 155) Source(16, 38) + SourceIndex(0)
+10>Emitted(3, 157) Source(17, 9) + SourceIndex(0)
+11>Emitted(3, 174) Source(17, 42) + SourceIndex(0)
+12>Emitted(3, 176) Source(17, 9) + SourceIndex(0)
+13>Emitted(3, 219) Source(17, 42) + SourceIndex(0)
+14>Emitted(3, 220) Source(19, 12) + SourceIndex(0)
 ---
 >>>var _e = robotB.name, nameB = _e === void 0 ? "noNameSpecified" : _e, _f = robotB.skills, _g = _f === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _f, _h = _g.primary, primaryB = _h === void 0 ? "noSkill" : _h, _j = _g.secondary, secondaryB = _j === void 0 ? "noSkill" : _j;
 1->
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^
-4 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                                    ^^
-6 >                                                                      ^^^^^^^^^^^^^^^^^^
-7 >                                                                                        ^^
-8 >                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-9 >                                                                                                                                                                ^^
-10>                                                                                                                                                                  ^^^^^^^^^^^^^^^
-11>                                                                                                                                                                                 ^^
-12>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13>                                                                                                                                                                                                                            ^^
-14>                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
-15>                                                                                                                                                                                                                                               ^^
-16>                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-17>                                                                                                                                                                                                                                                                                            ^
-18>                                                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^
+4 >                    ^^
+5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                    ^^
+7 >                                                                      ^^^^^^^^^^^^^^^^^^
+8 >                                                                                        ^^
+9 >                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                ^^
+11>                                                                                                                                                                  ^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                 ^^
+13>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                            ^^
+15>                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                               ^^
+17>                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                            ^
+19>                                                                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >var {
   >    
-2 >name: nameB = "noNameSpecified"
-3 >                    
-4 >                      name: nameB = "noNameSpecified"
-5 >                                                                    ,
+2 >
+3 >    name: nameB = "noNameSpecified"
+4 >                    
+5 >                      name: nameB = "noNameSpecified"
+6 >                                                                    ,
   >                                                                        
-6 >                                                                      skills: {
+7 >                                                                      skills: {
   >                                                                              primary: primaryB = "noSkill",
   >                                                                              secondary: secondaryB = "noSkill"
   >                                                                          } = { primary: "noSkill", secondary: "noSkill" }
-7 >                                                                                        
-8 >                                                                                          skills: {
+8 >                                                                                        
+9 >                                                                                          skills: {
   >                                                                                                  primary: primaryB = "noSkill",
   >                                                                                                  secondary: secondaryB = "noSkill"
   >                                                                                              } = { primary: "noSkill", secondary: "noSkill" }
-9 >                                                                                                                                                                
-10>                                                                                                                                                                  primary: primaryB = "noSkill"
-11>                                                                                                                                                                                 
-12>                                                                                                                                                                                   primary: primaryB = "noSkill"
-13>                                                                                                                                                                                                                            ,
+10>                                                                                                                                                                
+11>                                                                                                                                                                  primary: primaryB = "noSkill"
+12>                                                                                                                                                                                 
+13>                                                                                                                                                                                   primary: primaryB = "noSkill"
+14>                                                                                                                                                                                                                            ,
   >                                                                                                                                                                                                                                    
-14>                                                                                                                                                                                                                              secondary: secondaryB = "noSkill"
-15>                                                                                                                                                                                                                                               
-16>                                                                                                                                                                                                                                                 secondary: secondaryB = "noSkill"
-17>                                                                                                                                                                                                                                                                                            
+15>                                                                                                                                                                                                                              secondary: secondaryB = "noSkill"
+16>                                                                                                                                                                                                                                               
+17>                                                                                                                                                                                                                                                 secondary: secondaryB = "noSkill"
+18>                                                                                                                                                                                                                                                                                            
   >                                                                                                                                                                                                                                                                                                } = { primary: "noSkill", secondary: "noSkill" }
   >                                                                                                                                                                                                                                                                                            } = robotB;
 1->Emitted(4, 1) Source(21, 5) + SourceIndex(0)
-2 >Emitted(4, 21) Source(21, 36) + SourceIndex(0)
-3 >Emitted(4, 23) Source(21, 5) + SourceIndex(0)
-4 >Emitted(4, 69) Source(21, 36) + SourceIndex(0)
-5 >Emitted(4, 71) Source(22, 5) + SourceIndex(0)
-6 >Emitted(4, 89) Source(25, 53) + SourceIndex(0)
-7 >Emitted(4, 91) Source(22, 5) + SourceIndex(0)
-8 >Emitted(4, 161) Source(25, 53) + SourceIndex(0)
-9 >Emitted(4, 163) Source(23, 9) + SourceIndex(0)
-10>Emitted(4, 178) Source(23, 38) + SourceIndex(0)
-11>Emitted(4, 180) Source(23, 9) + SourceIndex(0)
-12>Emitted(4, 221) Source(23, 38) + SourceIndex(0)
-13>Emitted(4, 223) Source(24, 9) + SourceIndex(0)
-14>Emitted(4, 240) Source(24, 42) + SourceIndex(0)
-15>Emitted(4, 242) Source(24, 9) + SourceIndex(0)
-16>Emitted(4, 285) Source(24, 42) + SourceIndex(0)
-17>Emitted(4, 286) Source(26, 12) + SourceIndex(0)
+2 >Emitted(4, 5) Source(21, 5) + SourceIndex(0)
+3 >Emitted(4, 21) Source(21, 36) + SourceIndex(0)
+4 >Emitted(4, 23) Source(21, 5) + SourceIndex(0)
+5 >Emitted(4, 69) Source(21, 36) + SourceIndex(0)
+6 >Emitted(4, 71) Source(22, 5) + SourceIndex(0)
+7 >Emitted(4, 89) Source(25, 53) + SourceIndex(0)
+8 >Emitted(4, 91) Source(22, 5) + SourceIndex(0)
+9 >Emitted(4, 161) Source(25, 53) + SourceIndex(0)
+10>Emitted(4, 163) Source(23, 9) + SourceIndex(0)
+11>Emitted(4, 178) Source(23, 38) + SourceIndex(0)
+12>Emitted(4, 180) Source(23, 9) + SourceIndex(0)
+13>Emitted(4, 221) Source(23, 38) + SourceIndex(0)
+14>Emitted(4, 223) Source(24, 9) + SourceIndex(0)
+15>Emitted(4, 240) Source(24, 42) + SourceIndex(0)
+16>Emitted(4, 242) Source(24, 9) + SourceIndex(0)
+17>Emitted(4, 285) Source(24, 42) + SourceIndex(0)
+18>Emitted(4, 286) Source(26, 12) + SourceIndex(0)
 ---
 >>>var _k = { name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }, _l = _k.name, nameC = _l === void 0 ? "noNameSpecified" : _l, _m = _k.skills, _o = _m === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _m, _p = _o.primary, primaryB = _p === void 0 ? "noSkill" : _p, _q = _o.secondary, secondaryB = _q === void 0 ? "noSkill" : _q;
 1->
@@ -299,9 +305,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementNestedObjectBindingP
 19>                                                                                                                                                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 20>                                                                                                                                                                                                                                                                                                                                                                         ^
 1->
-  >
+  >var 
 2 >
-3 >    var {
+3 >    {
   >        name: nameC = "noNameSpecified",
   >        skills: {
   >            primary: primaryB = "noSkill",
@@ -335,8 +341,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementNestedObjectBindingP
 20>                                                                                                                                                                                                                                                                                                                                                                         
   >                                                                                                                                                                                                                                                                                                                                                                             } = { primary: "noSkill", secondary: "noSkill" }
   >                                                                                                                                                                                                                                                                                                                                                                         } = <Robot>{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } };
-1->Emitted(5, 1) Source(27, 1) + SourceIndex(0)
-2 >Emitted(5, 5) Source(27, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(27, 5) + SourceIndex(0)
+2 >Emitted(5, 5) Source(27, 5) + SourceIndex(0)
 3 >Emitted(5, 88) Source(33, 90) + SourceIndex(0)
 4 >Emitted(5, 90) Source(28, 5) + SourceIndex(0)
 5 >Emitted(5, 102) Source(28, 36) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map
index 5ecd5985927..71a3949b553 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts"],"names":[],"mappings":"AACK,IAAA,eAAC,CAAc"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt
index 8e5860c7a77..829e0d19195 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt
@@ -10,15 +10,18 @@ sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern
 -------------------------------------------------------------------
 >>>var x = { x: 20 }.x;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^
-3 >                   ^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^
+4 >                   ^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var {
-2 >x
-3 >                   } = { x: 20 };
+2 >
+3 >    x
+4 >                   } = { x: 20 };
 1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0)
-2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0)
-3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 6) + SourceIndex(0)
+3 >Emitted(1, 20) Source(2, 7) + SourceIndex(0)
+4 >Emitted(1, 21) Source(2, 21) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map
index 6d3a8b40d22..7eda5a24bdb 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc;AACpB,IAAA,qBAA+B,EAAzB,QAAC,EAAE,QAAC,CAAsB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts"],"names":[],"mappings":"AACK,IAAA,eAAC,CAAc;AAChB,IAAA,qBAA2B,EAAzB,QAAC,EAAE,QAAC,CAAsB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt
index e9454cb2bfa..380c6e2b14e 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt
@@ -10,16 +10,19 @@ sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern
 -------------------------------------------------------------------
 >>>var x = { x: 20 }.x;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^
-3 >                   ^
-4 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^
+4 >                   ^
+5 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var {
-2 >x
-3 >                   } = { x: 20 };
+2 >
+3 >    x
+4 >                   } = { x: 20 };
 1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0)
-2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0)
-3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 6) + SourceIndex(0)
+3 >Emitted(1, 20) Source(2, 7) + SourceIndex(0)
+4 >Emitted(1, 21) Source(2, 21) + SourceIndex(0)
 ---
 >>>var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b;
 1->
@@ -32,16 +35,16 @@ sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern
 8 >                                             ^
 9 >                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
-  >
+  >var 
 2 >
-3 >    var { a, b } = { a: 30, b: 40 }
+3 >    { a, b } = { a: 30, b: 40 }
 4 >                         
 5 >                           a
 6 >                                   , 
 7 >                                     b
 8 >                                              } = { a: 30, b: 40 };
-1->Emitted(2, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(3, 1) + SourceIndex(0)
+1->Emitted(2, 1) Source(3, 5) + SourceIndex(0)
+2 >Emitted(2, 5) Source(3, 5) + SourceIndex(0)
 3 >Emitted(2, 26) Source(3, 32) + SourceIndex(0)
 4 >Emitted(2, 28) Source(3, 7) + SourceIndex(0)
 5 >Emitted(2, 36) Source(3, 8) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map
index 975a48aa0ee..3bc06d2dc75 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts"],"names":[],"mappings":"AACK,oBAAO,EAAP,4BAAO,CAAc"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts"],"names":[],"mappings":"AACK,IAAA,gBAAO,EAAP,4BAAO,CAAc"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt
index 2fa0c81199b..fb3483829c6 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt
@@ -10,21 +10,24 @@ sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern
 -------------------------------------------------------------------
 >>>var _a = { x: 20 }.x, x = _a === void 0 ? 500 : _a;
 1 >
-2 >^^^^^^^^^^^^^^^^^^^^
-3 >                    ^^
-4 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 >                                                  ^
-6 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^^^^
+4 >                    ^^
+5 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                  ^
+7 >                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >var {
-2 >x = 500
-3 >                    
-4 >                      x = 500
-5 >                                                  } = { x: 20 };
+2 >
+3 >    x = 500
+4 >                    
+5 >                      x = 500
+6 >                                                  } = { x: 20 };
 1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0)
-2 >Emitted(1, 21) Source(2, 13) + SourceIndex(0)
-3 >Emitted(1, 23) Source(2, 6) + SourceIndex(0)
-4 >Emitted(1, 51) Source(2, 13) + SourceIndex(0)
-5 >Emitted(1, 52) Source(2, 27) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 6) + SourceIndex(0)
+3 >Emitted(1, 21) Source(2, 13) + SourceIndex(0)
+4 >Emitted(1, 23) Source(2, 6) + SourceIndex(0)
+5 >Emitted(1, 51) Source(2, 13) + SourceIndex(0)
+6 >Emitted(1, 52) Source(2, 27) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map
index e0b108863b0..5f160d2ac45 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts"],"names":[],"mappings":"AACA,IAAA,uBAC4B,EADvB,SAAO,EAAP,4BAAO,EACP,QAAC,CAAuB"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts"],"names":[],"mappings":"AACI,IAAA,uBACwB,EADvB,SAAO,EAAP,4BAAO,EACP,QAAC,CAAuB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt
index 6ae979f8ade..6a64ae9c320 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt
@@ -21,9 +21,9 @@ sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern
 10>                                                                              ^
 11>                                                                               ^^^^^^^^^^^^^^^^^^->
 1 >
-  >
+  >var 
 2 >
-3 >    var {x = 500,
+3 >    {x = 500,
   >         y} = { x: 20, y: "hi" }
 4 >                           
 5 >                             x = 500
@@ -33,8 +33,8 @@ sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern
   >                                                                         
 9 >                                                                      y
 10>                                                                              } = { x: 20, y: "hi" };
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0)
+1 >Emitted(1, 1) Source(2, 5) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
 3 >Emitted(1, 28) Source(3, 29) + SourceIndex(0)
 4 >Emitted(1, 30) Source(2, 6) + SourceIndex(0)
 5 >Emitted(1, 39) Source(2, 13) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.js.map b/tests/baselines/reference/sourceMapValidationFunctions.js.map
index 7578efc11f8..a6913fe2369 100644
--- a/tests/baselines/reference/sourceMapValidationFunctions.js.map
+++ b/tests/baselines/reference/sourceMapValidationFunctions.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationFunctions.js.map]
-{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,eAAe,QAAgB;IAC3B,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC;AACD,gBAAgB,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlB,iBAAM,GAAN,MAAM;IAAc,oBAAuB;SAAvB,WAAuB,CAAvB,sBAAuB,CAAvB,IAAuB;QAAvB,mCAAuB;;IACzE,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC;AACD,aAAa,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlB,iBAAM,GAAN,MAAM;IAAc,oBAAuB;SAAvB,WAAuB,CAAvB,sBAAuB,CAAvB,IAAuB;QAAvB,mCAAuB;;IAEtE,MAAM,CAAC;AACX,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,eAAe,QAAgB;IAC3B,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC;AACD,gBAAgB,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlB,kBAAA,EAAA,MAAM;IAAc,oBAAuB;SAAvB,UAAuB,EAAvB,qBAAuB,EAAvB,IAAuB;QAAvB,mCAAuB;;IACzE,SAAS,EAAE,CAAC;IACZ,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC;AACD,aAAa,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlB,kBAAA,EAAA,MAAM;IAAc,oBAAuB;SAAvB,UAAuB,EAAvB,qBAAuB,EAAvB,IAAuB;QAAvB,mCAAuB;;IAEtE,MAAM,CAAC;AACX,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt
index 95759f76f16..9dabdf3d8f2 100644
--- a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt
@@ -112,15 +112,15 @@ sourceFile:sourceMapValidationFunctions.ts
 ---
 >>>    if (n === void 0) { n = 10; }
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^
 4 >                        ^^^^^^
 1->
-2 >    n = 10
-3 >                     
+2 >    
+3 >                      
 4 >                        n = 10
 1->Emitted(7, 5) Source(6, 35) + SourceIndex(0)
-2 >Emitted(7, 22) Source(6, 41) + SourceIndex(0)
+2 >Emitted(7, 23) Source(6, 35) + SourceIndex(0)
 3 >Emitted(7, 25) Source(6, 35) + SourceIndex(0)
 4 >Emitted(7, 31) Source(6, 41) + SourceIndex(0)
 ---
@@ -135,21 +135,21 @@ sourceFile:sourceMapValidationFunctions.ts
 ---
 >>>    for (var _i = 3; _i < arguments.length; _i++) {
 1->^^^^^^^^^
-2 >         ^^^^^^^^^^^
-3 >                    ^
-4 >                     ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                           ^
+2 >         ^^^^^^^^^^
+3 >                   ^^
+4 >                     ^^^^^^^^^^^^^^^^^^^^^
+5 >                                          ^^
 6 >                                            ^^^^
 1->
 2 >         ...restParams: string[]
-3 >                    
+3 >                   
 4 >                     ...restParams: string[]
-5 >                                           
+5 >                                          
 6 >                                            ...restParams: string[]
 1->Emitted(9, 10) Source(6, 55) + SourceIndex(0)
-2 >Emitted(9, 21) Source(6, 78) + SourceIndex(0)
+2 >Emitted(9, 20) Source(6, 78) + SourceIndex(0)
 3 >Emitted(9, 22) Source(6, 55) + SourceIndex(0)
-4 >Emitted(9, 44) Source(6, 78) + SourceIndex(0)
+4 >Emitted(9, 43) Source(6, 78) + SourceIndex(0)
 5 >Emitted(9, 45) Source(6, 55) + SourceIndex(0)
 6 >Emitted(9, 49) Source(6, 78) + SourceIndex(0)
 ---
@@ -233,15 +233,15 @@ sourceFile:sourceMapValidationFunctions.ts
 ---
 >>>    if (n === void 0) { n = 10; }
 1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^
-3 >                     ^^^
+2 >    ^^^^^^^^^^^^^^^^^^
+3 >                      ^^
 4 >                        ^^^^^^
 1->
-2 >    n = 10
-3 >                     
+2 >    
+3 >                      
 4 >                        n = 10
 1->Emitted(16, 5) Source(10, 32) + SourceIndex(0)
-2 >Emitted(16, 22) Source(10, 38) + SourceIndex(0)
+2 >Emitted(16, 23) Source(10, 32) + SourceIndex(0)
 3 >Emitted(16, 25) Source(10, 32) + SourceIndex(0)
 4 >Emitted(16, 31) Source(10, 38) + SourceIndex(0)
 ---
@@ -256,21 +256,21 @@ sourceFile:sourceMapValidationFunctions.ts
 ---
 >>>    for (var _i = 3; _i < arguments.length; _i++) {
 1->^^^^^^^^^
-2 >         ^^^^^^^^^^^
-3 >                    ^
-4 >                     ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                           ^
+2 >         ^^^^^^^^^^
+3 >                   ^^
+4 >                     ^^^^^^^^^^^^^^^^^^^^^
+5 >                                          ^^
 6 >                                            ^^^^
 1->
 2 >         ...restParams: string[]
-3 >                    
+3 >                   
 4 >                     ...restParams: string[]
-5 >                                           
+5 >                                          
 6 >                                            ...restParams: string[]
 1->Emitted(18, 10) Source(10, 52) + SourceIndex(0)
-2 >Emitted(18, 21) Source(10, 75) + SourceIndex(0)
+2 >Emitted(18, 20) Source(10, 75) + SourceIndex(0)
 3 >Emitted(18, 22) Source(10, 52) + SourceIndex(0)
-4 >Emitted(18, 44) Source(10, 75) + SourceIndex(0)
+4 >Emitted(18, 43) Source(10, 75) + SourceIndex(0)
 5 >Emitted(18, 45) Source(10, 52) + SourceIndex(0)
 6 >Emitted(18, 49) Source(10, 75) + SourceIndex(0)
 ---
diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map
index 2a1a549beff..5b7870209a1 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js.map
+++ b/tests/baselines/reference/sourceMapValidationImport.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationImport.js.map]
-{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACb;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
index ca0ae80c5fc..15e68b22c90 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -31,24 +31,18 @@ sourceFile:sourceMapValidationImport.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^
-4 >            ^^
-5 >              ^
-6 >               ^^^^^^^^^^^^->
+4 >            ^^^^^^^^^^^^^^^->
 1->
 2 >export module 
 3 >           m
-4 >             
-5 >              {
 1->Emitted(3, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(3, 12) Source(1, 15) + SourceIndex(0)
 3 >Emitted(3, 13) Source(1, 16) + SourceIndex(0)
-4 >Emitted(3, 15) Source(1, 17) + SourceIndex(0)
-5 >Emitted(3, 16) Source(1, 18) + SourceIndex(0)
 ---
 >>>    var c = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >    
 1->Emitted(4, 5) Source(2, 5) + SourceIndex(0)
 ---
@@ -171,28 +165,31 @@ sourceFile:sourceMapValidationImport.ts
 ---
 >>>exports.b = m.c;
 1->
-2 >^^^^^^^^^
-3 >         ^^^
-4 >            ^
-5 >             ^
-6 >              ^
-7 >               ^
-8 >                ^->
+2 >^^^^^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^
+6 >             ^
+7 >              ^
+8 >               ^
+9 >                ^->
 1->
   >export import 
-2 >b
-3 >          = 
-4 >            m
-5 >             .
-6 >              c
-7 >               ;
+2 >
+3 >        b
+4 >          = 
+5 >            m
+6 >             .
+7 >              c
+8 >               ;
 1->Emitted(12, 1) Source(6, 15) + SourceIndex(0)
-2 >Emitted(12, 10) Source(6, 16) + SourceIndex(0)
-3 >Emitted(12, 13) Source(6, 19) + SourceIndex(0)
-4 >Emitted(12, 14) Source(6, 20) + SourceIndex(0)
-5 >Emitted(12, 15) Source(6, 21) + SourceIndex(0)
-6 >Emitted(12, 16) Source(6, 22) + SourceIndex(0)
-7 >Emitted(12, 17) Source(6, 23) + SourceIndex(0)
+2 >Emitted(12, 9) Source(6, 15) + SourceIndex(0)
+3 >Emitted(12, 10) Source(6, 16) + SourceIndex(0)
+4 >Emitted(12, 13) Source(6, 19) + SourceIndex(0)
+5 >Emitted(12, 14) Source(6, 20) + SourceIndex(0)
+6 >Emitted(12, 15) Source(6, 21) + SourceIndex(0)
+7 >Emitted(12, 16) Source(6, 22) + SourceIndex(0)
+8 >Emitted(12, 17) Source(6, 23) + SourceIndex(0)
 ---
 >>>var x = new a();
 1->
diff --git a/tests/baselines/reference/sourceMapValidationModule.js.map b/tests/baselines/reference/sourceMapValidationModule.js.map
index 4cc15e902ed..357f455d4fd 100644
--- a/tests/baselines/reference/sourceMapValidationModule.js.map
+++ b/tests/baselines/reference/sourceMapValidationModule.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationModule.js.map]
-{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACP,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE,EAAC,CAAC;IACP,IAAO,EAAE,CAER;IAFD,WAAO,EAAE,EAAC,CAAC;QACI,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER;IAED;QACI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARM,EAAE,KAAF,EAAE,QAQR"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE;IACL,IAAO,EAAE,CAER;IAFD,WAAO,EAAE;QACM,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER;IAED;QACI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARM,EAAE,KAAF,EAAE,QAQR"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt
index a03e3567b8c..3b2174a7310 100644
--- a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt
@@ -30,34 +30,29 @@ sourceFile:sourceMapValidationModule.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^
-4 >             ^^
-5 >               ^
+4 >             ^^^->
 1->
 2 >module 
 3 >           m2
-4 >              
-5 >               {
 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
 3 >Emitted(2, 14) Source(1, 10) + SourceIndex(0)
-4 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
-5 >Emitted(2, 17) Source(1, 12) + SourceIndex(0)
 ---
 >>>    var a = 10;
-1 >^^^^
+1->^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^^^
 5 >            ^^
 6 >              ^
-1 >
+1-> {
   >    
 2 >    var 
 3 >        a
 4 >          = 
 5 >            10
 6 >              ;
-1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
+1->Emitted(3, 5) Source(2, 5) + SourceIndex(0)
 2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0)
 3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0)
 4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0)
@@ -135,18 +130,12 @@ sourceFile:sourceMapValidationModule.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^
-4 >             ^^
-5 >               ^
 1->
 2 >module 
 3 >           m3
-4 >              
-5 >               {
 1->Emitted(7, 1) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 12) Source(5, 8) + SourceIndex(0)
 3 >Emitted(7, 14) Source(5, 10) + SourceIndex(0)
-4 >Emitted(7, 16) Source(5, 11) + SourceIndex(0)
-5 >Emitted(7, 17) Source(5, 12) + SourceIndex(0)
 ---
 >>>    var m4;
 1 >^^^^
@@ -154,7 +143,7 @@ sourceFile:sourceMapValidationModule.ts
 3 >        ^^
 4 >          ^
 5 >           ^^^^^^^^^^->
-1 >
+1 > {
   >    
 2 >    module 
 3 >        m4
@@ -170,33 +159,28 @@ sourceFile:sourceMapValidationModule.ts
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^^
-4 >                 ^^
-5 >                   ^
+4 >                 ^^->
 1->
 2 >    module 
 3 >               m4
-4 >                  
-5 >                   {
 1->Emitted(9, 5) Source(6, 5) + SourceIndex(0)
 2 >Emitted(9, 16) Source(6, 12) + SourceIndex(0)
 3 >Emitted(9, 18) Source(6, 14) + SourceIndex(0)
-4 >Emitted(9, 20) Source(6, 15) + SourceIndex(0)
-5 >Emitted(9, 21) Source(6, 16) + SourceIndex(0)
 ---
 >>>        m4.x = 30;
-1 >^^^^^^^^
+1->^^^^^^^^
 2 >        ^^^^
 3 >            ^^^
 4 >               ^^
 5 >                 ^
 6 >                  ^^^^^^^->
-1 >
+1-> {
   >        export var 
 2 >        x
 3 >             = 
 4 >               30
 5 >                 ;
-1 >Emitted(10, 9) Source(7, 20) + SourceIndex(0)
+1->Emitted(10, 9) Source(7, 20) + SourceIndex(0)
 2 >Emitted(10, 13) Source(7, 21) + SourceIndex(0)
 3 >Emitted(10, 16) Source(7, 24) + SourceIndex(0)
 4 >Emitted(10, 18) Source(7, 26) + SourceIndex(0)
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
index 39f552b2002..a20d3ecb6dc 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
@@ -1,2 +1,2 @@
 //// [fooResult.js.map]
-{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACK,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACP;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR"}
\ No newline at end of file
+{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC;IACO,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
index e0f2a3cbbba..6895212b401 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
@@ -29,33 +29,28 @@ sourceFile:tests/cases/compiler/a.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^
-4 >            ^^
-5 >              ^
+4 >            ^->
 1->
 2 >module 
 3 >           M
-4 >             
-5 >              {
 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
 3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0)
-4 >Emitted(2, 15) Source(1, 10) + SourceIndex(0)
-5 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
 ---
 >>>    M.X = 1;
-1 >^^^^
+1->^^^^
 2 >    ^^^
 3 >       ^^^
 4 >          ^
 5 >           ^
 6 >            ^^^^^^^->
-1 >
+1-> {
   >    export var 
 2 >    X
 3 >        = 
 4 >          1
 5 >           ;
-1 >Emitted(3, 5) Source(2, 16) + SourceIndex(0)
+1->Emitted(3, 5) Source(2, 16) + SourceIndex(0)
 2 >Emitted(3, 8) Source(2, 17) + SourceIndex(0)
 3 >Emitted(3, 11) Source(2, 20) + SourceIndex(0)
 4 >Emitted(3, 12) Source(2, 21) + SourceIndex(0)
@@ -113,24 +108,18 @@ sourceFile:tests/cases/compiler/b.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^^^^^->
+4 >             ^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           m1
-4 >              
-5 >               {
 1->Emitted(6, 1) Source(1, 1) + SourceIndex(1)
 2 >Emitted(6, 12) Source(1, 8) + SourceIndex(1)
 3 >Emitted(6, 14) Source(1, 10) + SourceIndex(1)
-4 >Emitted(6, 16) Source(1, 11) + SourceIndex(1)
-5 >Emitted(6, 17) Source(1, 12) + SourceIndex(1)
 ---
 >>>    var c1 = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >    
 1->Emitted(7, 5) Source(2, 5) + SourceIndex(1)
 ---
diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map
index c32505b01ae..10225f979e5 100644
--- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map
+++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map
@@ -1,2 +1,2 @@
 //// [sourcemapValidationDuplicateNames.js.map]
-{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE,EAAC,CAAC;IACP,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,IAAO,EAAE,CAER;AAFD,WAAO,EAAE,EAAC,CAAC;IACP,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER"}
\ No newline at end of file
+{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,IAAO,EAAE,CAER;AAFD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt
index 5e67d69a517..5ae487440ee 100644
--- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt
+++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt
@@ -31,35 +31,30 @@ sourceFile:sourcemapValidationDuplicateNames.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^
-4 >             ^^
-5 >               ^
+4 >             ^^^->
 1->
 2 >module 
 3 >           m1
-4 >              
-5 >               {
 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
 3 >Emitted(2, 14) Source(1, 10) + SourceIndex(0)
-4 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
-5 >Emitted(2, 17) Source(1, 12) + SourceIndex(0)
 ---
 >>>    var x = 10;
-1 >^^^^
+1->^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^^^
 5 >            ^^
 6 >              ^
 7 >               ^^^^^^^^^^^^->
-1 >
+1-> {
   >    
 2 >    var 
 3 >        x
 4 >          = 
 5 >            10
 6 >              ;
-1 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
+1->Emitted(3, 5) Source(2, 5) + SourceIndex(0)
 2 >Emitted(3, 9) Source(2, 9) + SourceIndex(0)
 3 >Emitted(3, 10) Source(2, 10) + SourceIndex(0)
 4 >Emitted(3, 13) Source(2, 13) + SourceIndex(0)
@@ -179,19 +174,13 @@ sourceFile:sourcemapValidationDuplicateNames.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^->
+4 >             ^^^^^^^^^^^->
 1->
 2 >module 
 3 >           m1
-4 >              
-5 >               {
 1->Emitted(12, 1) Source(6, 1) + SourceIndex(0)
 2 >Emitted(12, 12) Source(6, 8) + SourceIndex(0)
 3 >Emitted(12, 14) Source(6, 10) + SourceIndex(0)
-4 >Emitted(12, 16) Source(6, 11) + SourceIndex(0)
-5 >Emitted(12, 17) Source(6, 12) + SourceIndex(0)
 ---
 >>>    var b = new m1.c();
 1->^^^^
@@ -204,7 +193,7 @@ sourceFile:sourcemapValidationDuplicateNames.ts
 8 >                   ^
 9 >                    ^^
 10>                      ^
-1->
+1-> {
   >    
 2 >    var 
 3 >        b
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
index 62a23d538c4..a641ecd6f03 100644
--- a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
@@ -148,9 +148,9 @@ function outer(x) {
     var Inner = (function () {
         function Inner() {
         }
-        Inner.y = x;
         return Inner;
     }());
+    Inner.y = x;
     return Inner;
 }
 var y = outer(5).y;
diff --git a/tests/baselines/reference/staticClassProps.js b/tests/baselines/reference/staticClassProps.js
index c808e4eb7fd..48798bd4def 100644
--- a/tests/baselines/reference/staticClassProps.js
+++ b/tests/baselines/reference/staticClassProps.js
@@ -12,7 +12,8 @@ class C
 var C = (function () {
     function C() {
     }
-    C.prototype.foo = function () { };
-    C.z = 1;
+    C.prototype.foo = function () {
+    };
     return C;
 }());
+C.z = 1;
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index 238d1bdad13..c480fd33285 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -26,5 +26,5 @@ exports.Promise = Promise;
 //// [staticInstanceResolution3_1.js]
 "use strict";
 ///<reference path='staticInstanceResolution3_0.ts'/>
-var WinJS = require('./staticInstanceResolution3_0');
+var WinJS = require("./staticInstanceResolution3_0");
 WinJS.Promise.timeout(10);
diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
index a05ece1dbbb..1c76a251220 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -28,6 +28,6 @@ var P = (function (_super) {
     function P() {
         _super.apply(this, arguments);
     }
-    P.SomeNumber = P.GetNumber();
     return P;
 }(SomeBase));
+P.SomeNumber = P.GetNumber();
diff --git a/tests/baselines/reference/staticMemberInitialization.js b/tests/baselines/reference/staticMemberInitialization.js
index c21c29ed4f8..13a5c8c25c6 100644
--- a/tests/baselines/reference/staticMemberInitialization.js
+++ b/tests/baselines/reference/staticMemberInitialization.js
@@ -10,8 +10,8 @@ var r = C.x;
 var C = (function () {
     function C() {
     }
-    C.x = 1;
     return C;
 }());
+C.x = 1;
 var c = new C();
 var r = C.x;
diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
index 2fdd64ea04b..9d8846ba963 100644
--- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
+++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
@@ -19,10 +19,10 @@ var C = (function () {
         this.x2 = C['0'];
         this.x3 = C[0];
     }
-    C["foo"] = 0;
-    C[0] = 1;
-    C.s = C['foo'];
-    C.s2 = C['0'];
-    C.s3 = C[0];
     return C;
 }());
+C["foo"] = 0;
+C[0] = 1;
+C.s = C['foo'];
+C.s2 = C['0'];
+C.s3 = C[0];
diff --git a/tests/baselines/reference/staticModifierAlreadySeen.js b/tests/baselines/reference/staticModifierAlreadySeen.js
index 76f8b050d6f..c37d4c0807a 100644
--- a/tests/baselines/reference/staticModifierAlreadySeen.js
+++ b/tests/baselines/reference/staticModifierAlreadySeen.js
@@ -9,6 +9,6 @@ var C = (function () {
     function C() {
     }
     C.bar = function () { };
-    C.foo = 1;
     return C;
 }());
+C.foo = 1;
diff --git a/tests/baselines/reference/staticPropSuper.js b/tests/baselines/reference/staticPropSuper.js
index f4bc5ece8d1..c25c406746d 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -52,9 +52,9 @@ var B = (function (_super) {
         var x = 1; // should not error
         _super.call(this);
     }
-    B.s = 9;
     return B;
 }(A));
+B.s = 9;
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js
index 3776c09c8ce..d52a28208e6 100644
--- a/tests/baselines/reference/statics.js
+++ b/tests/baselines/reference/statics.js
@@ -45,11 +45,11 @@ var M;
         C.f = function (n) {
             return "wow: " + (n + C.y + C.pub + C.priv);
         };
-        C.priv = 2;
-        C.pub = 3;
-        C.y = C.priv;
         return C;
     }());
+    C.priv = 2;
+    C.pub = 3;
+    C.y = C.priv;
     M.C = C;
     var c = C.y;
     function f() {
diff --git a/tests/baselines/reference/staticsInConstructorBodies.js b/tests/baselines/reference/staticsInConstructorBodies.js
index 9bc3ed29325..edd49456ef7 100644
--- a/tests/baselines/reference/staticsInConstructorBodies.js
+++ b/tests/baselines/reference/staticsInConstructorBodies.js
@@ -11,6 +11,6 @@ var C = (function () {
     function C() {
     }
     C.m1 = function () { }; // ERROR
-    C.p1 = 0; // ERROR
     return C;
 }());
+C.p1 = 0; // ERROR
diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.js b/tests/baselines/reference/staticsNotInScopeInClodule.js
index 150ae8aca5b..e10ed2b31d3 100644
--- a/tests/baselines/reference/staticsNotInScopeInClodule.js
+++ b/tests/baselines/reference/staticsNotInScopeInClodule.js
@@ -11,9 +11,9 @@ module Clod {
 var Clod = (function () {
     function Clod() {
     }
-    Clod.x = 10;
     return Clod;
 }());
+Clod.x = 10;
 var Clod;
 (function (Clod) {
     var p = x; // x isn't in scope here
diff --git a/tests/baselines/reference/strictModeInConstructor.js b/tests/baselines/reference/strictModeInConstructor.js
index bcfbdf22414..446fed5b76a 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -105,18 +105,18 @@ var Bs = (function (_super) {
         "use strict"; // No error
         _super.call(this);
     }
-    Bs.s = 9;
     return Bs;
 }(A));
+Bs.s = 9;
 var Cs = (function (_super) {
     __extends(Cs, _super);
     function Cs() {
         _super.call(this); // No error
         "use strict";
     }
-    Cs.s = 9;
     return Cs;
 }(A));
+Cs.s = 9;
 var Ds = (function (_super) {
     __extends(Ds, _super);
     function Ds() {
@@ -124,6 +124,6 @@ var Ds = (function (_super) {
         _super.call(this);
         "use strict";
     }
-    Ds.s = 9;
     return Ds;
 }(A));
+Ds.s = 9;
diff --git a/tests/baselines/reference/superAccess.js b/tests/baselines/reference/superAccess.js
index 37c6a9816a6..6e5cd9aca44 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -24,9 +24,9 @@ var MyBase = (function () {
         this.S2 = "test";
         this.f = function () { return 5; };
     }
-    MyBase.S1 = 5;
     return MyBase;
 }());
+MyBase.S1 = 5;
 var MyDerived = (function (_super) {
     __extends(MyDerived, _super);
     function MyDerived() {
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
index b27d695cb31..8de13b5ef51 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -42,9 +42,9 @@ var Q = (function (_super) {
     // Super is not allowed in constructor args
     function Q(z, zz, zzz) {
         var _this = this;
-        if (z === void 0) { z = _super.prototype.; }
-        if (zz === void 0) { zz = _super.prototype.; }
-        if (zzz === void 0) { zzz = function () { return _super.prototype.; }; }
+        if (z === void 0) { z = _super.; }
+        if (zz === void 0) { zz = _super.; }
+        if (zzz === void 0) { zzz = function () { return _super.; }; }
         _super.call(this);
         this.z = z;
         this.xx = _super.prototype.;
@@ -59,6 +59,6 @@ var Q = (function (_super) {
         _super.x.call(this); // error
         _super.y.call(this);
     };
-    Q.yy = _super.; // error for static initializer accessing super
     return Q;
 }(P));
+Q.yy = _super.; // error for static initializer accessing super
diff --git a/tests/baselines/reference/superCallInConstructorWithNoBaseType.js b/tests/baselines/reference/superCallInConstructorWithNoBaseType.js
index 9b0f63ed871..9746ab6a9de 100644
--- a/tests/baselines/reference/superCallInConstructorWithNoBaseType.js
+++ b/tests/baselines/reference/superCallInConstructorWithNoBaseType.js
@@ -20,8 +20,8 @@ var C = (function () {
 }());
 var D = (function () {
     function D(x) {
-        this.x = x;
         _super.call(this); // error
+        this.x = x;
     }
     return D;
 }());
diff --git a/tests/baselines/reference/superErrors.js b/tests/baselines/reference/superErrors.js
index 0208e720b0c..fd70114d0fd 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -58,6 +58,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 function foo() {
+    var _this = this;
     // super in a non class context
     var x = _super.;
     var y = function () { return _super.; };
@@ -83,20 +84,28 @@ var RegisteredUser = (function (_super) {
         }
         // super call in a lambda in an inner function in a constructor 
         function inner2() {
-            var x = function () { return _super.sayHello.call(this); };
+            var _this = this;
+            var x = function () { return _super.sayHello.call(_this); };
         }
         // super call in a lambda in a function expression in a constructor 
-        (function () { return function () { return _super.; }; })();
+        (function () {
+            var _this = this;
+            return function () { return _super.; };
+        })();
     }
     RegisteredUser.prototype.sayHello = function () {
         // super call in a method
         _super.prototype.sayHello.call(this);
         // super call in a lambda in an inner function in a method
         function inner() {
-            var x = function () { return _super.sayHello.call(this); };
+            var _this = this;
+            var x = function () { return _super.sayHello.call(_this); };
         }
         // super call in a lambda in a function expression in a constructor 
-        (function () { return function () { return _super.; }; })();
+        (function () {
+            var _this = this;
+            return function () { return _super.; };
+        })();
     };
     RegisteredUser.staticFunction = function () {
         var _this = this;
diff --git a/tests/baselines/reference/superInConstructorParam1.js b/tests/baselines/reference/superInConstructorParam1.js
index 9c3c11d105c..3c6eb0bdad2 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -27,7 +27,7 @@ var B = (function () {
 var C = (function (_super) {
     __extends(C, _super);
     function C(a) {
-        if (a === void 0) { a = _super.prototype.foo.call(this); }
+        if (a === void 0) { a = _super.foo.call(this); }
     }
     return C;
 }(B));
diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.js b/tests/baselines/reference/superInObjectLiterals_ES5.js
index f701ca7df7b..5d1fed24b4f 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.js
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -65,6 +65,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
+var _this = this;
 var obj = {
     __proto__: {
         method: function () {
@@ -87,7 +88,7 @@ var obj = {
         _super.method.call(this);
     },
     p3: function () {
-        _super.method.call(this);
+        _super.method.call(_this);
     }
 };
 var A = (function () {
diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js
index 825fa7682e2..940814a3104 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js
@@ -25,7 +25,6 @@ class B extends A {
             [super.foo()]() {
                 return 100;
             }
-        }
-        ;
+        };
     }
 }
diff --git a/tests/baselines/reference/systemExportAssignment.js b/tests/baselines/reference/systemExportAssignment.js
index 1e87af1ca22..9db066ce8b1 100644
--- a/tests/baselines/reference/systemExportAssignment.js
+++ b/tests/baselines/reference/systemExportAssignment.js
@@ -10,12 +10,12 @@ import * as a from "a";
 
 
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemExportAssignment2.js b/tests/baselines/reference/systemExportAssignment2.js
index 177f36f23d2..a16724d9640 100644
--- a/tests/baselines/reference/systemExportAssignment2.js
+++ b/tests/baselines/reference/systemExportAssignment2.js
@@ -10,24 +10,24 @@ import * as a from "a";
 
 
 //// [a.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var a;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             a = 10;
         }
-    }
+    };
 });
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemExportAssignment3.js b/tests/baselines/reference/systemExportAssignment3.js
index 78e330c6467..00ebe2f50c9 100644
--- a/tests/baselines/reference/systemExportAssignment3.js
+++ b/tests/baselines/reference/systemExportAssignment3.js
@@ -12,12 +12,12 @@ import * as a from "a";
 
 
 //// [b.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule1.js b/tests/baselines/reference/systemModule1.js
index 2b7e3e2c4dc..e2a4d309d66 100644
--- a/tests/baselines/reference/systemModule1.js
+++ b/tests/baselines/reference/systemModule1.js
@@ -3,14 +3,14 @@
 export var x = 1;
 
 //// [systemModule1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = 1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule10.js b/tests/baselines/reference/systemModule10.js
index 0c171ab6cc1..10afa784ebb 100644
--- a/tests/baselines/reference/systemModule10.js
+++ b/tests/baselines/reference/systemModule10.js
@@ -10,19 +10,20 @@ export {n2}
 export {n2 as n3}
 
 //// [systemModule10.js]
-System.register(['file1', 'file2'], function(exports_1, context_1) {
+System.register(["file1", "file2"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var file1_1, n2;
     return {
-        setters:[
+        setters: [
             function (file1_1_1) {
                 file1_1 = file1_1_1;
             },
             function (n2_1) {
                 n2 = n2_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", file1_1.x);
             exports_1("y", file1_1.x);
             exports_1("n", file1_1["default"]);
@@ -30,5 +31,5 @@ System.register(['file1', 'file2'], function(exports_1, context_1) {
             exports_1("n2", n2);
             exports_1("n3", n2);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule10_ES5.js b/tests/baselines/reference/systemModule10_ES5.js
index 711ca3ed7a3..830c611bd38 100644
--- a/tests/baselines/reference/systemModule10_ES5.js
+++ b/tests/baselines/reference/systemModule10_ES5.js
@@ -10,19 +10,20 @@ export {n2}
 export {n2 as n3}
 
 //// [systemModule10_ES5.js]
-System.register(['file1', 'file2'], function(exports_1, context_1) {
+System.register(["file1", "file2"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var file1_1, n2;
     return {
-        setters:[
+        setters: [
             function (file1_1_1) {
                 file1_1 = file1_1_1;
             },
             function (n2_1) {
                 n2 = n2_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", file1_1.x);
             exports_1("y", file1_1.x);
             exports_1("n", file1_1.default);
@@ -30,5 +31,5 @@ System.register(['file1', 'file2'], function(exports_1, context_1) {
             exports_1("n2", n2);
             exports_1("n3", n2);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule11.js b/tests/baselines/reference/systemModule11.js
index f7d47db1d7f..7f120cec40d 100644
--- a/tests/baselines/reference/systemModule11.js
+++ b/tests/baselines/reference/systemModule11.js
@@ -42,78 +42,84 @@ export * from 'a';
 
 //// [file1.js]
 // set of tests cases that checks generation of local storage for exported names
-System.register(['bar'], function(exports_1, context_1) {
+System.register(["bar"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var x;
     function foo() { }
+    var x;
     exports_1("foo", foo);
     var exportedNames_1 = {
-        'x': true,
-        'foo': true
+        "x": true,
+        "foo": true
     };
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default" && !exportedNames_1.hasOwnProperty(n))
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (bar_1_1) {
                 exportStar_1(bar_1_1);
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
+            // set of tests cases that checks generation of local storage for exported names
         }
-    }
+    };
 });
 //// [file2.js]
-System.register(['bar'], function(exports_1, context_1) {
+System.register(["bar"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x, y;
     var exportedNames_1 = {
-        'x': true,
-        'y1': true
+        "x": true,
+        "y1": true
     };
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default" && !exportedNames_1.hasOwnProperty(n))
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (bar_1_1) {
                 exportStar_1(bar_1_1);
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", x);
             exports_1("y1", y);
         }
-    }
+    };
 });
 //// [file3.js]
-System.register(['a', 'bar'], function(exports_1, context_1) {
+System.register(["a", "bar"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function foo() { }
     exports_1("default", foo);
     var exportedNames_1 = {
-        'x': true,
-        'z': true
+        "x": true,
+        "z": true
     };
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default" && !exportedNames_1.hasOwnProperty(n))
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (a_1_1) {
                 exports_1({
                     "x": a_1_1["x"],
@@ -122,52 +128,56 @@ System.register(['a', 'bar'], function(exports_1, context_1) {
             },
             function (bar_1_1) {
                 exportStar_1(bar_1_1);
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file4.js]
-System.register(['a'], function(exports_1, context_1) {
+System.register(["a"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var x, z, z1;
     function foo() { }
-    exports_1("foo", foo);
     function default_1() { }
+    var x, z, z1;
+    exports_1("foo", foo);
     exports_1("default", default_1);
     return {
-        setters:[
+        setters: [
             function (a_1_1) {
                 exports_1({
                     "s": a_1_1["s"],
                     "s2": a_1_1["s1"]
                 });
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("z", z);
             exports_1("z2", z1);
         }
-    }
+    };
 });
 //// [file5.js]
-System.register(['a'], function(exports_1, context_1) {
+System.register(["a"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function foo() { }
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default") exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default")
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (a_1_1) {
                 exportStar_1(a_1_1);
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule12.js b/tests/baselines/reference/systemModule12.js
index 45e7beaf218..8e94ffb54da 100644
--- a/tests/baselines/reference/systemModule12.js
+++ b/tests/baselines/reference/systemModule12.js
@@ -5,12 +5,12 @@ import n from 'file1'
 
 
 //// [systemModule12.js]
-System.register("NamedModule", [], function(exports_1, context_1) {
+System.register("NamedModule", [], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule13.js b/tests/baselines/reference/systemModule13.js
index e3ed2daf3a6..c527fd3e811 100644
--- a/tests/baselines/reference/systemModule13.js
+++ b/tests/baselines/reference/systemModule13.js
@@ -5,19 +5,18 @@ export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}};
 for ([x] of [[1]]) {}
 
 //// [systemModule13.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var x, y, z, z0, z1;
+    var x, y, z, _a, z0, z1, _b;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             _a = [1, 2, 3], exports_1("x", x = _a[0]), exports_1("y", y = _a[1]), exports_1("z", z = _a[2]);
             _b = { a: true, b: { c: "123" } }, exports_1("z0", z0 = _b.a), exports_1("z1", z1 = _b.b.c);
-            for (var _i = 0, _c = [[1]]; _i < _c.length; _i++) {
-                exports_1("x", x = _c[_i][0]);
+            for (var _i = 0, _a = [[1]]; _i < _a.length; _i++) {
+                exports_1("x", x = _a[_i][0]);
             }
         }
-    }
-    var _a, _b;
+    };
 });
diff --git a/tests/baselines/reference/systemModule14.js b/tests/baselines/reference/systemModule14.js
index 5eaafd9ba6b..bebe9244e07 100644
--- a/tests/baselines/reference/systemModule14.js
+++ b/tests/baselines/reference/systemModule14.js
@@ -11,23 +11,23 @@ var x = 1;
 export {foo as b}
 
 //// [systemModule14.js]
-System.register(["foo"], function(exports_1, context_1) {
+System.register(["foo"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var foo_1;
-    var x;
     function foo() {
         return foo_1.a;
     }
+    var foo_1, x;
     return {
-        setters:[
+        setters: [
             function (foo_1_1) {
                 foo_1 = foo_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("foo", foo);
             x = 1;
             exports_1("b", foo);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule15.js b/tests/baselines/reference/systemModule15.js
index f2fefb344ac..92f9bf444bd 100644
--- a/tests/baselines/reference/systemModule15.js
+++ b/tests/baselines/reference/systemModule15.js
@@ -34,63 +34,65 @@ export default value;
 export var value2 = "v";
 
 //// [file3.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var value;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("value", value = "youpi");
-            exports_1("default",value);
+            exports_1("default", value);
         }
-    }
+    };
 });
 //// [file4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var value2;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("value2", value2 = "v");
         }
-    }
+    };
 });
 //// [file2.js]
-System.register(["./file3"], function(exports_1, context_1) {
+System.register(["./file3"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var moduleCStar, file3_1, file3_2;
     return {
-        setters:[
+        setters: [
             function (moduleCStar_1) {
                 moduleCStar = moduleCStar_1;
                 file3_1 = moduleCStar_1;
                 file3_2 = moduleCStar_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("moduleCStar", moduleCStar);
             exports_1("moduleC", file3_1["default"]);
             exports_1("value", file3_2.value);
         }
-    }
+    };
 });
 //// [file1.js]
-System.register(["./file2"], function(exports_1, context_1) {
+System.register(["./file2"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var moduleB;
     return {
-        setters:[
+        setters: [
             function (moduleB_1) {
                 moduleB = moduleB_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             use(moduleB.value);
             use(moduleB.moduleC);
             use(moduleB.moduleCStar);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule16.js b/tests/baselines/reference/systemModule16.js
index 27fa77b9c76..8058e0f2ea1 100644
--- a/tests/baselines/reference/systemModule16.js
+++ b/tests/baselines/reference/systemModule16.js
@@ -13,26 +13,27 @@ x,y,a1,b1,d1;
 
 
 //// [systemModule16.js]
-System.register(["foo", "bar"], function(exports_1, context_1) {
+System.register(["foo", "bar"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x, y, foo_1;
     var exportedNames_1 = {
-        'x': true,
-        'y': true,
-        'a2': true,
-        'b2': true,
-        'd2': true
+        "x": true,
+        "y": true,
+        "a2": true,
+        "b2": true,
+        "d2": true
     };
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default" && !exportedNames_1.hasOwnProperty(n))
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (x_1) {
                 x = x_1;
                 exportStar_1(x_1);
@@ -46,11 +47,12 @@ System.register(["foo", "bar"], function(exports_1, context_1) {
                     "b2": y_1["b2"],
                     "d2": y_1["c2"]
                 });
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             exports_1("x", x);
             exports_1("y", y);
             x, y, foo_1.a1, foo_1.b1, foo_1.c1;
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule17.js b/tests/baselines/reference/systemModule17.js
index 6bf1ce25b84..df3d722f3d2 100644
--- a/tests/baselines/reference/systemModule17.js
+++ b/tests/baselines/reference/systemModule17.js
@@ -42,13 +42,13 @@ export {II};
 export {II as II1};
 
 //// [f1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var A;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             A = (function () {
                 function A() {
                 }
@@ -56,20 +56,20 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("A", A);
         }
-    }
+    };
 });
 //// [f2.js]
-System.register(["f1"], function(exports_1, context_1) {
+System.register(["f1"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var f1_1;
-    var x, N, IX;
+    var x, N, IX, f1_1;
     return {
-        setters:[
+        setters: [
             function (f1_1_1) {
                 f1_1 = f1_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             x = 1;
             (function (N) {
                 N.x = 1;
@@ -84,5 +84,5 @@ System.register(["f1"], function(exports_1, context_1) {
             exports_1("IX", IX);
             exports_1("IX1", IX);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule2.js b/tests/baselines/reference/systemModule2.js
index 95755421eaa..c267eaefb43 100644
--- a/tests/baselines/reference/systemModule2.js
+++ b/tests/baselines/reference/systemModule2.js
@@ -4,14 +4,14 @@ var x = 1;
 export = x;
 
 //// [systemModule2.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             x = 1;
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule3.js b/tests/baselines/reference/systemModule3.js
index 7800c8c220e..a8f93941c89 100644
--- a/tests/baselines/reference/systemModule3.js
+++ b/tests/baselines/reference/systemModule3.js
@@ -18,37 +18,37 @@ export default class C {}
 export default class {}
 
 //// [file1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function default_1() { }
     exports_1("default", default_1);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file2.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function f() { }
     exports_1("default", f);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file3.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var C;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             C = (function () {
                 function C() {
                 }
@@ -56,22 +56,22 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("default", C);
         }
-    }
+    };
 });
 //// [file4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var default_1;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             default_1 = (function () {
-                function default_1() {
+                function class_1() {
                 }
-                return default_1;
+                return class_1;
             }());
             exports_1("default", default_1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule4.js b/tests/baselines/reference/systemModule4.js
index 67990c63a58..22a4755e9fb 100644
--- a/tests/baselines/reference/systemModule4.js
+++ b/tests/baselines/reference/systemModule4.js
@@ -4,14 +4,14 @@ export var x = 1;
 export var y;
 
 //// [systemModule4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x, y;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = 1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule5.js b/tests/baselines/reference/systemModule5.js
index d0b1f79b2f7..ada3b339168 100644
--- a/tests/baselines/reference/systemModule5.js
+++ b/tests/baselines/reference/systemModule5.js
@@ -4,14 +4,14 @@ export function foo() {}
 
 
 //// [systemModule5.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function foo() { }
     exports_1("foo", foo);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule6.js b/tests/baselines/reference/systemModule6.js
index 4848c82f738..5e1f51dd697 100644
--- a/tests/baselines/reference/systemModule6.js
+++ b/tests/baselines/reference/systemModule6.js
@@ -7,16 +7,16 @@ function foo() {
 
 
 //// [systemModule6.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var C;
     function foo() {
         new C();
     }
+    var C;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             C = (function () {
                 function C() {
                 }
@@ -24,5 +24,5 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("C", C);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule7.js b/tests/baselines/reference/systemModule7.js
index 60114b54400..bf34e3f786c 100644
--- a/tests/baselines/reference/systemModule7.js
+++ b/tests/baselines/reference/systemModule7.js
@@ -11,18 +11,18 @@ export module M {
 }
 
 //// [systemModule7.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var M;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             // filename: instantiatedModule.ts
             (function (M) {
                 var x = 1;
             })(M = M || (M = {}));
             exports_1("M", M);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModule8.js b/tests/baselines/reference/systemModule8.js
index f099628facb..467c52298fb 100644
--- a/tests/baselines/reference/systemModule8.js
+++ b/tests/baselines/reference/systemModule8.js
@@ -31,19 +31,19 @@ export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}};
 for ([x] of [[1]]) {}
 
 //// [systemModule8.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var x, y, z0, z1;
     function foo() {
         exports_1("x", x = 100);
     }
+    var x, y, z0, z1, _a;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = 1);
-            (exports_1("x", ++x) - 1);
-            (exports_1("x", --x) + 1);
+            exports_1("x", ++x) - 1;
+            exports_1("x", --x) + 1;
             exports_1("x", ++x);
             exports_1("x", --x);
             exports_1("x", x += 1);
@@ -56,17 +56,16 @@ System.register([], function(exports_1, context_1) {
             x - 1;
             x & 1;
             x | 1;
-            for (exports_1("x", x = 5);; (exports_1("x", ++x) - 1)) { }
-            for (exports_1("x", x = 8);; (exports_1("x", --x) + 1)) { }
+            for (exports_1("x", x = 5);; exports_1("x", ++x) - 1) { }
+            for (exports_1("x", x = 8);; exports_1("x", --x) + 1) { }
             for (exports_1("x", x = 15);; exports_1("x", ++x)) { }
             for (exports_1("x", x = 18);; exports_1("x", --x)) { }
             for (var x_1 = 50;;) { }
             exports_1("y", y = [1][0]);
             _a = { a: true, b: { c: "123" } }, exports_1("z0", z0 = _a.a), exports_1("z1", z1 = _a.b.c);
-            for (var _i = 0, _b = [[1]]; _i < _b.length; _i++) {
-                exports_1("x", x = _b[_i][0]);
+            for (var _i = 0, _a = [[1]]; _i < _a.length; _i++) {
+                exports_1("x", x = _a[_i][0]);
             }
         }
-    }
-    var _a;
+    };
 });
diff --git a/tests/baselines/reference/systemModule9.js b/tests/baselines/reference/systemModule9.js
index 940b9e5975b..e46b97a71a2 100644
--- a/tests/baselines/reference/systemModule9.js
+++ b/tests/baselines/reference/systemModule9.js
@@ -22,24 +22,24 @@ export {x};
 export {y as z};
 
 //// [systemModule9.js]
-System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'], function(exports_1, context_1) {
+System.register(["file1", "file2", "file3", "file4", "file5", "file6", "file7"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var ns, file2_1, file3_1, file5_1, ns3;
-    var x, y;
+    var ns, file2_1, file3_1, file5_1, ns3, x, y;
     var exportedNames_1 = {
-        'x': true,
-        'z': true
+        "x": true,
+        "z": true
     };
     function exportStar_1(m) {
         var exports = {};
-        for(var n in m) {
-            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        for (var n in m) {
+            if (n !== "default" && !exportedNames_1.hasOwnProperty(n))
+                exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
-        setters:[
+        setters: [
             function (ns_1) {
                 ns = ns_1;
             },
@@ -49,7 +49,8 @@ System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'],
             function (file3_1_1) {
                 file3_1 = file3_1_1;
             },
-            function (_1) {},
+            function (_1) {
+            },
             function (file5_1_1) {
                 file5_1 = file5_1_1;
             },
@@ -58,8 +59,9 @@ System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'],
             },
             function (file7_1_1) {
                 exportStar_1(file7_1_1);
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             ns.f();
             file2_1.a();
             file2_1.b();
@@ -71,5 +73,5 @@ System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'],
             exports_1("x", x);
             exports_1("z", y);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.js b/tests/baselines/reference/systemModuleAmbientDeclarations.js
index 91bad620b77..9714f138c5e 100644
--- a/tests/baselines/reference/systemModuleAmbientDeclarations.js
+++ b/tests/baselines/reference/systemModuleAmbientDeclarations.js
@@ -29,68 +29,68 @@ export declare module M { var v: number; }
 
 
 //// [file1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var promise, foo, c, e;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             ;
             exports_1("promise", promise = Promise);
             exports_1("foo", foo = Foo);
             exports_1("c", c = C);
             exports_1("e", e = E);
         }
-    }
+    };
 });
 //// [file2.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file3.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file5.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file6.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleConstEnums.js b/tests/baselines/reference/systemModuleConstEnums.js
index 08df549a87b..dbb88c61e14 100644
--- a/tests/baselines/reference/systemModuleConstEnums.js
+++ b/tests/baselines/reference/systemModuleConstEnums.js
@@ -13,7 +13,7 @@ module M {
 }
 
 //// [systemModuleConstEnums.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function foo() {
@@ -22,8 +22,8 @@ System.register([], function(exports_1, context_1) {
     }
     exports_1("foo", foo);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js
index be2f07cc59e..0cd6f472bdb 100644
--- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js
+++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js
@@ -13,18 +13,18 @@ module M {
 }
 
 //// [systemModuleConstEnumsSeparateCompilation.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var TopLevelConstEnum, M;
     function foo() {
         use(TopLevelConstEnum.X);
         use(M.NonTopLevelConstEnum.X);
     }
+    var TopLevelConstEnum, M;
     exports_1("foo", foo);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             (function (TopLevelConstEnum) {
                 TopLevelConstEnum[TopLevelConstEnum["X"] = 0] = "X";
             })(TopLevelConstEnum || (TopLevelConstEnum = {}));
@@ -35,5 +35,5 @@ System.register([], function(exports_1, context_1) {
                 var NonTopLevelConstEnum = M.NonTopLevelConstEnum;
             })(M || (M = {}));
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js
index 1196aa8898d..d5994bc9f22 100644
--- a/tests/baselines/reference/systemModuleDeclarationMerging.js
+++ b/tests/baselines/reference/systemModuleDeclarationMerging.js
@@ -10,15 +10,15 @@ export enum E {}
 export module E { var x; }
 
 //// [systemModuleDeclarationMerging.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var F, C, E;
     function F() { }
+    var F, C, C, E, E;
     exports_1("F", F);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             (function (F) {
                 var x;
             })(F = F || (F = {}));
@@ -41,5 +41,5 @@ System.register([], function(exports_1, context_1) {
             })(E = E || (E = {}));
             exports_1("E", E);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleExportDefault.js b/tests/baselines/reference/systemModuleExportDefault.js
index eaa4e6ddaa7..53f63ecb027 100644
--- a/tests/baselines/reference/systemModuleExportDefault.js
+++ b/tests/baselines/reference/systemModuleExportDefault.js
@@ -16,54 +16,54 @@ export default class C {}
 
 
 //// [file1.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function default_1() { }
     exports_1("default", default_1);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file2.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     function foo() { }
     exports_1("default", foo);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
         }
-    }
+    };
 });
 //// [file3.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var default_1;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             default_1 = (function () {
-                function default_1() {
+                function class_1() {
                 }
-                return default_1;
+                return class_1;
             }());
             exports_1("default", default_1);
         }
-    }
+    };
 });
 //// [file4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var C;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             C = (function () {
                 function C() {
                 }
@@ -71,5 +71,5 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("default", C);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js
index 1cf993baec0..b0498b23f79 100644
--- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js
+++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js
@@ -13,15 +13,15 @@ export module TopLevelModule2 {
 }
 
 //// [systemModuleNonTopLevelModuleMembers.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var TopLevelClass, TopLevelModule, TopLevelEnum, TopLevelModule2;
     function TopLevelFunction() { }
+    var TopLevelClass, TopLevelModule, TopLevelEnum, TopLevelModule2;
     exports_1("TopLevelFunction", TopLevelFunction);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             TopLevelClass = (function () {
                 function TopLevelClass() {
                 }
@@ -56,5 +56,5 @@ System.register([], function(exports_1, context_1) {
             })(TopLevelModule2 = TopLevelModule2 || (TopLevelModule2 = {}));
             exports_1("TopLevelModule2", TopLevelModule2);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleTargetES6.js b/tests/baselines/reference/systemModuleTargetES6.js
index 21bbc6a6ad8..a049ea78395 100644
--- a/tests/baselines/reference/systemModuleTargetES6.js
+++ b/tests/baselines/reference/systemModuleTargetES6.js
@@ -14,29 +14,29 @@ export function myFunction2() {
 }
 
 //// [systemModuleTargetES6.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var MyClass, MyClass2;
     function myFunction() {
         return new MyClass();
     }
-    exports_1("myFunction", myFunction);
     function myFunction2() {
         return new MyClass2();
     }
+    var MyClass, MyClass2;
+    exports_1("myFunction", myFunction);
     exports_1("myFunction2", myFunction2);
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             MyClass = class MyClass {
             };
             exports_1("MyClass", MyClass);
             MyClass2 = class MyClass2 {
                 static getInstance() { return MyClass2.value; }
             };
-            MyClass2.value = 42;
             exports_1("MyClass2", MyClass2);
+            MyClass2.value = 42;
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js
index 0aab851cc57..31cd542d2e2 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -13,13 +13,13 @@ export class Bar extends Foo {
 }
 
 //// [foo.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var Foo;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             Foo = (function () {
                 function Foo() {
                 }
@@ -27,25 +27,25 @@ System.register([], function(exports_1, context_1) {
             }());
             exports_1("Foo", Foo);
         }
-    }
+    };
 });
 //// [bar.js]
-System.register(['./foo'], function(exports_1, context_1) {
+System.register(["./foo"], function (exports_1, context_1) {
     "use strict";
-    var __moduleName = context_1 && context_1.id;
     var __extends = (this && this.__extends) || function (d, b) {
         for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
-    var foo_1;
-    var Bar;
+    var __moduleName = context_1 && context_1.id;
+    var foo_1, Bar;
     return {
-        setters:[
+        setters: [
             function (foo_1_1) {
                 foo_1 = foo_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             Bar = (function (_super) {
                 __extends(Bar, _super);
                 function Bar() {
@@ -55,5 +55,5 @@ System.register(['./foo'], function(exports_1, context_1) {
             }(foo_1.Foo));
             exports_1("Bar", Bar);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
index 511928e1342..16f1a3faea0 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
@@ -46,4 +46,4 @@ var f;
 (_l = ["abc", "def", "ghi"], _l.raw = ["abc", "def", "ghi"], (_m = ["abc", "def", "ghi"], _m.raw = ["abc", "def", "ghi"], f(_m, true, true))["member"].member(_l, 1, 2));
 f.thisIsNotATag("abc");
 f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi");
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+var _a, _b, _c, _d, _e, _f, _h, _g, _k, _j, _m, _l;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js b/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js
index fd83d9d0ba0..cd3d8ba6701 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithTagsTypedAsAny.js
@@ -39,4 +39,4 @@ var f;
 (_l = ["abc", "def", "ghi"], _l.raw = ["abc", "def", "ghi"], (_m = ["abc", "def", "ghi"], _m.raw = ["abc", "def", "ghi"], f(_m, 1, 2))["member"].someOtherTag(_l, 1, 2));
 f.thisIsNotATag("abc");
 f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi");
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+var _a, _b, _c, _d, _e, _f, _g, _h, _k, _j, _m, _l;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js
index d011c3048a7..5f3409a1e58 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.js
@@ -43,4 +43,4 @@ var f;
 (_j = ["abc", "def", "ghi"], _j.raw = ["abc", "def", "ghi"], (_k = ["abc", "def", "ghi"], _k.raw = ["abc", "def", "ghi"], f(_k, 1, 2))["member"].member(_j, 1, 2));
 f.thisIsNotATag("abc");
 f.thisIsNotATag("abc" + 1 + "def" + 2 + "ghi");
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+var _a, _b, _c, _d, _e, _f, _h, _g, _k, _j;
diff --git a/tests/baselines/reference/templateStringBinaryOperations.js b/tests/baselines/reference/templateStringBinaryOperations.js
index 691dad41f77..74093775b98 100644
--- a/tests/baselines/reference/templateStringBinaryOperations.js
+++ b/tests/baselines/reference/templateStringBinaryOperations.js
@@ -57,34 +57,34 @@ var a = 1 + ("" + 3);
 var b = 1 + ("2" + 3);
 var c = 1 + (3 + "4");
 var d = 1 + ("2" + 3 + "4");
-var e = ("" + 3) + 5;
-var f = ("2" + 3) + 5;
-var g = (3 + "4") + 5;
-var h = ("2" + 3 + "4") + 5;
+var e = "" + 3 + 5;
+var f = "2" + 3 + 5;
+var g = 3 + "4" + 5;
+var h = "2" + 3 + "4" + 5;
 var i = 1 + ("" + 3) + 5;
 var j = 1 + ("2" + 3) + 5;
 var k = 1 + (3 + "4") + 5;
 var l = 1 + ("2" + 3 + "4") + 5;
 var a2 = 1 + ("" + (3 - 4));
 var b2 = 1 + ("2" + (3 - 4));
-var c2 = 1 + ((3 - 4) + "5");
+var c2 = 1 + (3 - 4 + "5");
 var d2 = 1 + ("2" + (3 - 4) + "5");
-var e2 = ("" + (3 - 4)) + 6;
-var f2 = ("2" + (3 - 4)) + 6;
-var g2 = ((3 - 4) + "5") + 6;
-var h2 = ("2" + (3 - 4) + "5") + 6;
+var e2 = "" + (3 - 4) + 6;
+var f2 = "2" + (3 - 4) + 6;
+var g2 = 3 - 4 + "5" + 6;
+var h2 = "2" + (3 - 4) + "5" + 6;
 var i2 = 1 + ("" + (3 - 4)) + 6;
 var j2 = 1 + ("2" + (3 - 4)) + 6;
-var k2 = 1 + ((3 - 4) + "5") + 6;
+var k2 = 1 + (3 - 4 + "5") + 6;
 var l2 = 1 + ("2" + (3 - 4) + "5") + 6;
 var a3 = 1 + ("" + 3 * 4);
 var b3 = 1 + ("2" + 3 * 4);
 var c3 = 1 + (3 * 4 + "5");
 var d3 = 1 + ("2" + 3 * 4 + "5");
-var e3 = ("" + 3 * 4) + 6;
-var f3 = ("2" + 3 * 4) + 6;
-var g3 = (3 * 4 + "5") + 6;
-var h3 = ("2" + 3 * 4 + "5") + 6;
+var e3 = "" + 3 * 4 + 6;
+var f3 = "2" + 3 * 4 + 6;
+var g3 = 3 * 4 + "5" + 6;
+var h3 = "2" + 3 * 4 + "5" + 6;
 var i3 = 1 + ("" + 3 * 4) + 6;
 var j3 = 1 + ("2" + 3 * 4) + 6;
 var k3 = 1 + (3 * 4 + "5") + 6;
@@ -93,10 +93,10 @@ var a4 = 1 + ("" + (3 & 4));
 var b4 = 1 + ("2" + (3 & 4));
 var c4 = 1 + ((3 & 4) + "5");
 var d4 = 1 + ("2" + (3 & 4) + "5");
-var e4 = ("" + (3 & 4)) + 6;
-var f4 = ("2" + (3 & 4)) + 6;
-var g4 = ((3 & 4) + "5") + 6;
-var h4 = ("2" + (3 & 4) + "5") + 6;
+var e4 = "" + (3 & 4) + 6;
+var f4 = "2" + (3 & 4) + 6;
+var g4 = (3 & 4) + "5" + 6;
+var h4 = "2" + (3 & 4) + "5" + 6;
 var i4 = 1 + ("" + (3 & 4)) + 6;
 var j4 = 1 + ("2" + (3 & 4)) + 6;
 var k4 = 1 + ((3 & 4) + "5") + 6;
diff --git a/tests/baselines/reference/templateStringBinaryOperationsInvalid.js b/tests/baselines/reference/templateStringBinaryOperationsInvalid.js
index f8c0344f44b..e6c288f1b54 100644
--- a/tests/baselines/reference/templateStringBinaryOperationsInvalid.js
+++ b/tests/baselines/reference/templateStringBinaryOperationsInvalid.js
@@ -113,10 +113,10 @@ var a = 1 - ("" + 3);
 var b = 1 - ("2" + 3);
 var c = 1 - (3 + "4");
 var d = 1 - ("2" + 3 + "4");
-var e = ("" + 3) - 5;
-var f = ("2" + 3) - 5;
-var g = (3 + "4") - 5;
-var h = ("2" + 3 + "4") - 5;
+var e = "" + 3 - 5;
+var f = "2" + 3 - 5;
+var g = 3 + "4" - 5;
+var h = "2" + 3 + "4" - 5;
 var a2 = 1 * ("" + 3);
 var b2 = 1 * ("2" + 3);
 var c2 = 1 * (3 + "4");
@@ -135,35 +135,35 @@ var g3 = 3 + "4" & 5;
 var h3 = "2" + 3 + "4" & 5;
 var a4 = 1 - ("" + (3 - 4));
 var b4 = 1 - ("2" + (3 - 4));
-var c4 = 1 - ((3 - 4) + "5");
+var c4 = 1 - (3 - 4 + "5");
 var d4 = 1 - ("2" + (3 - 4) + "5");
-var e4 = ("" + (3 - 4)) - 6;
-var f4 = ("2" + (3 - 4)) - 6;
-var g4 = ((3 - 4) + "5") - 6;
-var h4 = ("2" + (3 - 4) + "5") - 6;
+var e4 = "" + (3 - 4) - 6;
+var f4 = "2" + (3 - 4) - 6;
+var g4 = 3 - 4 + "5" - 6;
+var h4 = "2" + (3 - 4) + "5" - 6;
 var a5 = 1 - ("" + 3 * 4);
 var b5 = 1 - ("2" + 3 * 4);
 var c5 = 1 - (3 * 4 + "5");
 var d5 = 1 - ("2" + 3 * 4 + "5");
-var e5 = ("" + 3 * 4) - 6;
-var f5 = ("2" + 3 * 4) - 6;
-var g5 = (3 * 4 + "5") - 6;
-var h5 = ("2" + 3 * 4 + "5") - 6;
+var e5 = "" + 3 * 4 - 6;
+var f5 = "2" + 3 * 4 - 6;
+var g5 = 3 * 4 + "5" - 6;
+var h5 = "2" + 3 * 4 + "5" - 6;
 var a6 = 1 - ("" + (3 & 4));
 var b6 = 1 - ("2" + (3 & 4));
 var c6 = 1 - ((3 & 4) + "5");
 var d6 = 1 - ("2" + (3 & 4) + "5");
-var e6 = ("" + (3 & 4)) - 6;
-var f6 = ("2" + (3 & 4)) - 6;
-var g6 = ((3 & 4) + "5") - 6;
-var h6 = ("2" + (3 & 4) + "5") - 6;
+var e6 = "" + (3 & 4) - 6;
+var f6 = "2" + (3 & 4) - 6;
+var g6 = (3 & 4) + "5" - 6;
+var h6 = "2" + (3 & 4) + "5" - 6;
 var a7 = 1 * ("" + (3 - 4));
 var b7 = 1 * ("2" + (3 - 4));
-var c7 = 1 * ((3 - 4) + "5");
+var c7 = 1 * (3 - 4 + "5");
 var d7 = 1 * ("2" + (3 - 4) + "5");
 var e7 = ("" + (3 - 4)) * 6;
 var f7 = ("2" + (3 - 4)) * 6;
-var g7 = ((3 - 4) + "5") * 6;
+var g7 = (3 - 4 + "5") * 6;
 var h7 = ("2" + (3 - 4) + "5") * 6;
 var a8 = 1 * ("" + 3 * 4);
 var b8 = 1 * ("2" + 3 * 4);
@@ -183,11 +183,11 @@ var g9 = ((3 & 4) + "5") * 6;
 var h9 = ("2" + (3 & 4) + "5") * 6;
 var aa = 1 & "" + (3 - 4);
 var ba = 1 & "2" + (3 - 4);
-var ca = 1 & (3 - 4) + "5";
+var ca = 1 & 3 - 4 + "5";
 var da = 1 & "2" + (3 - 4) + "5";
 var ea = "" + (3 - 4) & 6;
 var fa = "2" + (3 - 4) & 6;
-var ga = (3 - 4) + "5" & 6;
+var ga = 3 - 4 + "5" & 6;
 var ha = "2" + (3 - 4) + "5" & 6;
 var ab = 1 & "" + 3 * 4;
 var bb = 1 & "2" + 3 * 4;
diff --git a/tests/baselines/reference/templateStringInArray.js b/tests/baselines/reference/templateStringInArray.js
index 97d0b1a636b..7b387ae8e74 100644
--- a/tests/baselines/reference/templateStringInArray.js
+++ b/tests/baselines/reference/templateStringInArray.js
@@ -2,4 +2,4 @@
 var x = [1, 2, `abc${ 123 }def`];
 
 //// [templateStringInArray.js]
-var x = [1, 2, ("abc" + 123 + "def")];
+var x = [1, 2, "abc" + 123 + "def"];
diff --git a/tests/baselines/reference/templateStringInArrowFunction.js b/tests/baselines/reference/templateStringInArrowFunction.js
index 4c4890633e1..3e72edf031f 100644
--- a/tests/baselines/reference/templateStringInArrowFunction.js
+++ b/tests/baselines/reference/templateStringInArrowFunction.js
@@ -2,4 +2,4 @@
 var x = x => `abc${ x }def`;
 
 //// [templateStringInArrowFunction.js]
-var x = function (x) { return ("abc" + x + "def"); };
+var x = function (x) { return "abc" + x + "def"; };
diff --git a/tests/baselines/reference/templateStringInFunctionParameterType.js b/tests/baselines/reference/templateStringInFunctionParameterType.js
index 4a4abeacd6d..a824a8ee91a 100644
--- a/tests/baselines/reference/templateStringInFunctionParameterType.js
+++ b/tests/baselines/reference/templateStringInFunctionParameterType.js
@@ -6,6 +6,7 @@ function f(x: string) {
 }
 
 //// [templateStringInFunctionParameterType.js]
+function f() { }
 "hello";
 ;
 function f(x) {
diff --git a/tests/baselines/reference/templateStringInFunctionParameterTypeES6.js b/tests/baselines/reference/templateStringInFunctionParameterTypeES6.js
index aa38f6b6be9..41742f6757d 100644
--- a/tests/baselines/reference/templateStringInFunctionParameterTypeES6.js
+++ b/tests/baselines/reference/templateStringInFunctionParameterTypeES6.js
@@ -6,6 +6,7 @@ function f(x: string) {
 }
 
 //// [templateStringInFunctionParameterTypeES6.js]
+function f() { }
 `hello`;
 ;
 function f(x) {
diff --git a/tests/baselines/reference/templateStringInObjectLiteral.js b/tests/baselines/reference/templateStringInObjectLiteral.js
index 2e4de70f57c..0381e9a95e7 100644
--- a/tests/baselines/reference/templateStringInObjectLiteral.js
+++ b/tests/baselines/reference/templateStringInObjectLiteral.js
@@ -5,7 +5,8 @@ var x = {
 }
 
 //// [templateStringInObjectLiteral.js]
-var x = (_a = ["b"], _a.raw = ["b"], ({
-    a: "abc" + 123 + "def" })(_a));
+var x = (_a = ["b"], _a.raw = ["b"], {
+    a: "abc" + 123 + "def"
+}(_a));
 321;
 var _a;
diff --git a/tests/baselines/reference/templateStringInObjectLiteralES6.js b/tests/baselines/reference/templateStringInObjectLiteralES6.js
index 7de012185a9..22144e75247 100644
--- a/tests/baselines/reference/templateStringInObjectLiteralES6.js
+++ b/tests/baselines/reference/templateStringInObjectLiteralES6.js
@@ -6,5 +6,6 @@ var x = {
 
 //// [templateStringInObjectLiteralES6.js]
 var x = {
-    a: `abc${123}def`, } `b`;
+    a: `abc${123}def`,
+} `b`;
 321;
diff --git a/tests/baselines/reference/templateStringInPropertyName1.js b/tests/baselines/reference/templateStringInPropertyName1.js
index 18e35c475e3..239ba78d827 100644
--- a/tests/baselines/reference/templateStringInPropertyName1.js
+++ b/tests/baselines/reference/templateStringInPropertyName1.js
@@ -4,6 +4,6 @@ var x = {
 }
 
 //// [templateStringInPropertyName1.js]
-var x = (_a = ["a"], _a.raw = ["a"], ({})(_a));
+var x = (_a = ["a"], _a.raw = ["a"], {}(_a));
 321;
 var _a;
diff --git a/tests/baselines/reference/templateStringInPropertyName2.js b/tests/baselines/reference/templateStringInPropertyName2.js
index 1a2995ca08f..8a71a6e30be 100644
--- a/tests/baselines/reference/templateStringInPropertyName2.js
+++ b/tests/baselines/reference/templateStringInPropertyName2.js
@@ -4,6 +4,6 @@ var x = {
 }
 
 //// [templateStringInPropertyName2.js]
-var x = (_a = ["abc", "def", "ghi"], _a.raw = ["abc", "def", "ghi"], ({})(_a, 123, 456));
+var x = (_a = ["abc", "def", "ghi"], _a.raw = ["abc", "def", "ghi"], {}(_a, 123, 456));
 321;
 var _a;
diff --git a/tests/baselines/reference/templateStringInTypeAssertion.js b/tests/baselines/reference/templateStringInTypeAssertion.js
index 94533248b6d..723e688d94b 100644
--- a/tests/baselines/reference/templateStringInTypeAssertion.js
+++ b/tests/baselines/reference/templateStringInTypeAssertion.js
@@ -2,4 +2,4 @@
 var x = <any>`abc${ 123 }def`;
 
 //// [templateStringInTypeAssertion.js]
-var x = ("abc" + 123 + "def");
+var x = "abc" + 123 + "def";
diff --git a/tests/baselines/reference/templateStringInYieldKeyword.js b/tests/baselines/reference/templateStringInYieldKeyword.js
index 02ac42c723f..e23eaa17c9c 100644
--- a/tests/baselines/reference/templateStringInYieldKeyword.js
+++ b/tests/baselines/reference/templateStringInYieldKeyword.js
@@ -6,7 +6,7 @@ function* gen() {
 
 
 //// [templateStringInYieldKeyword.js]
-function gen() {
+function* gen() {
     // Once this is supported, the inner expression does not need to be parenthesized.
     var x = yield "abc" + x + "def";
 }
diff --git a/tests/baselines/reference/templateStringWithEmbeddedComments.js b/tests/baselines/reference/templateStringWithEmbeddedComments.js
index 58a73e89ba7..730997e28fb 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedComments.js
+++ b/tests/baselines/reference/templateStringWithEmbeddedComments.js
@@ -13,4 +13,9 @@ middle${
 tail`;
 
 //// [templateStringWithEmbeddedComments.js]
-"head" + 10 + "\nmiddle" + 20 + "\ntail";
+"head" + 10 + "\nmiddle" + 
+/* Multi-
+ * line
+ * comment
+ */
+20 + "\ntail";
diff --git a/tests/baselines/reference/templateStringWithEmbeddedCommentsES6.js b/tests/baselines/reference/templateStringWithEmbeddedCommentsES6.js
index c6b3649ad2a..f5450e45b32 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedCommentsES6.js
+++ b/tests/baselines/reference/templateStringWithEmbeddedCommentsES6.js
@@ -13,4 +13,14 @@ middle${
 tail`;
 
 //// [templateStringWithEmbeddedCommentsES6.js]
-"head" + 10 + "\nmiddle" + 20 + "\ntail";
+`head${ // single line comment
+10}
+middle${
+/* Multi-
+ * line
+ * comment
+ */
+20
+// closing comment
+}
+tail`;
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.js b/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.js
index e050441173e..8230f0ec8f1 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.js
+++ b/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.js
@@ -6,7 +6,7 @@ function* gen {
 
 
 //// [templateStringWithEmbeddedYieldKeyword.js]
-function gen() {
+function* gen() {
     // Once this is supported, yield *must* be parenthesized.
     var x = "abc" + (yield 10) + "def";
 }
diff --git a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
index 4b23326c7a3..03b86b1d225 100644
--- a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
+++ b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
@@ -9,14 +9,14 @@ class Vector {
 }
 
 //// [thisInArrowFunctionInStaticInitializer1.js]
+var _this = this;
 function log(a) { }
 var Vector = (function () {
     function Vector() {
-        var _this = this;
     }
-    Vector.foo = function () {
-        // 'this' should not be available in a static initializer.
-        log(_this);
-    };
     return Vector;
 }());
+Vector.foo = function () {
+    // 'this' should not be available in a static initializer.
+    log(_this);
+};
diff --git a/tests/baselines/reference/thisInConstructorParameter2.js b/tests/baselines/reference/thisInConstructorParameter2.js
index 7260ecafcb9..ba2917c5a4e 100644
--- a/tests/baselines/reference/thisInConstructorParameter2.js
+++ b/tests/baselines/reference/thisInConstructorParameter2.js
@@ -25,6 +25,6 @@ var P = (function () {
         if (zz === void 0) { zz = this; }
         zz.y;
     };
-    P.y = this;
     return P;
 }());
+P.y = this;
diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js
index 75ccd12c288..76eeef0139c 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -58,9 +58,9 @@ var __extends = (this && this.__extends) || function (d, b) {
 var ErrClass1 = (function () {
     function ErrClass1() {
     }
-    ErrClass1.t = this; // Error
     return ErrClass1;
 }());
+ErrClass1.t = this; // Error
 var BaseErrClass = (function () {
     function BaseErrClass(t) {
     }
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
index 2e7e6d8b47c..634b5ef0a20 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -59,9 +59,9 @@ var __extends = (this && this.__extends) || function (d, b) {
 var ErrClass1 = (function () {
     function ErrClass1() {
     }
-    ErrClass1.t = this; // Error
     return ErrClass1;
 }());
+ErrClass1.t = this; // Error
 var BaseErrClass = (function () {
     function BaseErrClass(t) {
     }
diff --git a/tests/baselines/reference/thisInOuterClassBody.js b/tests/baselines/reference/thisInOuterClassBody.js
index 40e4a2e2485..40b0e2b78ae 100644
--- a/tests/baselines/reference/thisInOuterClassBody.js
+++ b/tests/baselines/reference/thisInOuterClassBody.js
@@ -36,6 +36,6 @@ var Foo = (function () {
         var a = this.y;
         var b = this.x;
     };
-    Foo.y = this;
     return Foo;
 }());
+Foo.y = this;
diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.js b/tests/baselines/reference/thisInPropertyBoundDeclarations.js
index 0b378cec51a..f5967fbb5b2 100644
--- a/tests/baselines/reference/thisInPropertyBoundDeclarations.js
+++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.js
@@ -74,13 +74,13 @@ var Bug = (function () {
     Bug.prototype.foo = function (name) {
         this.name = name;
     };
-    Bug.func = [
-        function (that, name) {
-            that.foo(name);
-        }
-    ];
     return Bug;
 }());
+Bug.func = [
+    function (that, name) {
+        that.foo(name);
+    }
+];
 // Valid use of this in a property bound decl
 var A = (function () {
     function A() {
diff --git a/tests/baselines/reference/thisInStaticMethod1.js b/tests/baselines/reference/thisInStaticMethod1.js
index a42415c0b62..1e39ded3b61 100644
--- a/tests/baselines/reference/thisInStaticMethod1.js
+++ b/tests/baselines/reference/thisInStaticMethod1.js
@@ -14,7 +14,7 @@ var foo = (function () {
     foo.bar = function () {
         return this.x;
     };
-    foo.x = 3;
     return foo;
 }());
+foo.x = 3;
 var x = foo.bar();
diff --git a/tests/baselines/reference/thisTypeErrors.js b/tests/baselines/reference/thisTypeErrors.js
index f246b80f4f4..5811ec6b709 100644
--- a/tests/baselines/reference/thisTypeErrors.js
+++ b/tests/baselines/reference/thisTypeErrors.js
@@ -75,9 +75,9 @@ var C2 = (function () {
     C2.foo = function (x) {
         return undefined;
     };
-    C2.y = undefined;
     return C2;
 }());
+C2.y = undefined;
 var N1;
 (function (N1) {
     N1.y = this;
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.js b/tests/baselines/reference/thisTypeInFunctionsNegative.js
index 602c6afefd7..4b40ca2e1e7 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.js
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.js
@@ -333,18 +333,19 @@ var ThisConstructor = (function () {
     return ThisConstructor;
 }());
 var thisConstructorType;
-function notFirst(a, this) { return this.n; }
+function notFirst(a) { return this.n; }
 ///// parse errors /////
 function modifiers(, C) {
     if ( === void 0) {  = this; }
     return this.n;
 }
-function restParam(, C) { return this.n; }
+function restParam(C) { return this.n; }
 function optional(C) { return this.n; }
 function decorated(, C) {
     if ( === void 0) {  = this; }
     return this.n;
 }
+function initializer() { }
 new C();
 number;
 {
diff --git a/tests/baselines/reference/throwWithoutNewLine2.js b/tests/baselines/reference/throwWithoutNewLine2.js
index 868e4e3d844..db2227671d3 100644
--- a/tests/baselines/reference/throwWithoutNewLine2.js
+++ b/tests/baselines/reference/throwWithoutNewLine2.js
@@ -3,5 +3,5 @@ throw
 a;
 
 //// [throwWithoutNewLine2.js]
-throw ;
+throw;
 a;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index e5495f226d2..f1e36ae9b15 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -13,11 +13,11 @@ var MyClass1 = (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
     }
-    MyClass1 = __decorate([
-        fooexport, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-    ], MyClass1);
     return MyClass1;
-    var _a;
 }());
+MyClass1 = __decorate([
+    fooexport,
+    __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+], MyClass1);
+var _a;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js
index 491481e6a40..9e3d59ce27c 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js	
@@ -1,6 +1,5 @@
-System.register(["angular2/core"], function(exports_1, context_1) {
+System.register(["angular2/core"], function (exports_1, context_1) {
     "use strict";
-    var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
         if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -10,26 +9,26 @@ System.register(["angular2/core"], function(exports_1, context_1) {
     var __metadata = (this && this.__metadata) || function (k, v) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
     };
-    var ng;
-    var MyClass1;
+    var __moduleName = context_1 && context_1.id;
+    var ng, MyClass1, _a;
     return {
-        setters:[
+        setters: [
             function (ng_1) {
                 ng = ng_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             MyClass1 = (function () {
                 function MyClass1(_elementRef) {
                     this._elementRef = _elementRef;
                 }
-                MyClass1 = __decorate([
-                    fooexport, 
-                    __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
-                ], MyClass1);
                 return MyClass1;
-                var _a;
             }());
+            MyClass1 = __decorate([
+                fooexport,
+                __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
+            ], MyClass1);
         }
-    }
+    };
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - System.js b/tests/baselines/reference/transpile/Rename dependencies - System.js
index 8f3fcaa8559..4aad7dd82ec 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - System.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - System.js	
@@ -1,15 +1,16 @@
-System.register(["SomeOtherName"], function(exports_1, context_1) {
+System.register(["SomeOtherName"], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var SomeName_1;
     return {
-        setters:[
+        setters: [
             function (SomeName_1_1) {
                 SomeName_1 = SomeName_1_1;
-            }],
-        execute: function() {
+            }
+        ],
+        execute: function () {
             use(SomeName_1.foo);
         }
-    }
+    };
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
index 94a7249678f..88bdc515936 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -1,11 +1,11 @@
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports", "SomeOtherName"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports", "SomeOtherName"], function (require, exports) {
     "use strict";
     var SomeName_1 = require("SomeOtherName");
     use(SomeName_1.foo);
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt
new file mode 100644
index 00000000000..d7d6eb69300
--- /dev/null
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt	
@@ -0,0 +1,6 @@
+error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
+
+
+!!! error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
+==== file.ts (0 errors) ====
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt
new file mode 100644
index 00000000000..d7d6eb69300
--- /dev/null
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt	
@@ -0,0 +1,6 @@
+error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
+
+
+!!! error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
+==== file.ts (0 errors) ====
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js
index 1ceb1bcd146..c7570e81192 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js	
@@ -1,2 +1 @@
-"use strict";
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js
index 1ceb1bcd146..c7570e81192 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js	
@@ -1,2 +1 @@
-"use strict";
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Sets module name.js b/tests/baselines/reference/transpile/Sets module name.js
index 683266f8383..dfe9605fc9e 100644
--- a/tests/baselines/reference/transpile/Sets module name.js	
+++ b/tests/baselines/reference/transpile/Sets module name.js	
@@ -1,12 +1,12 @@
-System.register("NamedModule", [], function(exports_1, context_1) {
+System.register("NamedModule", [], function (exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
-            var x = 1;
+        setters: [],
+        execute: function () {
+            x = 1;
         }
-    }
+    };
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index 407ee216d58..b6b17292c12 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -1,5 +1,5 @@
 "use strict";
-var db_1 = require('./db');
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
@@ -8,12 +8,12 @@ var MyClass = (function () {
         this.db = db;
         this.db.doSomething();
     }
-    MyClass = __decorate([
-        someDecorator, 
-        __metadata('design:paramtypes', [(typeof (_a = typeof db_1.db !== 'undefined' && db_1.db) === 'function' && _a) || Object])
-    ], MyClass);
     return MyClass;
-    var _a;
 }());
+MyClass = __decorate([
+    someDecorator,
+    __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" && _a || Object])
+], MyClass);
 exports.MyClass = MyClass;
+var _a;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index 79f5d2b8fa1..e7e0a13860d 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -23,11 +23,11 @@ var SomeEnum;
 var SomeClass = (function () {
     function SomeClass() {
     }
-    SomeClass.E = SomeEnum;
     return SomeClass;
 }());
 exports.__esModule = true;
 exports["default"] = SomeClass;
+SomeClass.E = SomeEnum;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index 03c9627c2c1..a8d154998e1 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index f8dffbfad7e..dbe171f9682 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index 36d551b0ce7..e6f63b6a9bf 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index 78abc446e3f..589cc7cd226 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js
index 270c9254cbb..1f813b7e24b 100644
--- a/tests/baselines/reference/tsxElementResolution17.js
+++ b/tests/baselines/reference/tsxElementResolution17.js
@@ -29,7 +29,7 @@ import s2 = require('elements2');
 
 //// [file.jsx]
 //// [consumer.jsx]
-define(["require", "exports", 'elements1'], function (require, exports, s1) {
+define(["require", "exports", "elements1"], function (require, exports, s1) {
     "use strict";
     <s1.MyElement />;
 });
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index 8114c5e4be5..f8c3f4b25be 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) {
     exports.MyClass = MyClass;
 });
 //// [file2.js]
-define(["require", "exports", 'react', './file1'], function (require, exports, React, file1_1) {
+define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) {
     "use strict";
     React.createElement(file1_1.MyClass, null);
 });
diff --git a/tests/baselines/reference/tsxEmit3.js b/tests/baselines/reference/tsxEmit3.js
index 9501df4e237..33e1975cdbc 100644
--- a/tests/baselines/reference/tsxEmit3.js
+++ b/tests/baselines/reference/tsxEmit3.js
@@ -58,6 +58,8 @@ var M;
             return Bar;
         }());
         S.Bar = Bar;
+        // Emit Foo
+        // Foo, <Foo />;
     })(S = M.S || (M.S = {}));
 })(M || (M = {}));
 var M;
diff --git a/tests/baselines/reference/tsxEmit3.js.map b/tests/baselines/reference/tsxEmit3.js.map
index 1a19c6b6bf3..051be56f256 100644
--- a/tests/baselines/reference/tsxEmit3.js.map
+++ b/tests/baselines/reference/tsxEmit3.js.map
@@ -1,2 +1,2 @@
 //// [file.jsx.map]
-{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":[],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACT;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,CAKd;IALD,WAAc,CAAC,EAAC,CAAC;QAChB;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;IAIrB,CAAC,EALa,CAAC,GAAD,GAAC,KAAD,GAAC,QAKd;AACF,CAAC,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACT,aAAa;IACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC,EAAC,CAAC;QAChB,aAAa;QACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;QAEb,aAAa;QACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;IACd,CAAC,EANa,CAAC,GAAD,GAAC,KAAD,GAAC,QAMd;AAEF,CAAC,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACT,eAAe;IACf,GAAC,CAAC,GAAG,EAAE,CAAC,GAAC,CAAC,GAAG,GAAG,CAAC;AAClB,CAAC,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACT,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,OAAG,EAAE,CAAC,OAAG,GAAG,CAAC;AACd,CAAC,EAJM,CAAC,KAAD,CAAC,QAIP"}
\ No newline at end of file
+{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":[],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC;IACP;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,CAKd;IALD,WAAc,CAAC;QACd;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;QAEpB,WAAW;QACX,gBAAgB;IACjB,CAAC,EALa,CAAC,GAAD,GAAC,KAAD,GAAC,QAKd;AACF,CAAC,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC;IACP,aAAa;IACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC;QACd,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;QAEb,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;IACd,CAAC,EANa,CAAC,GAAD,GAAC,KAAD,GAAC,QAMd;AAEF,CAAC,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC;IACP,eAAe;IACf,EAAA,CAAC,CAAC,GAAG,EAAE,CAAC,EAAA,CAAC,CAAC,GAAG,GAAG,CAAC;AAClB,CAAC,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC;IACP,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,IAAA,GAAG,EAAE,CAAC,IAAA,GAAG,GAAG,CAAC;AACd,CAAC,EAJM,CAAC,KAAD,CAAC,QAIP"}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt
index b8fdbbfc4ba..02fec081e4c 100644
--- a/tests/baselines/reference/tsxEmit3.sourcemap.txt
+++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt
@@ -41,24 +41,18 @@ sourceFile:file.tsx
 1->
 2 >^^^^^^^^^^^
 3 >           ^
-4 >            ^^
-5 >              ^
-6 >               ^^^^^^^^^^^^^^->
+4 >            ^^^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           M
-4 >             
-5 >              {
 1->Emitted(2, 1) Source(7, 1) + SourceIndex(0)
 2 >Emitted(2, 12) Source(7, 8) + SourceIndex(0)
 3 >Emitted(2, 13) Source(7, 9) + SourceIndex(0)
-4 >Emitted(2, 15) Source(7, 10) + SourceIndex(0)
-5 >Emitted(2, 16) Source(7, 11) + SourceIndex(0)
 ---
 >>>    var Foo = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >	
 1->Emitted(3, 5) Source(8, 2) + SourceIndex(0)
 ---
@@ -139,24 +133,18 @@ sourceFile:file.tsx
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^^^^^^^^^^^^->
+4 >                ^^^^^^^^^^^^^^^^^->
 1->
 2 >    export module 
 3 >               S
-4 >                 
-5 >                  {
 1->Emitted(10, 5) Source(9, 2) + SourceIndex(0)
 2 >Emitted(10, 16) Source(9, 16) + SourceIndex(0)
 3 >Emitted(10, 17) Source(9, 17) + SourceIndex(0)
-4 >Emitted(10, 19) Source(9, 18) + SourceIndex(0)
-5 >Emitted(10, 20) Source(9, 19) + SourceIndex(0)
 ---
 >>>        var Bar = (function () {
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >		
 1->Emitted(11, 9) Source(10, 3) + SourceIndex(0)
 ---
@@ -203,7 +191,6 @@ sourceFile:file.tsx
 2 >        ^^^^^
 3 >             ^^^^^^
 4 >                   ^
-5 >                    ^^^^^^^^^^^->
 1->
 2 >        Bar
 3 >              { }
@@ -213,6 +200,27 @@ sourceFile:file.tsx
 3 >Emitted(16, 20) Source(10, 23) + SourceIndex(0)
 4 >Emitted(16, 21) Source(10, 23) + SourceIndex(0)
 ---
+>>>        // Emit Foo
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^
+3 >                   ^^^^^^->
+1 >
+  >
+  >		
+2 >        // Emit Foo
+1 >Emitted(17, 9) Source(12, 3) + SourceIndex(0)
+2 >Emitted(17, 20) Source(12, 14) + SourceIndex(0)
+---
+>>>        // Foo, <Foo />;
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^
+3 >                        ^^^^^^^->
+1->
+  >		
+2 >        // Foo, <Foo />;
+1->Emitted(18, 9) Source(13, 3) + SourceIndex(0)
+2 >Emitted(18, 25) Source(13, 19) + SourceIndex(0)
+---
 >>>    })(S = M.S || (M.S = {}));
 1->^^^^
 2 >    ^
@@ -224,9 +232,6 @@ sourceFile:file.tsx
 8 >                   ^^^
 9 >                      ^^^^^^^^
 1->
-  >
-  >		// Emit Foo
-  >		// Foo, <Foo />;
   >	
 2 >    }
 3 >     
@@ -241,15 +246,15 @@ sourceFile:file.tsx
   >                      		// Emit Foo
   >                      		// Foo, <Foo />;
   >                      	}
-1->Emitted(17, 5) Source(14, 2) + SourceIndex(0)
-2 >Emitted(17, 6) Source(14, 3) + SourceIndex(0)
-3 >Emitted(17, 8) Source(9, 16) + SourceIndex(0)
-4 >Emitted(17, 9) Source(9, 17) + SourceIndex(0)
-5 >Emitted(17, 12) Source(9, 16) + SourceIndex(0)
-6 >Emitted(17, 15) Source(9, 17) + SourceIndex(0)
-7 >Emitted(17, 20) Source(9, 16) + SourceIndex(0)
-8 >Emitted(17, 23) Source(9, 17) + SourceIndex(0)
-9 >Emitted(17, 31) Source(14, 3) + SourceIndex(0)
+1->Emitted(19, 5) Source(14, 2) + SourceIndex(0)
+2 >Emitted(19, 6) Source(14, 3) + SourceIndex(0)
+3 >Emitted(19, 8) Source(9, 16) + SourceIndex(0)
+4 >Emitted(19, 9) Source(9, 17) + SourceIndex(0)
+5 >Emitted(19, 12) Source(9, 16) + SourceIndex(0)
+6 >Emitted(19, 15) Source(9, 17) + SourceIndex(0)
+7 >Emitted(19, 20) Source(9, 16) + SourceIndex(0)
+8 >Emitted(19, 23) Source(9, 17) + SourceIndex(0)
+9 >Emitted(19, 31) Source(14, 3) + SourceIndex(0)
 ---
 >>>})(M || (M = {}));
 1 >
@@ -275,13 +280,13 @@ sourceFile:file.tsx
   >          		// Foo, <Foo />;
   >          	}
   >          }
-1 >Emitted(18, 1) Source(15, 1) + SourceIndex(0)
-2 >Emitted(18, 2) Source(15, 2) + SourceIndex(0)
-3 >Emitted(18, 4) Source(7, 8) + SourceIndex(0)
-4 >Emitted(18, 5) Source(7, 9) + SourceIndex(0)
-5 >Emitted(18, 10) Source(7, 8) + SourceIndex(0)
-6 >Emitted(18, 11) Source(7, 9) + SourceIndex(0)
-7 >Emitted(18, 19) Source(15, 2) + SourceIndex(0)
+1 >Emitted(20, 1) Source(15, 1) + SourceIndex(0)
+2 >Emitted(20, 2) Source(15, 2) + SourceIndex(0)
+3 >Emitted(20, 4) Source(7, 8) + SourceIndex(0)
+4 >Emitted(20, 5) Source(7, 9) + SourceIndex(0)
+5 >Emitted(20, 10) Source(7, 8) + SourceIndex(0)
+6 >Emitted(20, 11) Source(7, 9) + SourceIndex(0)
+7 >Emitted(20, 19) Source(15, 2) + SourceIndex(0)
 ---
 >>>var M;
 1 >
@@ -307,62 +312,62 @@ sourceFile:file.tsx
   >     	}
   >     
   >     }
-1 >Emitted(19, 1) Source(17, 1) + SourceIndex(0)
-2 >Emitted(19, 5) Source(17, 8) + SourceIndex(0)
-3 >Emitted(19, 6) Source(17, 9) + SourceIndex(0)
-4 >Emitted(19, 7) Source(29, 2) + SourceIndex(0)
+1 >Emitted(21, 1) Source(17, 1) + SourceIndex(0)
+2 >Emitted(21, 5) Source(17, 8) + SourceIndex(0)
+3 >Emitted(21, 6) Source(17, 9) + SourceIndex(0)
+4 >Emitted(21, 7) Source(29, 2) + SourceIndex(0)
 ---
 >>>(function (M) {
 1->
 2 >^^^^^^^^^^^
 3 >           ^
-4 >            ^^
-5 >              ^
-6 >               ^^^->
+4 >            ^^^^^^->
 1->
 2 >module 
 3 >           M
-4 >             
-5 >              {
-1->Emitted(20, 1) Source(17, 1) + SourceIndex(0)
-2 >Emitted(20, 12) Source(17, 8) + SourceIndex(0)
-3 >Emitted(20, 13) Source(17, 9) + SourceIndex(0)
-4 >Emitted(20, 15) Source(17, 10) + SourceIndex(0)
-5 >Emitted(20, 16) Source(17, 11) + SourceIndex(0)
+1->Emitted(22, 1) Source(17, 1) + SourceIndex(0)
+2 >Emitted(22, 12) Source(17, 8) + SourceIndex(0)
+3 >Emitted(22, 13) Source(17, 9) + SourceIndex(0)
 ---
 >>>    // Emit M.Foo
 1->^^^^
 2 >    ^^^^^^^^^^^^^
 3 >                 ^^^^^->
-1->
+1-> {
   >	
 2 >    // Emit M.Foo
-1->Emitted(21, 5) Source(18, 2) + SourceIndex(0)
-2 >Emitted(21, 18) Source(18, 15) + SourceIndex(0)
+1->Emitted(23, 5) Source(18, 2) + SourceIndex(0)
+2 >Emitted(23, 18) Source(18, 15) + SourceIndex(0)
 ---
 >>>    M.Foo, <M.Foo />;
 1->^^^^
-2 >    ^^^^^
-3 >         ^^
-4 >           ^
-5 >            ^^^^^
-6 >                 ^^^
-7 >                    ^
+2 >    ^^
+3 >      ^^^
+4 >         ^^
+5 >           ^
+6 >            ^^
+7 >              ^^^
+8 >                 ^^^
+9 >                    ^
 1->
   >	
-2 >    Foo
-3 >         , 
-4 >           <
-5 >            Foo
-6 >                  />
-7 >                    ;
-1->Emitted(22, 5) Source(19, 2) + SourceIndex(0)
-2 >Emitted(22, 10) Source(19, 5) + SourceIndex(0)
-3 >Emitted(22, 12) Source(19, 7) + SourceIndex(0)
-4 >Emitted(22, 13) Source(19, 8) + SourceIndex(0)
-5 >Emitted(22, 18) Source(19, 11) + SourceIndex(0)
-6 >Emitted(22, 21) Source(19, 14) + SourceIndex(0)
-7 >Emitted(22, 22) Source(19, 15) + SourceIndex(0)
+2 >    
+3 >      Foo
+4 >         , 
+5 >           <
+6 >            
+7 >              Foo
+8 >                  />
+9 >                    ;
+1->Emitted(24, 5) Source(19, 2) + SourceIndex(0)
+2 >Emitted(24, 7) Source(19, 2) + SourceIndex(0)
+3 >Emitted(24, 10) Source(19, 5) + SourceIndex(0)
+4 >Emitted(24, 12) Source(19, 7) + SourceIndex(0)
+5 >Emitted(24, 13) Source(19, 8) + SourceIndex(0)
+6 >Emitted(24, 15) Source(19, 8) + SourceIndex(0)
+7 >Emitted(24, 18) Source(19, 11) + SourceIndex(0)
+8 >Emitted(24, 21) Source(19, 14) + SourceIndex(0)
+9 >Emitted(24, 22) Source(19, 15) + SourceIndex(0)
 ---
 >>>    var S;
 1 >^^^^
@@ -382,62 +387,62 @@ sourceFile:file.tsx
   >         		// Emit S.Bar
   >         		Bar, <Bar />;
   >         	}
-1 >Emitted(23, 5) Source(21, 2) + SourceIndex(0)
-2 >Emitted(23, 9) Source(21, 16) + SourceIndex(0)
-3 >Emitted(23, 10) Source(21, 17) + SourceIndex(0)
-4 >Emitted(23, 11) Source(27, 3) + SourceIndex(0)
+1 >Emitted(25, 5) Source(21, 2) + SourceIndex(0)
+2 >Emitted(25, 9) Source(21, 16) + SourceIndex(0)
+3 >Emitted(25, 10) Source(21, 17) + SourceIndex(0)
+4 >Emitted(25, 11) Source(27, 3) + SourceIndex(0)
 ---
 >>>    (function (S) {
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^
-4 >                ^^
-5 >                  ^
-6 >                   ^^^->
+4 >                ^^^^^^->
 1->
 2 >    export module 
 3 >               S
-4 >                 
-5 >                  {
-1->Emitted(24, 5) Source(21, 2) + SourceIndex(0)
-2 >Emitted(24, 16) Source(21, 16) + SourceIndex(0)
-3 >Emitted(24, 17) Source(21, 17) + SourceIndex(0)
-4 >Emitted(24, 19) Source(21, 18) + SourceIndex(0)
-5 >Emitted(24, 20) Source(21, 19) + SourceIndex(0)
+1->Emitted(26, 5) Source(21, 2) + SourceIndex(0)
+2 >Emitted(26, 16) Source(21, 16) + SourceIndex(0)
+3 >Emitted(26, 17) Source(21, 17) + SourceIndex(0)
 ---
 >>>        // Emit M.Foo
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^
 3 >                     ^^^^^->
-1->
+1-> {
   >		
 2 >        // Emit M.Foo
-1->Emitted(25, 9) Source(22, 3) + SourceIndex(0)
-2 >Emitted(25, 22) Source(22, 16) + SourceIndex(0)
+1->Emitted(27, 9) Source(22, 3) + SourceIndex(0)
+2 >Emitted(27, 22) Source(22, 16) + SourceIndex(0)
 ---
 >>>        M.Foo, <M.Foo />;
 1->^^^^^^^^
-2 >        ^^^^^
-3 >             ^^
-4 >               ^
-5 >                ^^^^^
-6 >                     ^^^
-7 >                        ^
+2 >        ^^
+3 >          ^^^
+4 >             ^^
+5 >               ^
+6 >                ^^
+7 >                  ^^^
+8 >                     ^^^
+9 >                        ^
 1->
   >		
-2 >        Foo
-3 >             , 
-4 >               <
-5 >                Foo
-6 >                      />
-7 >                        ;
-1->Emitted(26, 9) Source(23, 3) + SourceIndex(0)
-2 >Emitted(26, 14) Source(23, 6) + SourceIndex(0)
-3 >Emitted(26, 16) Source(23, 8) + SourceIndex(0)
-4 >Emitted(26, 17) Source(23, 9) + SourceIndex(0)
-5 >Emitted(26, 22) Source(23, 12) + SourceIndex(0)
-6 >Emitted(26, 25) Source(23, 15) + SourceIndex(0)
-7 >Emitted(26, 26) Source(23, 16) + SourceIndex(0)
+2 >        
+3 >          Foo
+4 >             , 
+5 >               <
+6 >                
+7 >                  Foo
+8 >                      />
+9 >                        ;
+1->Emitted(28, 9) Source(23, 3) + SourceIndex(0)
+2 >Emitted(28, 11) Source(23, 3) + SourceIndex(0)
+3 >Emitted(28, 14) Source(23, 6) + SourceIndex(0)
+4 >Emitted(28, 16) Source(23, 8) + SourceIndex(0)
+5 >Emitted(28, 17) Source(23, 9) + SourceIndex(0)
+6 >Emitted(28, 19) Source(23, 9) + SourceIndex(0)
+7 >Emitted(28, 22) Source(23, 12) + SourceIndex(0)
+8 >Emitted(28, 25) Source(23, 15) + SourceIndex(0)
+9 >Emitted(28, 26) Source(23, 16) + SourceIndex(0)
 ---
 >>>        // Emit S.Bar
 1 >^^^^^^^^
@@ -447,33 +452,39 @@ sourceFile:file.tsx
   >
   >		
 2 >        // Emit S.Bar
-1 >Emitted(27, 9) Source(25, 3) + SourceIndex(0)
-2 >Emitted(27, 22) Source(25, 16) + SourceIndex(0)
+1 >Emitted(29, 9) Source(25, 3) + SourceIndex(0)
+2 >Emitted(29, 22) Source(25, 16) + SourceIndex(0)
 ---
 >>>        S.Bar, <S.Bar />;
 1->^^^^^^^^
-2 >        ^^^^^
-3 >             ^^
-4 >               ^
-5 >                ^^^^^
-6 >                     ^^^
-7 >                        ^
-8 >                         ^^^^^^->
+2 >        ^^
+3 >          ^^^
+4 >             ^^
+5 >               ^
+6 >                ^^
+7 >                  ^^^
+8 >                     ^^^
+9 >                        ^
+10>                         ^^^^^^->
 1->
   >		
-2 >        Bar
-3 >             , 
-4 >               <
-5 >                Bar
-6 >                      />
-7 >                        ;
-1->Emitted(28, 9) Source(26, 3) + SourceIndex(0)
-2 >Emitted(28, 14) Source(26, 6) + SourceIndex(0)
-3 >Emitted(28, 16) Source(26, 8) + SourceIndex(0)
-4 >Emitted(28, 17) Source(26, 9) + SourceIndex(0)
-5 >Emitted(28, 22) Source(26, 12) + SourceIndex(0)
-6 >Emitted(28, 25) Source(26, 15) + SourceIndex(0)
-7 >Emitted(28, 26) Source(26, 16) + SourceIndex(0)
+2 >        
+3 >          Bar
+4 >             , 
+5 >               <
+6 >                
+7 >                  Bar
+8 >                      />
+9 >                        ;
+1->Emitted(30, 9) Source(26, 3) + SourceIndex(0)
+2 >Emitted(30, 11) Source(26, 3) + SourceIndex(0)
+3 >Emitted(30, 14) Source(26, 6) + SourceIndex(0)
+4 >Emitted(30, 16) Source(26, 8) + SourceIndex(0)
+5 >Emitted(30, 17) Source(26, 9) + SourceIndex(0)
+6 >Emitted(30, 19) Source(26, 9) + SourceIndex(0)
+7 >Emitted(30, 22) Source(26, 12) + SourceIndex(0)
+8 >Emitted(30, 25) Source(26, 15) + SourceIndex(0)
+9 >Emitted(30, 26) Source(26, 16) + SourceIndex(0)
 ---
 >>>    })(S = M.S || (M.S = {}));
 1->^^^^
@@ -501,15 +512,15 @@ sourceFile:file.tsx
   >                      		// Emit S.Bar
   >                      		Bar, <Bar />;
   >                      	}
-1->Emitted(29, 5) Source(27, 2) + SourceIndex(0)
-2 >Emitted(29, 6) Source(27, 3) + SourceIndex(0)
-3 >Emitted(29, 8) Source(21, 16) + SourceIndex(0)
-4 >Emitted(29, 9) Source(21, 17) + SourceIndex(0)
-5 >Emitted(29, 12) Source(21, 16) + SourceIndex(0)
-6 >Emitted(29, 15) Source(21, 17) + SourceIndex(0)
-7 >Emitted(29, 20) Source(21, 16) + SourceIndex(0)
-8 >Emitted(29, 23) Source(21, 17) + SourceIndex(0)
-9 >Emitted(29, 31) Source(27, 3) + SourceIndex(0)
+1->Emitted(31, 5) Source(27, 2) + SourceIndex(0)
+2 >Emitted(31, 6) Source(27, 3) + SourceIndex(0)
+3 >Emitted(31, 8) Source(21, 16) + SourceIndex(0)
+4 >Emitted(31, 9) Source(21, 17) + SourceIndex(0)
+5 >Emitted(31, 12) Source(21, 16) + SourceIndex(0)
+6 >Emitted(31, 15) Source(21, 17) + SourceIndex(0)
+7 >Emitted(31, 20) Source(21, 16) + SourceIndex(0)
+8 >Emitted(31, 23) Source(21, 17) + SourceIndex(0)
+9 >Emitted(31, 31) Source(27, 3) + SourceIndex(0)
 ---
 >>>})(M || (M = {}));
 1 >
@@ -540,13 +551,13 @@ sourceFile:file.tsx
   >          	}
   >          
   >          }
-1 >Emitted(30, 1) Source(29, 1) + SourceIndex(0)
-2 >Emitted(30, 2) Source(29, 2) + SourceIndex(0)
-3 >Emitted(30, 4) Source(17, 8) + SourceIndex(0)
-4 >Emitted(30, 5) Source(17, 9) + SourceIndex(0)
-5 >Emitted(30, 10) Source(17, 8) + SourceIndex(0)
-6 >Emitted(30, 11) Source(17, 9) + SourceIndex(0)
-7 >Emitted(30, 19) Source(29, 2) + SourceIndex(0)
+1 >Emitted(32, 1) Source(29, 1) + SourceIndex(0)
+2 >Emitted(32, 2) Source(29, 2) + SourceIndex(0)
+3 >Emitted(32, 4) Source(17, 8) + SourceIndex(0)
+4 >Emitted(32, 5) Source(17, 9) + SourceIndex(0)
+5 >Emitted(32, 10) Source(17, 8) + SourceIndex(0)
+6 >Emitted(32, 11) Source(17, 9) + SourceIndex(0)
+7 >Emitted(32, 19) Source(29, 2) + SourceIndex(0)
 ---
 >>>var M;
 1 >
@@ -563,74 +574,74 @@ sourceFile:file.tsx
   >     	// Emit M.S.Bar
   >     	S.Bar, <S.Bar />;
   >     }
-1 >Emitted(31, 1) Source(31, 1) + SourceIndex(0)
-2 >Emitted(31, 5) Source(31, 8) + SourceIndex(0)
-3 >Emitted(31, 6) Source(31, 9) + SourceIndex(0)
-4 >Emitted(31, 7) Source(34, 2) + SourceIndex(0)
+1 >Emitted(33, 1) Source(31, 1) + SourceIndex(0)
+2 >Emitted(33, 5) Source(31, 8) + SourceIndex(0)
+3 >Emitted(33, 6) Source(31, 9) + SourceIndex(0)
+4 >Emitted(33, 7) Source(34, 2) + SourceIndex(0)
 ---
 >>>(function (M) {
 1->
 2 >^^^^^^^^^^^
 3 >           ^
-4 >            ^^
-5 >              ^
-6 >               ^^^^^->
+4 >            ^^^^^^^^->
 1->
 2 >module 
 3 >           M
-4 >             
-5 >              {
-1->Emitted(32, 1) Source(31, 1) + SourceIndex(0)
-2 >Emitted(32, 12) Source(31, 8) + SourceIndex(0)
-3 >Emitted(32, 13) Source(31, 9) + SourceIndex(0)
-4 >Emitted(32, 15) Source(31, 10) + SourceIndex(0)
-5 >Emitted(32, 16) Source(31, 11) + SourceIndex(0)
+1->Emitted(34, 1) Source(31, 1) + SourceIndex(0)
+2 >Emitted(34, 12) Source(31, 8) + SourceIndex(0)
+3 >Emitted(34, 13) Source(31, 9) + SourceIndex(0)
 ---
 >>>    // Emit M.S.Bar
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^
 3 >                   ^^^^^^^->
-1->
+1-> {
   >	
 2 >    // Emit M.S.Bar
-1->Emitted(33, 5) Source(32, 2) + SourceIndex(0)
-2 >Emitted(33, 20) Source(32, 17) + SourceIndex(0)
+1->Emitted(35, 5) Source(32, 2) + SourceIndex(0)
+2 >Emitted(35, 20) Source(32, 17) + SourceIndex(0)
 ---
 >>>    M.S.Bar, <M.S.Bar />;
 1->^^^^
-2 >    ^^^
-3 >       ^
-4 >        ^^^
-5 >           ^^
-6 >             ^
-7 >              ^^^
-8 >                 ^
-9 >                  ^^^
-10>                     ^^^
-11>                        ^
+2 >    ^^
+3 >      ^
+4 >       ^
+5 >        ^^^
+6 >           ^^
+7 >             ^
+8 >              ^^
+9 >                ^
+10>                 ^
+11>                  ^^^
+12>                     ^^^
+13>                        ^
 1->
   >	
-2 >    S
-3 >       .
-4 >        Bar
-5 >           , 
-6 >             <
-7 >              S
-8 >                 .
-9 >                  Bar
-10>                      />
-11>                        ;
-1->Emitted(34, 5) Source(33, 2) + SourceIndex(0)
-2 >Emitted(34, 8) Source(33, 3) + SourceIndex(0)
-3 >Emitted(34, 9) Source(33, 4) + SourceIndex(0)
-4 >Emitted(34, 12) Source(33, 7) + SourceIndex(0)
-5 >Emitted(34, 14) Source(33, 9) + SourceIndex(0)
-6 >Emitted(34, 15) Source(33, 10) + SourceIndex(0)
-7 >Emitted(34, 18) Source(33, 11) + SourceIndex(0)
-8 >Emitted(34, 19) Source(33, 12) + SourceIndex(0)
-9 >Emitted(34, 22) Source(33, 15) + SourceIndex(0)
-10>Emitted(34, 25) Source(33, 18) + SourceIndex(0)
-11>Emitted(34, 26) Source(33, 19) + SourceIndex(0)
+2 >    
+3 >      S
+4 >       .
+5 >        Bar
+6 >           , 
+7 >             <
+8 >              
+9 >                S
+10>                 .
+11>                  Bar
+12>                      />
+13>                        ;
+1->Emitted(36, 5) Source(33, 2) + SourceIndex(0)
+2 >Emitted(36, 7) Source(33, 2) + SourceIndex(0)
+3 >Emitted(36, 8) Source(33, 3) + SourceIndex(0)
+4 >Emitted(36, 9) Source(33, 4) + SourceIndex(0)
+5 >Emitted(36, 12) Source(33, 7) + SourceIndex(0)
+6 >Emitted(36, 14) Source(33, 9) + SourceIndex(0)
+7 >Emitted(36, 15) Source(33, 10) + SourceIndex(0)
+8 >Emitted(36, 17) Source(33, 10) + SourceIndex(0)
+9 >Emitted(36, 18) Source(33, 11) + SourceIndex(0)
+10>Emitted(36, 19) Source(33, 12) + SourceIndex(0)
+11>Emitted(36, 22) Source(33, 15) + SourceIndex(0)
+12>Emitted(36, 25) Source(33, 18) + SourceIndex(0)
+13>Emitted(36, 26) Source(33, 19) + SourceIndex(0)
 ---
 >>>})(M || (M = {}));
 1 >
@@ -651,13 +662,13 @@ sourceFile:file.tsx
   >          	// Emit M.S.Bar
   >          	S.Bar, <S.Bar />;
   >          }
-1 >Emitted(35, 1) Source(34, 1) + SourceIndex(0)
-2 >Emitted(35, 2) Source(34, 2) + SourceIndex(0)
-3 >Emitted(35, 4) Source(31, 8) + SourceIndex(0)
-4 >Emitted(35, 5) Source(31, 9) + SourceIndex(0)
-5 >Emitted(35, 10) Source(31, 8) + SourceIndex(0)
-6 >Emitted(35, 11) Source(31, 9) + SourceIndex(0)
-7 >Emitted(35, 19) Source(34, 2) + SourceIndex(0)
+1 >Emitted(37, 1) Source(34, 1) + SourceIndex(0)
+2 >Emitted(37, 2) Source(34, 2) + SourceIndex(0)
+3 >Emitted(37, 4) Source(31, 8) + SourceIndex(0)
+4 >Emitted(37, 5) Source(31, 9) + SourceIndex(0)
+5 >Emitted(37, 10) Source(31, 8) + SourceIndex(0)
+6 >Emitted(37, 11) Source(31, 9) + SourceIndex(0)
+7 >Emitted(37, 19) Source(34, 2) + SourceIndex(0)
 ---
 >>>var M;
 1 >
@@ -675,49 +686,44 @@ sourceFile:file.tsx
   >     	// Emit M_1.Foo
   >     	Foo, <Foo />;
   >     }
-1 >Emitted(36, 1) Source(36, 1) + SourceIndex(0)
-2 >Emitted(36, 5) Source(36, 8) + SourceIndex(0)
-3 >Emitted(36, 6) Source(36, 9) + SourceIndex(0)
-4 >Emitted(36, 7) Source(40, 2) + SourceIndex(0)
+1 >Emitted(38, 1) Source(36, 1) + SourceIndex(0)
+2 >Emitted(38, 5) Source(36, 8) + SourceIndex(0)
+3 >Emitted(38, 6) Source(36, 9) + SourceIndex(0)
+4 >Emitted(38, 7) Source(40, 2) + SourceIndex(0)
 ---
 >>>(function (M_1) {
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^
-4 >              ^^
-5 >                ^
+4 >              ^^^->
 1->
 2 >module 
 3 >           M
-4 >               
-5 >                {
-1->Emitted(37, 1) Source(36, 1) + SourceIndex(0)
-2 >Emitted(37, 12) Source(36, 8) + SourceIndex(0)
-3 >Emitted(37, 15) Source(36, 9) + SourceIndex(0)
-4 >Emitted(37, 17) Source(36, 10) + SourceIndex(0)
-5 >Emitted(37, 18) Source(36, 11) + SourceIndex(0)
+1->Emitted(39, 1) Source(36, 1) + SourceIndex(0)
+2 >Emitted(39, 12) Source(36, 8) + SourceIndex(0)
+3 >Emitted(39, 15) Source(36, 9) + SourceIndex(0)
 ---
 >>>    var M = 100;
-1 >^^^^
+1->^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^^^
 5 >            ^^^
 6 >               ^
 7 >                ^^^^->
-1 >
+1-> {
   >	
 2 >    var 
 3 >        M
 4 >          = 
 5 >            100
 6 >               ;
-1 >Emitted(38, 5) Source(37, 2) + SourceIndex(0)
-2 >Emitted(38, 9) Source(37, 6) + SourceIndex(0)
-3 >Emitted(38, 10) Source(37, 7) + SourceIndex(0)
-4 >Emitted(38, 13) Source(37, 10) + SourceIndex(0)
-5 >Emitted(38, 16) Source(37, 13) + SourceIndex(0)
-6 >Emitted(38, 17) Source(37, 14) + SourceIndex(0)
+1->Emitted(40, 5) Source(37, 2) + SourceIndex(0)
+2 >Emitted(40, 9) Source(37, 6) + SourceIndex(0)
+3 >Emitted(40, 10) Source(37, 7) + SourceIndex(0)
+4 >Emitted(40, 13) Source(37, 10) + SourceIndex(0)
+5 >Emitted(40, 16) Source(37, 13) + SourceIndex(0)
+6 >Emitted(40, 17) Source(37, 14) + SourceIndex(0)
 ---
 >>>    // Emit M_1.Foo
 1->^^^^
@@ -726,32 +732,38 @@ sourceFile:file.tsx
 1->
   >	
 2 >    // Emit M_1.Foo
-1->Emitted(39, 5) Source(38, 2) + SourceIndex(0)
-2 >Emitted(39, 20) Source(38, 17) + SourceIndex(0)
+1->Emitted(41, 5) Source(38, 2) + SourceIndex(0)
+2 >Emitted(41, 20) Source(38, 17) + SourceIndex(0)
 ---
 >>>    M_1.Foo, <M_1.Foo />;
 1->^^^^
-2 >    ^^^^^^^
-3 >           ^^
-4 >             ^
-5 >              ^^^^^^^
-6 >                     ^^^
-7 >                        ^
+2 >    ^^^^
+3 >        ^^^
+4 >           ^^
+5 >             ^
+6 >              ^^^^
+7 >                  ^^^
+8 >                     ^^^
+9 >                        ^
 1->
   >	
-2 >    Foo
-3 >           , 
-4 >             <
-5 >              Foo
-6 >                      />
-7 >                        ;
-1->Emitted(40, 5) Source(39, 2) + SourceIndex(0)
-2 >Emitted(40, 12) Source(39, 5) + SourceIndex(0)
-3 >Emitted(40, 14) Source(39, 7) + SourceIndex(0)
-4 >Emitted(40, 15) Source(39, 8) + SourceIndex(0)
-5 >Emitted(40, 22) Source(39, 11) + SourceIndex(0)
-6 >Emitted(40, 25) Source(39, 14) + SourceIndex(0)
-7 >Emitted(40, 26) Source(39, 15) + SourceIndex(0)
+2 >    
+3 >        Foo
+4 >           , 
+5 >             <
+6 >              
+7 >                  Foo
+8 >                      />
+9 >                        ;
+1->Emitted(42, 5) Source(39, 2) + SourceIndex(0)
+2 >Emitted(42, 9) Source(39, 2) + SourceIndex(0)
+3 >Emitted(42, 12) Source(39, 5) + SourceIndex(0)
+4 >Emitted(42, 14) Source(39, 7) + SourceIndex(0)
+5 >Emitted(42, 15) Source(39, 8) + SourceIndex(0)
+6 >Emitted(42, 19) Source(39, 8) + SourceIndex(0)
+7 >Emitted(42, 22) Source(39, 11) + SourceIndex(0)
+8 >Emitted(42, 25) Source(39, 14) + SourceIndex(0)
+9 >Emitted(42, 26) Source(39, 15) + SourceIndex(0)
 ---
 >>>})(M || (M = {}));
 1 >
@@ -774,12 +786,12 @@ sourceFile:file.tsx
   >          	// Emit M_1.Foo
   >          	Foo, <Foo />;
   >          }
-1 >Emitted(41, 1) Source(40, 1) + SourceIndex(0)
-2 >Emitted(41, 2) Source(40, 2) + SourceIndex(0)
-3 >Emitted(41, 4) Source(36, 8) + SourceIndex(0)
-4 >Emitted(41, 5) Source(36, 9) + SourceIndex(0)
-5 >Emitted(41, 10) Source(36, 8) + SourceIndex(0)
-6 >Emitted(41, 11) Source(36, 9) + SourceIndex(0)
-7 >Emitted(41, 19) Source(40, 2) + SourceIndex(0)
+1 >Emitted(43, 1) Source(40, 1) + SourceIndex(0)
+2 >Emitted(43, 2) Source(40, 2) + SourceIndex(0)
+3 >Emitted(43, 4) Source(36, 8) + SourceIndex(0)
+4 >Emitted(43, 5) Source(36, 9) + SourceIndex(0)
+5 >Emitted(43, 10) Source(36, 8) + SourceIndex(0)
+6 >Emitted(43, 11) Source(36, 9) + SourceIndex(0)
+7 >Emitted(43, 19) Source(40, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=file.jsx.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxErrorRecovery3.js b/tests/baselines/reference/tsxErrorRecovery3.js
index 93b34a14c19..0e0d3d072a6 100644
--- a/tests/baselines/reference/tsxErrorRecovery3.js
+++ b/tests/baselines/reference/tsxErrorRecovery3.js
@@ -16,4 +16,4 @@ React.createElement("div", null)
     ,
         React.createElement("div", null);
 //// [file2.js]
-var x = React.createElement("div", null), React.createElement("div", null);
+var x = (React.createElement("div", null), React.createElement("div", null));
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index 29aee544b3c..0d4e58d7008 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 var Button = (function (_super) {
     __extends(Button, _super);
     function Button() {
@@ -57,9 +57,9 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 // Should see var button_1 = require('./button') here
-var button_1 = require('./button');
+var button_1 = require("./button");
 var App = (function (_super) {
     __extends(App, _super);
     function App() {
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 25e186e140f..6c01a48af78 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -27,8 +27,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
-var mod_1 = require('mod');
+var mod_1 = require("mod");
 // Should see mod_1['default'] in emit here
-React.createElement(Foo, {handler: mod_1["default"]});
+React.createElement(Foo, { handler: mod_1["default"] });
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, __assign({}, mod_1["default"]));
diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js
index 6d795c946c3..b9a7d369fc0 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.js
+++ b/tests/baselines/reference/tsxPreserveEmit1.js
@@ -34,7 +34,7 @@ module M {
 
 
 //// [test.jsx]
-define(["require", "exports", 'react', 'react-router'], function (require, exports, React, ReactRouter) {
+define(["require", "exports", "react", "react-router"], function (require, exports, React, ReactRouter) {
     "use strict";
     var Route = ReactRouter.Route;
     var routes1 = <Route />;
diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js
index f62a7bdc47d..20a91b3fe89 100644
--- a/tests/baselines/reference/tsxReactEmit1.js
+++ b/tests/baselines/reference/tsxReactEmit1.js
@@ -44,17 +44,17 @@ var whitespace3 = <div>
 //// [file.js]
 var p;
 var selfClosed1 = React.createElement("div", null);
-var selfClosed2 = React.createElement("div", {x: "1"});
-var selfClosed3 = React.createElement("div", {x: '1'});
-var selfClosed4 = React.createElement("div", {x: "1", y: '0'});
-var selfClosed5 = React.createElement("div", {x: 0, y: '0'});
-var selfClosed6 = React.createElement("div", {x: "1", y: '0'});
-var selfClosed7 = React.createElement("div", {x: p, y: 'p', b: true});
+var selfClosed2 = React.createElement("div", { x: "1" });
+var selfClosed3 = React.createElement("div", { x: '1' });
+var selfClosed4 = React.createElement("div", { x: "1", y: '0' });
+var selfClosed5 = React.createElement("div", { x: 0, y: '0' });
+var selfClosed6 = React.createElement("div", { x: "1", y: '0' });
+var selfClosed7 = React.createElement("div", { x: p, y: 'p', b: true });
 var openClosed1 = React.createElement("div", null);
-var openClosed2 = React.createElement("div", {n: 'm'}, "foo");
-var openClosed3 = React.createElement("div", {n: 'm'}, p);
-var openClosed4 = React.createElement("div", {n: 'm'}, p < p);
-var openClosed5 = React.createElement("div", {n: 'm', b: true}, p > p);
+var openClosed2 = React.createElement("div", { n: 'm' }, "foo");
+var openClosed3 = React.createElement("div", { n: 'm' }, p);
+var openClosed4 = React.createElement("div", { n: 'm' }, p < p);
+var openClosed5 = React.createElement("div", { n: 'm', b: true }, p > p);
 var SomeClass = (function () {
     function SomeClass() {
     }
@@ -63,15 +63,15 @@ var SomeClass = (function () {
         var rewrites1 = React.createElement("div", null, function () { return _this; });
         var rewrites2 = React.createElement("div", null, [p].concat(p, [p]));
         var rewrites3 = React.createElement("div", null, { p: p });
-        var rewrites4 = React.createElement("div", {a: function () { return _this; }});
-        var rewrites5 = React.createElement("div", {a: [p].concat(p, [p])});
-        var rewrites6 = React.createElement("div", {a: { p: p }});
+        var rewrites4 = React.createElement("div", { a: function () { return _this; } });
+        var rewrites5 = React.createElement("div", { a: [p].concat(p, [p]) });
+        var rewrites6 = React.createElement("div", { a: { p: p } });
     };
     return SomeClass;
 }());
 var whitespace1 = React.createElement("div", null, "      ");
-var whitespace2 = React.createElement("div", null, 
-    "  ", 
-    p, 
+var whitespace2 = React.createElement("div", null,
+    "  ",
+    p,
     "    ");
 var whitespace3 = React.createElement("div", null, p);
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index 051c7380171..80e3215e2b6 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -27,6 +27,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 var p1, p2, p3;
 var spreads1 = React.createElement("div", __assign({}, p1), p2);
 var spreads2 = React.createElement("div", __assign({}, p1), p2);
-var spreads3 = React.createElement("div", __assign({x: p3}, p1), p2);
-var spreads4 = React.createElement("div", __assign({}, p1, {x: p3}), p2);
-var spreads5 = React.createElement("div", __assign({x: p2}, p1, {y: p3}), p2);
+var spreads3 = React.createElement("div", __assign({ x: p3 }, p1), p2);
+var spreads4 = React.createElement("div", __assign({}, p1, { x: p3 }), p2);
+var spreads5 = React.createElement("div", __assign({ x: p2 }, p1, { y: p3 }), p2);
diff --git a/tests/baselines/reference/tsxReactEmit3.js b/tests/baselines/reference/tsxReactEmit3.js
index 07a8f22761f..155a316e078 100644
--- a/tests/baselines/reference/tsxReactEmit3.js
+++ b/tests/baselines/reference/tsxReactEmit3.js
@@ -8,11 +8,11 @@ declare var Foo, Bar, baz;
 <Foo> <Bar> q </Bar> <Bar/>   s <Bar/><Bar/></Foo>;
 
 //// [test.js]
-React.createElement(Foo, null, 
-    " ", 
-    React.createElement(Bar, null, " q "), 
-    " ", 
-    React.createElement(Bar, null), 
-    "   s ", 
-    React.createElement(Bar, null), 
+React.createElement(Foo, null,
+    " ",
+    React.createElement(Bar, null, " q "),
+    " ",
+    React.createElement(Bar, null),
+    "   s ",
+    React.createElement(Bar, null),
     React.createElement(Bar, null));
diff --git a/tests/baselines/reference/tsxReactEmit4.js b/tests/baselines/reference/tsxReactEmit4.js
index 3b554f17cb7..33c835d1ab2 100644
--- a/tests/baselines/reference/tsxReactEmit4.js
+++ b/tests/baselines/reference/tsxReactEmit4.js
@@ -29,4 +29,4 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 var p;
 var openClosed1 = React.createElement("div", null, blah);
 // Should emit React.__spread({}, p, {x: 0})
-var spread1 = React.createElement("div", __assign({}, p, {x: 0}));
+var spread1 = React.createElement("div", __assign({}, p, { x: 0 }));
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index a6dde25edc3..c3e58d0a0da 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -35,4 +35,4 @@ var test_1 = require("./test");
 // Should emit test_1.React.createElement
 //  and React.__spread
 var foo;
-var spread1 = test_1.React.createElement("div", __assign({x: ''}, foo, {y: ''}));
+var spread1 = test_1.React.createElement("div", __assign({ x: '' }, foo, { y: '' }));
diff --git a/tests/baselines/reference/tsxReactEmit6.js b/tests/baselines/reference/tsxReactEmit6.js
index cb41bf4d1eb..a85c6baa687 100644
--- a/tests/baselines/reference/tsxReactEmit6.js
+++ b/tests/baselines/reference/tsxReactEmit6.js
@@ -44,7 +44,7 @@ var M;
     // Should emit M.React.createElement
     //  and M.React.__spread
     var foo;
-    var spread1 = M.React.createElement("div", __assign({x: ''}, foo, {y: ''}));
+    var spread1 = M.React.createElement("div", __assign({ x: '' }, foo, { y: '' }));
     // Quotes
     var x = M.React.createElement("div", null, "This \"quote\" thing");
 })(M || (M = {}));
diff --git a/tests/baselines/reference/tsxReactEmit7.js b/tests/baselines/reference/tsxReactEmit7.js
index 44d28c2dd9c..c119585c1f6 100644
--- a/tests/baselines/reference/tsxReactEmit7.js
+++ b/tests/baselines/reference/tsxReactEmit7.js
@@ -21,13 +21,13 @@ var e = <div xxxxx="val"></div>;
 
 
 //// [file.js]
-var m = React.createElement("div", {"x-y": "val"});
-var n = React.createElement("div", {"xx-y": "val"});
-var o = React.createElement("div", {"x-yy": "val"});
-var p = React.createElement("div", {"xx-yy": "val"});
+var m = React.createElement("div", { "x-y": "val" });
+var n = React.createElement("div", { "xx-y": "val" });
+var o = React.createElement("div", { "x-yy": "val" });
+var p = React.createElement("div", { "xx-yy": "val" });
 // Investigation
-var a = React.createElement("div", {x: "val"});
-var b = React.createElement("div", {xx: "val"});
-var c = React.createElement("div", {xxx: "val"});
-var d = React.createElement("div", {xxxx: "val"});
-var e = React.createElement("div", {xxxxx: "val"});
+var a = React.createElement("div", { x: "val" });
+var b = React.createElement("div", { xx: "val" });
+var c = React.createElement("div", { xxx: "val" });
+var d = React.createElement("div", { xxxx: "val" });
+var e = React.createElement("div", { xxxxx: "val" });
diff --git a/tests/baselines/reference/tsxReactEmitEntities.js b/tests/baselines/reference/tsxReactEmitEntities.js
index a20f3380bf7..2a5c1ec4963 100644
--- a/tests/baselines/reference/tsxReactEmitEntities.js
+++ b/tests/baselines/reference/tsxReactEmitEntities.js
@@ -12,5 +12,5 @@ declare var React: any;
 
 
 //// [file.js]
-React.createElement("div", null, "Dot goes here: · &notAnEntity; ");
+React.createElement("div", null, "Dot goes here: \u00B7 &notAnEntity; ");
 React.createElement("div", null, "Be careful of \"-ed strings!");
diff --git a/tests/baselines/reference/tsxReactEmitNesting.js b/tests/baselines/reference/tsxReactEmitNesting.js
index 53abc04aa9b..29e948f687b 100644
--- a/tests/baselines/reference/tsxReactEmitNesting.js
+++ b/tests/baselines/reference/tsxReactEmitNesting.js
@@ -38,23 +38,21 @@ let render = (ctrl, model) =>
 //// [file.js]
 // A simple render function with nesting and control statements
 var render = function (ctrl, model) {
-    return vdom.createElement("section", {class: "todoapp"}, 
-        vdom.createElement("header", {class: "header"}, 
-            vdom.createElement("h1", null, "todos <x>"), 
-            vdom.createElement("input", {class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model)})), 
-        vdom.createElement("section", {class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" }}, 
-            vdom.createElement("input", {class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl)}), 
-            vdom.createElement("ul", {class: "todo-list"}, model.filteredTodos.map(function (todo) {
-                return vdom.createElement("li", {class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo }}, 
-                    vdom.createElement("div", {class: "view"}, 
+    return vdom.createElement("section", { class: "todoapp" },
+        vdom.createElement("header", { class: "header" },
+            vdom.createElement("h1", null, "todos <x>"),
+            vdom.createElement("input", { class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model) })),
+        vdom.createElement("section", { class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" } },
+            vdom.createElement("input", { class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl) }),
+            vdom.createElement("ul", { class: "todo-list" }, model.filteredTodos.map(function (todo) {
+                return vdom.createElement("li", { class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo } },
+                    vdom.createElement("div", { class: "view" },
                         (!todo.editable) ?
-                            vdom.createElement("input", {class: "toggle", type: "checkbox"})
-                            : null, 
-                        vdom.createElement("label", {onDoubleClick: function () { ctrl.editTodo(todo); }}, todo.title), 
-                        vdom.createElement("button", {class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo)}), 
-                        vdom.createElement("div", {class: "iconBorder"}, 
-                            vdom.createElement("div", {class: "icon"})
-                        ))
-                );
+                            vdom.createElement("input", { class: "toggle", type: "checkbox" })
+                            : null,
+                        vdom.createElement("label", { onDoubleClick: function () { ctrl.editTodo(todo); } }, todo.title),
+                        vdom.createElement("button", { class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo) }),
+                        vdom.createElement("div", { class: "iconBorder" },
+                            vdom.createElement("div", { class: "icon" }))));
             }))));
 };
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.js b/tests/baselines/reference/tsxReactEmitWhitespace.js
index 9a157d242e3..dd69091569f 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace.js
+++ b/tests/baselines/reference/tsxReactEmitWhitespace.js
@@ -59,9 +59,9 @@ var p = 0;
 // Emit "   "
 React.createElement("div", null, "   ");
 // Emit "  ", p, "   "
-React.createElement("div", null, 
-    "  ", 
-    p, 
+React.createElement("div", null,
+    "  ",
+    p,
     "    ");
 // Emit only p
 React.createElement("div", null, p);
@@ -76,4 +76,4 @@ React.createElement("div", null, "3");
 // Emit no args
 React.createElement("div", null);
 // Emit "foo" + ' ' + "bar"
-React.createElement("div", null, "foo" + ' ' + "bar");
+React.createElement("div", null, "foo" + " " + "bar");
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.js b/tests/baselines/reference/tsxReactEmitWhitespace2.js
index 152d869fc03..0ff92b37131 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace2.js
+++ b/tests/baselines/reference/tsxReactEmitWhitespace2.js
@@ -18,15 +18,15 @@ declare var React: any;
 
 //// [file.js]
 // Emit ' word' in the last string
-React.createElement("div", null, 
-    "word ", 
-    React.createElement("code", null, "code"), 
+React.createElement("div", null,
+    "word ",
+    React.createElement("code", null, "code"),
     " word");
 // Same here
-React.createElement("div", null, 
-    React.createElement("code", null, "code"), 
+React.createElement("div", null,
+    React.createElement("code", null, "code"),
     " word");
 // And here
-React.createElement("div", null, 
-    React.createElement("code", null), 
+React.createElement("div", null,
+    React.createElement("code", null),
     " word");
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index 04d61d41218..b93832567d5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 function Greet(x) {
     return <div>Hello, {x}</div>;
 }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
index d58586dd1ee..02ddcc8a58e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
@@ -19,7 +19,7 @@ var App: React.StatelessComponent<{ children }> = ({children}) => (
 );
 
 //// [file.jsx]
-define(["require", "exports", 'react'], function (require, exports, React) {
+define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     var Foo = function (props) { return <div />; };
     // Should be OK
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js
index 11b41a2aa3d..444542068be 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var React = require('react');
+var React = require("react");
 var MyComponent = (function (_super) {
     __extends(MyComponent, _super);
     function MyComponent() {
@@ -44,7 +44,7 @@ var MyComponent = (function (_super) {
     return MyComponent;
 }(React.Component));
 // Stateless Component As Props
-React.createElement(MyComponent, {AnyComponent: function () { return React.createElement("button", null, "test"); }});
+React.createElement(MyComponent, { AnyComponent: function () { return React.createElement("button", null, "test"); } });
 // Component Class as Props
 var MyButtonComponent = (function (_super) {
     __extends(MyButtonComponent, _super);
@@ -53,4 +53,4 @@ var MyButtonComponent = (function (_super) {
     }
     return MyButtonComponent;
 }(React.Component));
-React.createElement(MyComponent, {AnyComponent: MyButtonComponent});
+React.createElement(MyComponent, { AnyComponent: MyButtonComponent });
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js
index b88816f285a..3cc6f44c699 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.js
@@ -13,6 +13,6 @@ const X: Invalid1 = 1;
 
 //// [file.js]
 "use strict";
-var React = require('react');
+var React = require("react");
 var X = 1;
 React.createElement(X, null);
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js
index 1f72e1d1b00..6e82fe4b07d 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -6,7 +6,6 @@ export type CallbackArray<T extends callback> = () => T;
 
 //// [typeAliasDeclarationEmit.js]
 define(["require", "exports"], function (require, exports) {
-    "use strict";
 });
 
 
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js
index b94eb56a2a2..4bb1bd3efd9 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js
@@ -4,7 +4,6 @@ export type A<a> = { value: a };
 
 //// [typeAliasDeclarationEmit2.js]
 define(["require", "exports"], function (require, exports) {
-    "use strict";
 });
 
 
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js
index d18181dd1dc..44b37cc3be5 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js
@@ -14,9 +14,11 @@ function foo(x) {
     }()); }
     return undefined;
 }
-foo((function () {
-    function class_2() {
-    }
-    class_2.prop = "hello";
-    return class_2;
-}())).length;
+foo((_a = (function () {
+        function class_2() {
+        }
+        return class_2;
+    }()),
+    _a.prop = "hello",
+    _a)).length;
+var _a;
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js
index 66da2ffbff6..bd221a30137 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js
@@ -16,9 +16,11 @@ function foo(x) {
     return undefined;
 }
 // Should not infer string because it is a static property
-foo((function () {
-    function class_2() {
-    }
-    class_2.prop = "hello";
-    return class_2;
-}())).length;
+foo((_a = (function () {
+        function class_2() {
+        }
+        return class_2;
+    }()),
+    _a.prop = "hello",
+    _a)).length;
+var _a;
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
index 90470f58124..5590dac249f 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
@@ -20,7 +20,7 @@ function foo() {
 exports.foo = foo;
 //// [file2.js]
 "use strict";
-var f = require('./file1');
+var f = require("./file1");
 f.foo();
 
 
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.js b/tests/baselines/reference/typeGuardFunctionErrors.js
index dcd8ffcb265..f3ff5ffab4a 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -171,6 +171,7 @@ var C = (function (_super) {
 function hasANonBooleanReturnStatement(x) {
     return '';
 }
+function hasTypeGuardTypeInsideTypeGuardType(x) { }
 is;
 A;
 {
@@ -231,6 +232,7 @@ function b2(a, A) {
     if (a === void 0) { a = is; }
 }
 ;
+function b3() { }
 is;
 A;
 {
diff --git a/tests/baselines/reference/typeOfPrototype.js b/tests/baselines/reference/typeOfPrototype.js
index 3e8b3186936..a0f076113e0 100644
--- a/tests/baselines/reference/typeOfPrototype.js
+++ b/tests/baselines/reference/typeOfPrototype.js
@@ -11,7 +11,7 @@ var Foo = (function () {
     function Foo() {
         this.bar = 3;
     }
-    Foo.bar = '';
     return Foo;
 }());
+Foo.bar = '';
 Foo.prototype.bar = undefined; // Should be OK
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers2.js b/tests/baselines/reference/typeOfThisInStaticMembers2.js
index b01770446be..886ea04e23d 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers2.js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers2.js
@@ -11,12 +11,12 @@ class C2<T> {
 var C = (function () {
     function C() {
     }
-    C.foo = this; // error
     return C;
 }());
+C.foo = this; // error
 var C2 = (function () {
     function C2() {
     }
-    C2.foo = this; // error
     return C2;
 }());
+C2.foo = this; // error
diff --git a/tests/baselines/reference/typeQueryOnClass.js b/tests/baselines/reference/typeQueryOnClass.js
index 85dff0de831..80623af5be8 100644
--- a/tests/baselines/reference/typeQueryOnClass.js
+++ b/tests/baselines/reference/typeQueryOnClass.js
@@ -99,10 +99,10 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
-    C.sa = 1;
-    C.sb = function () { return 1; };
     return C;
 }());
+C.sa = 1;
+C.sb = function () { return 1; };
 var c;
 // BUG 820454
 var r1;
diff --git a/tests/baselines/reference/typeReferenceDirectives11.errors.txt b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
index 45433bf3b83..910c6a8e4c6 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.errors.txt
+++ b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
@@ -8,6 +8,7 @@
 ==== /types/lib/index.d.ts (0 errors) ====
     
     
+    
     interface Lib { x }
     
 ==== /mod1.ts (1 errors) ====
diff --git a/tests/baselines/reference/typeReferenceDirectives11.js b/tests/baselines/reference/typeReferenceDirectives11.js
deleted file mode 100644
index cb41c843adc..00000000000
--- a/tests/baselines/reference/typeReferenceDirectives11.js
+++ /dev/null
@@ -1,27 +0,0 @@
-//// [tests/cases/compiler/typeReferenceDirectives11.ts] ////
-
-//// [index.d.ts]
-
-
-interface Lib { x }
-
-//// [mod1.ts]
-
-export function foo(): Lib { return {x: 1} }
-
-//// [mod2.ts]
-
-import {foo} from "./mod1";
-export const bar = foo();
-
-//// [output.js]
-
-
-//// [output.d.ts]
-/// <reference types="lib" />
-declare module "mod1" {
-    export function foo(): Lib;
-}
-declare module "mod2" {
-    export const bar: Lib;
-}
diff --git a/tests/baselines/reference/typeReferenceDirectives11.symbols b/tests/baselines/reference/typeReferenceDirectives11.symbols
new file mode 100644
index 00000000000..875bb2a0900
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives11.symbols
@@ -0,0 +1,23 @@
+=== /mod2.ts ===
+
+import {foo} from "./mod1";
+>foo : Symbol(foo, Decl(mod2.ts, 1, 8))
+
+export const bar = foo();
+>bar : Symbol(bar, Decl(mod2.ts, 2, 12))
+>foo : Symbol(foo, Decl(mod2.ts, 1, 8))
+
+=== /types/lib/index.d.ts ===
+
+
+interface Lib { x }
+>Lib : Symbol(Lib, Decl(index.d.ts, 0, 0))
+>x : Symbol(Lib.x, Decl(index.d.ts, 2, 15))
+
+=== /mod1.ts ===
+
+export function foo(): Lib { return {x: 1} }
+>foo : Symbol(foo, Decl(mod1.ts, 0, 0))
+>Lib : Symbol(Lib, Decl(index.d.ts, 0, 0))
+>x : Symbol(x, Decl(mod1.ts, 1, 37))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives11.types b/tests/baselines/reference/typeReferenceDirectives11.types
new file mode 100644
index 00000000000..93d80b7988a
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives11.types
@@ -0,0 +1,26 @@
+=== /mod2.ts ===
+
+import {foo} from "./mod1";
+>foo : () => Lib
+
+export const bar = foo();
+>bar : Lib
+>foo() : Lib
+>foo : () => Lib
+
+=== /types/lib/index.d.ts ===
+
+
+interface Lib { x }
+>Lib : Lib
+>x : any
+
+=== /mod1.ts ===
+
+export function foo(): Lib { return {x: 1} }
+>foo : () => Lib
+>Lib : Lib
+>{x: 1} : { x: number; }
+>x : number
+>1 : number
+
diff --git a/tests/baselines/reference/typeReferenceDirectives12.errors.txt b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
index c1b3a6126b2..6775a2269ee 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.errors.txt
+++ b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
@@ -11,6 +11,7 @@
 ==== /types/lib/index.d.ts (0 errors) ====
     
     
+    
     interface Lib { x }
     
 ==== /main.ts (1 errors) ====
diff --git a/tests/baselines/reference/typeReferenceDirectives12.js b/tests/baselines/reference/typeReferenceDirectives12.js
deleted file mode 100644
index c9c4a912da1..00000000000
--- a/tests/baselines/reference/typeReferenceDirectives12.js
+++ /dev/null
@@ -1,63 +0,0 @@
-//// [tests/cases/compiler/typeReferenceDirectives12.ts] ////
-
-//// [index.d.ts]
-
-
-interface Lib { x }
-
-//// [main.ts]
-export class Cls {
-    x
-}
-
-//// [mod1.ts]
-/// <reference types="lib" />
-
-import {Cls} from "./main";
-Cls.prototype.foo = function() { return undefined; }
-
-declare module "./main" {
-    interface Cls {
-        foo(): Lib;
-    }
-    namespace Cls {
-        function bar(): Lib;
-    }
-}
-
-//// [mod2.ts]
-import { Cls } from "./main";
-import "./mod1";
-
-export const cls = Cls;
-export const foo = new Cls().foo();
-export const bar = Cls.bar();
-
-//// [output.js]
-/// <reference types="lib" />
-
-
-//// [output.d.ts]
-/// <reference types="lib" />
-declare module "main" {
-    export class Cls {
-        x: any;
-    }
-}
-declare module "mod1" {
-    module "main" {
-        interface Cls {
-            foo(): Lib;
-        }
-        namespace Cls {
-            function bar(): Lib;
-        }
-    }
-}
-declare module "mod2" {
-    import { Cls } from "main";
-    import "mod1";
-    export const cls: typeof Cls;
-    export const foo: Lib;
-    export const bar: Lib;
-}
diff --git a/tests/baselines/reference/typeReferenceDirectives12.symbols b/tests/baselines/reference/typeReferenceDirectives12.symbols
new file mode 100644
index 00000000000..30b24c39284
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives12.symbols
@@ -0,0 +1,68 @@
+=== /mod2.ts ===
+import { Cls } from "./main";
+>Cls : Symbol(Cls, Decl(mod2.ts, 0, 8))
+
+import "./mod1";
+
+export const cls = Cls;
+>cls : Symbol(cls, Decl(mod2.ts, 3, 12))
+>Cls : Symbol(Cls, Decl(mod2.ts, 0, 8))
+
+export const foo = new Cls().foo();
+>foo : Symbol(foo, Decl(mod2.ts, 4, 12))
+>new Cls().foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19))
+>Cls : Symbol(Cls, Decl(mod2.ts, 0, 8))
+>foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19))
+
+export const bar = Cls.bar();
+>bar : Symbol(bar, Decl(mod2.ts, 5, 12))
+>Cls.bar : Symbol(Cls.bar, Decl(mod1.ts, 9, 19))
+>Cls : Symbol(Cls, Decl(mod2.ts, 0, 8))
+>bar : Symbol(Cls.bar, Decl(mod1.ts, 9, 19))
+
+=== /types/lib/index.d.ts ===
+
+
+interface Lib { x }
+>Lib : Symbol(Lib, Decl(index.d.ts, 0, 0))
+>x : Symbol(Lib.x, Decl(index.d.ts, 2, 15))
+
+=== /main.ts ===
+export class Cls {
+>Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
+
+    x
+>x : Symbol(Cls.x, Decl(main.ts, 0, 18))
+}
+
+=== /mod1.ts ===
+/// <reference types="lib" />
+
+import {Cls} from "./main";
+>Cls : Symbol(Cls, Decl(mod1.ts, 2, 8))
+
+Cls.prototype.foo = function() { return undefined; }
+>Cls.prototype.foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19))
+>Cls.prototype : Symbol(Cls.prototype)
+>Cls : Symbol(Cls, Decl(mod1.ts, 2, 8))
+>prototype : Symbol(Cls.prototype)
+>foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19))
+>undefined : Symbol(undefined)
+
+declare module "./main" {
+    interface Cls {
+>Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
+
+        foo(): Lib;
+>foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19))
+>Lib : Symbol(Lib, Decl(index.d.ts, 0, 0))
+    }
+    namespace Cls {
+>Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
+
+        function bar(): Lib;
+>bar : Symbol(bar, Decl(mod1.ts, 9, 19))
+>Lib : Symbol(Lib, Decl(index.d.ts, 0, 0))
+    }
+}
+
diff --git a/tests/baselines/reference/typeReferenceDirectives12.types b/tests/baselines/reference/typeReferenceDirectives12.types
new file mode 100644
index 00000000000..bd429b91f1c
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives12.types
@@ -0,0 +1,73 @@
+=== /mod2.ts ===
+import { Cls } from "./main";
+>Cls : typeof Cls
+
+import "./mod1";
+
+export const cls = Cls;
+>cls : typeof Cls
+>Cls : typeof Cls
+
+export const foo = new Cls().foo();
+>foo : Lib
+>new Cls().foo() : Lib
+>new Cls().foo : () => Lib
+>new Cls() : Cls
+>Cls : typeof Cls
+>foo : () => Lib
+
+export const bar = Cls.bar();
+>bar : Lib
+>Cls.bar() : Lib
+>Cls.bar : () => Lib
+>Cls : typeof Cls
+>bar : () => Lib
+
+=== /types/lib/index.d.ts ===
+
+
+interface Lib { x }
+>Lib : Lib
+>x : any
+
+=== /main.ts ===
+export class Cls {
+>Cls : Cls
+
+    x
+>x : any
+}
+
+=== /mod1.ts ===
+/// <reference types="lib" />
+
+import {Cls} from "./main";
+>Cls : typeof Cls
+
+Cls.prototype.foo = function() { return undefined; }
+>Cls.prototype.foo = function() { return undefined; } : () => any
+>Cls.prototype.foo : () => Lib
+>Cls.prototype : Cls
+>Cls : typeof Cls
+>prototype : Cls
+>foo : () => Lib
+>function() { return undefined; } : () => any
+>undefined : undefined
+
+declare module "./main" {
+    interface Cls {
+>Cls : Cls
+
+        foo(): Lib;
+>foo : () => Lib
+>Lib : Lib
+    }
+    namespace Cls {
+>Cls : typeof Cls
+
+        function bar(): Lib;
+>bar : () => Lib
+>Lib : Lib
+    }
+}
+
diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map
index 7ccf64daf06..99d359bdbee 100644
--- a/tests/baselines/reference/typeResolution.js.map
+++ b/tests/baselines/reference/typeResolution.js.map
@@ -1,2 +1,2 @@
 //// [typeResolution.js.map]
-{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3B,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU,EAAC,CAAC;YACtB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa,EAAC,CAAC;gBACzB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU,EAAC,CAAC;YACtB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa,EAAC,CAAC;gBACzB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB,EAAC,CAAC;YACtB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU,EAAC,CAAC;YACtB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
+{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt
index 2c109916e6c..8cfb638991c 100644
--- a/tests/baselines/reference/typeResolution.sourcemap.txt
+++ b/tests/baselines/reference/typeResolution.sourcemap.txt
@@ -128,18 +128,12 @@ sourceFile:typeResolution.ts
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^^^^^^^^^^^^^^^
-4 >                              ^^
-5 >                                ^
 1->
 2 >    export module 
 3 >               TopLevelModule1
-4 >                               
-5 >                                {
 1->Emitted(4, 5) Source(1, 1) + SourceIndex(0)
 2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0)
 3 >Emitted(4, 31) Source(1, 30) + SourceIndex(0)
-4 >Emitted(4, 33) Source(1, 31) + SourceIndex(0)
-5 >Emitted(4, 34) Source(1, 32) + SourceIndex(0)
 ---
 >>>        var SubModule1;
 1 >^^^^^^^^
@@ -147,7 +141,7 @@ sourceFile:typeResolution.ts
 3 >            ^^^^^^^^^^
 4 >                      ^
 5 >                       ^^^^^^^^^^->
-1 >
+1 > {
   >    
 2 >        export module 
 3 >            SubModule1
@@ -233,26 +227,21 @@ sourceFile:typeResolution.ts
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^
 3 >                   ^^^^^^^^^^
-4 >                             ^^
-5 >                               ^
+4 >                             ^^->
 1->
 2 >        export module 
 3 >                   SubModule1
-4 >                              
-5 >                               {
 1->Emitted(6, 9) Source(2, 5) + SourceIndex(0)
 2 >Emitted(6, 20) Source(2, 19) + SourceIndex(0)
 3 >Emitted(6, 30) Source(2, 29) + SourceIndex(0)
-4 >Emitted(6, 32) Source(2, 30) + SourceIndex(0)
-5 >Emitted(6, 33) Source(2, 31) + SourceIndex(0)
 ---
 >>>            var SubSubModule1;
-1 >^^^^^^^^^^^^
+1->^^^^^^^^^^^^
 2 >            ^^^^
 3 >                ^^^^^^^^^^^^^
 4 >                             ^
 5 >                              ^^^^^^^^^^->
-1 >
+1-> {
   >        
 2 >            export module 
 3 >                SubSubModule1
@@ -313,7 +302,7 @@ sourceFile:typeResolution.ts
   >                                             }
   >                                         }
   >                                     }
-1 >Emitted(7, 13) Source(3, 9) + SourceIndex(0)
+1->Emitted(7, 13) Source(3, 9) + SourceIndex(0)
 2 >Emitted(7, 17) Source(3, 23) + SourceIndex(0)
 3 >Emitted(7, 30) Source(3, 36) + SourceIndex(0)
 4 >Emitted(7, 31) Source(59, 10) + SourceIndex(0)
@@ -322,24 +311,18 @@ sourceFile:typeResolution.ts
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^
 3 >                       ^^^^^^^^^^^^^
-4 >                                    ^^
-5 >                                      ^
-6 >                                       ^^^^^->
+4 >                                    ^^^^^^^^->
 1->
 2 >            export module 
 3 >                       SubSubModule1
-4 >                                     
-5 >                                      {
 1->Emitted(8, 13) Source(3, 9) + SourceIndex(0)
 2 >Emitted(8, 24) Source(3, 23) + SourceIndex(0)
 3 >Emitted(8, 37) Source(3, 36) + SourceIndex(0)
-4 >Emitted(8, 39) Source(3, 37) + SourceIndex(0)
-5 >Emitted(8, 40) Source(3, 38) + SourceIndex(0)
 ---
 >>>                var ClassA = (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >            
 1->Emitted(9, 17) Source(4, 13) + SourceIndex(0)
 ---
@@ -2090,26 +2073,21 @@ sourceFile:typeResolution.ts
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^
 3 >                   ^^^^^^^^^^
-4 >                             ^^
-5 >                               ^
+4 >                             ^^->
 1->
 2 >        export module 
 3 >                   SubModule2
-4 >                              
-5 >                               {
 1->Emitted(108, 9) Source(76, 5) + SourceIndex(0)
 2 >Emitted(108, 20) Source(76, 19) + SourceIndex(0)
 3 >Emitted(108, 30) Source(76, 29) + SourceIndex(0)
-4 >Emitted(108, 32) Source(76, 30) + SourceIndex(0)
-5 >Emitted(108, 33) Source(76, 31) + SourceIndex(0)
 ---
 >>>            var SubSubModule2;
-1 >^^^^^^^^^^^^
+1->^^^^^^^^^^^^
 2 >            ^^^^
 3 >                ^^^^^^^^^^^^^
 4 >                             ^
 5 >                              ^^^^^^^^^^->
-1 >
+1-> {
   >        
 2 >            export module 
 3 >                SubSubModule2
@@ -2121,7 +2099,7 @@ sourceFile:typeResolution.ts
   >                                         export interface InterfaceY { YisIn1_2_2(); }
   >                                         interface NonExportedInterfaceQ { }
   >                                     }
-1 >Emitted(109, 13) Source(77, 9) + SourceIndex(0)
+1->Emitted(109, 13) Source(77, 9) + SourceIndex(0)
 2 >Emitted(109, 17) Source(77, 23) + SourceIndex(0)
 3 >Emitted(109, 30) Source(77, 36) + SourceIndex(0)
 4 >Emitted(109, 31) Source(84, 10) + SourceIndex(0)
@@ -2130,24 +2108,18 @@ sourceFile:typeResolution.ts
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^
 3 >                       ^^^^^^^^^^^^^
-4 >                                    ^^
-5 >                                      ^
-6 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+4 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >            export module 
 3 >                       SubSubModule2
-4 >                                     
-5 >                                      {
 1->Emitted(110, 13) Source(77, 9) + SourceIndex(0)
 2 >Emitted(110, 24) Source(77, 23) + SourceIndex(0)
 3 >Emitted(110, 37) Source(77, 36) + SourceIndex(0)
-4 >Emitted(110, 39) Source(77, 37) + SourceIndex(0)
-5 >Emitted(110, 40) Source(77, 38) + SourceIndex(0)
 ---
 >>>                // No code here since these are the mirror of the above calls
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
+1-> {
   >            
 2 >                // No code here since these are the mirror of the above calls
 1->Emitted(111, 17) Source(78, 13) + SourceIndex(0)
@@ -2559,24 +2531,18 @@ sourceFile:typeResolution.ts
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^
 3 >                   ^^^^^^^^^^^^^^^^^
-4 >                                    ^^
-5 >                                      ^
-6 >                                       ^->
+4 >                                    ^^^^->
 1->
 2 >        module 
 3 >                   NotExportedModule
-4 >                                     
-5 >                                      {
 1->Emitted(142, 9) Source(97, 5) + SourceIndex(0)
 2 >Emitted(142, 20) Source(97, 12) + SourceIndex(0)
 3 >Emitted(142, 37) Source(97, 29) + SourceIndex(0)
-4 >Emitted(142, 39) Source(97, 30) + SourceIndex(0)
-5 >Emitted(142, 40) Source(97, 31) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >        
 1->Emitted(143, 13) Source(98, 9) + SourceIndex(0)
 ---
@@ -2816,18 +2782,12 @@ sourceFile:typeResolution.ts
 1->^^^^
 2 >    ^^^^^^^^^^^
 3 >               ^^^^^^^^^^^^^^^
-4 >                              ^^
-5 >                                ^
 1->
 2 >    module 
 3 >               TopLevelModule2
-4 >                               
-5 >                                {
 1->Emitted(152, 5) Source(102, 1) + SourceIndex(0)
 2 >Emitted(152, 16) Source(102, 8) + SourceIndex(0)
 3 >Emitted(152, 31) Source(102, 23) + SourceIndex(0)
-4 >Emitted(152, 33) Source(102, 24) + SourceIndex(0)
-5 >Emitted(152, 34) Source(102, 25) + SourceIndex(0)
 ---
 >>>        var SubModule3;
 1 >^^^^^^^^
@@ -2835,7 +2795,7 @@ sourceFile:typeResolution.ts
 3 >            ^^^^^^^^^^
 4 >                      ^
 5 >                       ^^^^^^^^^^->
-1 >
+1 > {
   >    
 2 >        export module 
 3 >            SubModule3
@@ -2853,24 +2813,18 @@ sourceFile:typeResolution.ts
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^
 3 >                   ^^^^^^^^^^
-4 >                             ^^
-5 >                               ^
-6 >                                ^^^^^^^^->
+4 >                             ^^^^^^^^^^^->
 1->
 2 >        export module 
 3 >                   SubModule3
-4 >                              
-5 >                               {
 1->Emitted(154, 9) Source(103, 5) + SourceIndex(0)
 2 >Emitted(154, 20) Source(103, 19) + SourceIndex(0)
 3 >Emitted(154, 30) Source(103, 29) + SourceIndex(0)
-4 >Emitted(154, 32) Source(103, 30) + SourceIndex(0)
-5 >Emitted(154, 33) Source(103, 31) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1-> {
   >        
 1->Emitted(155, 13) Source(104, 9) + SourceIndex(0)
 ---
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
new file mode 100644
index 00000000000..a2542ca9cc0
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/typeRootsFromMultipleNodeModulesDirectories.ts] ////
+
+//// [index.d.ts]
+
+declare module "xyz" {
+    export const x: number;
+}
+
+//// [index.d.ts]
+declare module "pdq" {
+    export const y: number; 
+}
+
+//// [index.d.ts]
+declare module "abc" {
+    export const z: number;
+}
+
+//// [a.ts]
+import { x } from "xyz";
+import { y } from "pdq";
+import { z } from "abc";
+x + y + z;
+
+
+//// [a.js]
+"use strict";
+var xyz_1 = require("xyz");
+var pdq_1 = require("pdq");
+var abc_1 = require("abc");
+xyz_1.x + pdq_1.y + abc_1.z;
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols
new file mode 100644
index 00000000000..67fd371f8ee
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols
@@ -0,0 +1,34 @@
+=== /foo/bar/a.ts ===
+import { x } from "xyz";
+>x : Symbol(x, Decl(a.ts, 0, 8))
+
+import { y } from "pdq";
+>y : Symbol(y, Decl(a.ts, 1, 8))
+
+import { z } from "abc";
+>z : Symbol(z, Decl(a.ts, 2, 8))
+
+x + y + z;
+>x : Symbol(x, Decl(a.ts, 0, 8))
+>y : Symbol(y, Decl(a.ts, 1, 8))
+>z : Symbol(z, Decl(a.ts, 2, 8))
+
+=== /node_modules/@types/dopey/index.d.ts ===
+
+declare module "xyz" {
+    export const x: number;
+>x : Symbol(x, Decl(index.d.ts, 2, 16))
+}
+
+=== /foo/node_modules/@types/grumpy/index.d.ts ===
+declare module "pdq" {
+    export const y: number; 
+>y : Symbol(y, Decl(index.d.ts, 1, 16))
+}
+
+=== /foo/node_modules/@types/sneezy/index.d.ts ===
+declare module "abc" {
+    export const z: number;
+>z : Symbol(z, Decl(index.d.ts, 1, 16))
+}
+
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
new file mode 100644
index 00000000000..c734e57cda2
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
@@ -0,0 +1,157 @@
+[
+    "======== Resolving module 'xyz' from '/foo/bar/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'xyz' from 'node_modules' folder.",
+    "File '/foo/bar/node_modules/xyz.ts' does not exist.",
+    "File '/foo/bar/node_modules/xyz.tsx' does not exist.",
+    "File '/foo/bar/node_modules/xyz.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/xyz/package.json' does not exist.",
+    "File '/foo/bar/node_modules/xyz/index.ts' does not exist.",
+    "File '/foo/bar/node_modules/xyz/index.tsx' does not exist.",
+    "File '/foo/bar/node_modules/xyz/index.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz.tsx' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz/package.json' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz/index.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz/index.tsx' does not exist.",
+    "File '/foo/bar/node_modules/@types/xyz/index.d.ts' does not exist.",
+    "File '/foo/node_modules/xyz.ts' does not exist.",
+    "File '/foo/node_modules/xyz.tsx' does not exist.",
+    "File '/foo/node_modules/xyz.d.ts' does not exist.",
+    "File '/foo/node_modules/xyz/package.json' does not exist.",
+    "File '/foo/node_modules/xyz/index.ts' does not exist.",
+    "File '/foo/node_modules/xyz/index.tsx' does not exist.",
+    "File '/foo/node_modules/xyz/index.d.ts' does not exist.",
+    "File '/foo/node_modules/@types/xyz.ts' does not exist.",
+    "File '/foo/node_modules/@types/xyz.tsx' does not exist.",
+    "File '/foo/node_modules/@types/xyz.d.ts' does not exist.",
+    "File '/foo/node_modules/@types/xyz/package.json' does not exist.",
+    "File '/foo/node_modules/@types/xyz/index.ts' does not exist.",
+    "File '/foo/node_modules/@types/xyz/index.tsx' does not exist.",
+    "File '/foo/node_modules/@types/xyz/index.d.ts' does not exist.",
+    "File '/node_modules/xyz.ts' does not exist.",
+    "File '/node_modules/xyz.tsx' does not exist.",
+    "File '/node_modules/xyz.d.ts' does not exist.",
+    "File '/node_modules/xyz/package.json' does not exist.",
+    "File '/node_modules/xyz/index.ts' does not exist.",
+    "File '/node_modules/xyz/index.tsx' does not exist.",
+    "File '/node_modules/xyz/index.d.ts' does not exist.",
+    "File '/node_modules/@types/xyz.ts' does not exist.",
+    "File '/node_modules/@types/xyz.tsx' does not exist.",
+    "File '/node_modules/@types/xyz.d.ts' does not exist.",
+    "File '/node_modules/@types/xyz/package.json' does not exist.",
+    "File '/node_modules/@types/xyz/index.ts' does not exist.",
+    "File '/node_modules/@types/xyz/index.tsx' does not exist.",
+    "File '/node_modules/@types/xyz/index.d.ts' does not exist.",
+    "======== Module name 'xyz' was not resolved. ========",
+    "======== Resolving module 'pdq' from '/foo/bar/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'pdq' from 'node_modules' folder.",
+    "File '/foo/bar/node_modules/pdq.ts' does not exist.",
+    "File '/foo/bar/node_modules/pdq.tsx' does not exist.",
+    "File '/foo/bar/node_modules/pdq.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/pdq/package.json' does not exist.",
+    "File '/foo/bar/node_modules/pdq/index.ts' does not exist.",
+    "File '/foo/bar/node_modules/pdq/index.tsx' does not exist.",
+    "File '/foo/bar/node_modules/pdq/index.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq.tsx' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq/package.json' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq/index.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq/index.tsx' does not exist.",
+    "File '/foo/bar/node_modules/@types/pdq/index.d.ts' does not exist.",
+    "File '/foo/node_modules/pdq.ts' does not exist.",
+    "File '/foo/node_modules/pdq.tsx' does not exist.",
+    "File '/foo/node_modules/pdq.d.ts' does not exist.",
+    "File '/foo/node_modules/pdq/package.json' does not exist.",
+    "File '/foo/node_modules/pdq/index.ts' does not exist.",
+    "File '/foo/node_modules/pdq/index.tsx' does not exist.",
+    "File '/foo/node_modules/pdq/index.d.ts' does not exist.",
+    "File '/foo/node_modules/@types/pdq.ts' does not exist.",
+    "File '/foo/node_modules/@types/pdq.tsx' does not exist.",
+    "File '/foo/node_modules/@types/pdq.d.ts' does not exist.",
+    "File '/foo/node_modules/@types/pdq/package.json' does not exist.",
+    "File '/foo/node_modules/@types/pdq/index.ts' does not exist.",
+    "File '/foo/node_modules/@types/pdq/index.tsx' does not exist.",
+    "File '/foo/node_modules/@types/pdq/index.d.ts' does not exist.",
+    "File '/node_modules/pdq.ts' does not exist.",
+    "File '/node_modules/pdq.tsx' does not exist.",
+    "File '/node_modules/pdq.d.ts' does not exist.",
+    "File '/node_modules/pdq/package.json' does not exist.",
+    "File '/node_modules/pdq/index.ts' does not exist.",
+    "File '/node_modules/pdq/index.tsx' does not exist.",
+    "File '/node_modules/pdq/index.d.ts' does not exist.",
+    "File '/node_modules/@types/pdq.ts' does not exist.",
+    "File '/node_modules/@types/pdq.tsx' does not exist.",
+    "File '/node_modules/@types/pdq.d.ts' does not exist.",
+    "File '/node_modules/@types/pdq/package.json' does not exist.",
+    "File '/node_modules/@types/pdq/index.ts' does not exist.",
+    "File '/node_modules/@types/pdq/index.tsx' does not exist.",
+    "File '/node_modules/@types/pdq/index.d.ts' does not exist.",
+    "======== Module name 'pdq' was not resolved. ========",
+    "======== Resolving module 'abc' from '/foo/bar/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'abc' from 'node_modules' folder.",
+    "File '/foo/bar/node_modules/abc.ts' does not exist.",
+    "File '/foo/bar/node_modules/abc.tsx' does not exist.",
+    "File '/foo/bar/node_modules/abc.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/abc/package.json' does not exist.",
+    "File '/foo/bar/node_modules/abc/index.ts' does not exist.",
+    "File '/foo/bar/node_modules/abc/index.tsx' does not exist.",
+    "File '/foo/bar/node_modules/abc/index.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc.tsx' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc.d.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc/package.json' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc/index.ts' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc/index.tsx' does not exist.",
+    "File '/foo/bar/node_modules/@types/abc/index.d.ts' does not exist.",
+    "File '/foo/node_modules/abc.ts' does not exist.",
+    "File '/foo/node_modules/abc.tsx' does not exist.",
+    "File '/foo/node_modules/abc.d.ts' does not exist.",
+    "File '/foo/node_modules/abc/package.json' does not exist.",
+    "File '/foo/node_modules/abc/index.ts' does not exist.",
+    "File '/foo/node_modules/abc/index.tsx' does not exist.",
+    "File '/foo/node_modules/abc/index.d.ts' does not exist.",
+    "File '/foo/node_modules/@types/abc.ts' does not exist.",
+    "File '/foo/node_modules/@types/abc.tsx' does not exist.",
+    "File '/foo/node_modules/@types/abc.d.ts' does not exist.",
+    "File '/foo/node_modules/@types/abc/package.json' does not exist.",
+    "File '/foo/node_modules/@types/abc/index.ts' does not exist.",
+    "File '/foo/node_modules/@types/abc/index.tsx' does not exist.",
+    "File '/foo/node_modules/@types/abc/index.d.ts' does not exist.",
+    "File '/node_modules/abc.ts' does not exist.",
+    "File '/node_modules/abc.tsx' does not exist.",
+    "File '/node_modules/abc.d.ts' does not exist.",
+    "File '/node_modules/abc/package.json' does not exist.",
+    "File '/node_modules/abc/index.ts' does not exist.",
+    "File '/node_modules/abc/index.tsx' does not exist.",
+    "File '/node_modules/abc/index.d.ts' does not exist.",
+    "File '/node_modules/@types/abc.ts' does not exist.",
+    "File '/node_modules/@types/abc.tsx' does not exist.",
+    "File '/node_modules/@types/abc.d.ts' does not exist.",
+    "File '/node_modules/@types/abc/package.json' does not exist.",
+    "File '/node_modules/@types/abc/index.ts' does not exist.",
+    "File '/node_modules/@types/abc/index.tsx' does not exist.",
+    "File '/node_modules/@types/abc/index.d.ts' does not exist.",
+    "======== Module name 'abc' was not resolved. ========",
+    "======== Resolving type reference directive 'grumpy', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
+    "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
+    "File '/foo/node_modules/@types/grumpy/package.json' does not exist.",
+    "File '/foo/node_modules/@types/grumpy/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'grumpy' was successfully resolved to '/foo/node_modules/@types/grumpy/index.d.ts', primary: true. ========",
+    "======== Resolving type reference directive 'sneezy', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
+    "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
+    "File '/foo/node_modules/@types/sneezy/package.json' does not exist.",
+    "File '/foo/node_modules/@types/sneezy/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'sneezy' was successfully resolved to '/foo/node_modules/@types/sneezy/index.d.ts', primary: true. ========",
+    "======== Resolving type reference directive 'dopey', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
+    "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
+    "File '/foo/node_modules/@types/dopey/package.json' does not exist.",
+    "File '/foo/node_modules/@types/dopey/index.d.ts' does not exist.",
+    "File '/node_modules/@types/dopey/package.json' does not exist.",
+    "File '/node_modules/@types/dopey/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'dopey' was successfully resolved to '/node_modules/@types/dopey/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
new file mode 100644
index 00000000000..c47be9cdab3
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
@@ -0,0 +1,36 @@
+=== /foo/bar/a.ts ===
+import { x } from "xyz";
+>x : number
+
+import { y } from "pdq";
+>y : number
+
+import { z } from "abc";
+>z : number
+
+x + y + z;
+>x + y + z : number
+>x + y : number
+>x : number
+>y : number
+>z : number
+
+=== /node_modules/@types/dopey/index.d.ts ===
+
+declare module "xyz" {
+    export const x: number;
+>x : number
+}
+
+=== /foo/node_modules/@types/grumpy/index.d.ts ===
+declare module "pdq" {
+    export const y: number; 
+>y : number
+}
+
+=== /foo/node_modules/@types/sneezy/index.d.ts ===
+declare module "abc" {
+    export const z: number;
+>z : number
+}
+
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
new file mode 100644
index 00000000000..9e93755d1f0
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
@@ -0,0 +1,17 @@
+//// [tests/cases/compiler/typeRootsFromNodeModulesInParentDirectory.ts] ////
+
+//// [index.d.ts]
+
+declare module "xyz" {
+    export const x: number;
+}
+
+//// [a.ts]
+import { x } from "xyz";
+x;
+
+
+//// [a.js]
+"use strict";
+var xyz_1 = require("xyz");
+xyz_1.x;
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols
new file mode 100644
index 00000000000..10cbdaa3c53
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols
@@ -0,0 +1,14 @@
+=== /src/a.ts ===
+import { x } from "xyz";
+>x : Symbol(x, Decl(a.ts, 0, 8))
+
+x;
+>x : Symbol(x, Decl(a.ts, 0, 8))
+
+=== /node_modules/@types/foo/index.d.ts ===
+
+declare module "xyz" {
+    export const x: number;
+>x : Symbol(x, Decl(index.d.ts, 2, 16))
+}
+
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
new file mode 100644
index 00000000000..7782ffc4ebf
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
@@ -0,0 +1,39 @@
+[
+    "======== Resolving module 'xyz' from '/src/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'xyz' from 'node_modules' folder.",
+    "File '/src/node_modules/xyz.ts' does not exist.",
+    "File '/src/node_modules/xyz.tsx' does not exist.",
+    "File '/src/node_modules/xyz.d.ts' does not exist.",
+    "File '/src/node_modules/xyz/package.json' does not exist.",
+    "File '/src/node_modules/xyz/index.ts' does not exist.",
+    "File '/src/node_modules/xyz/index.tsx' does not exist.",
+    "File '/src/node_modules/xyz/index.d.ts' does not exist.",
+    "File '/src/node_modules/@types/xyz.ts' does not exist.",
+    "File '/src/node_modules/@types/xyz.tsx' does not exist.",
+    "File '/src/node_modules/@types/xyz.d.ts' does not exist.",
+    "File '/src/node_modules/@types/xyz/package.json' does not exist.",
+    "File '/src/node_modules/@types/xyz/index.ts' does not exist.",
+    "File '/src/node_modules/@types/xyz/index.tsx' does not exist.",
+    "File '/src/node_modules/@types/xyz/index.d.ts' does not exist.",
+    "File '/node_modules/xyz.ts' does not exist.",
+    "File '/node_modules/xyz.tsx' does not exist.",
+    "File '/node_modules/xyz.d.ts' does not exist.",
+    "File '/node_modules/xyz/package.json' does not exist.",
+    "File '/node_modules/xyz/index.ts' does not exist.",
+    "File '/node_modules/xyz/index.tsx' does not exist.",
+    "File '/node_modules/xyz/index.d.ts' does not exist.",
+    "File '/node_modules/@types/xyz.ts' does not exist.",
+    "File '/node_modules/@types/xyz.tsx' does not exist.",
+    "File '/node_modules/@types/xyz.d.ts' does not exist.",
+    "File '/node_modules/@types/xyz/package.json' does not exist.",
+    "File '/node_modules/@types/xyz/index.ts' does not exist.",
+    "File '/node_modules/@types/xyz/index.tsx' does not exist.",
+    "File '/node_modules/@types/xyz/index.d.ts' does not exist.",
+    "======== Module name 'xyz' was not resolved. ========",
+    "======== Resolving type reference directive 'foo', containing file '/src/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "Resolving with primary search path '/node_modules/@types'",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'foo' was successfully resolved to '/node_modules/@types/foo/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
new file mode 100644
index 00000000000..532a05fcb87
--- /dev/null
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
@@ -0,0 +1,14 @@
+=== /src/a.ts ===
+import { x } from "xyz";
+>x : number
+
+x;
+>x : number
+
+=== /node_modules/@types/foo/index.d.ts ===
+
+declare module "xyz" {
+    export const x: number;
+>x : number
+}
+
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index 9bcc5a2fa15..de158544d0d 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -38,8 +38,8 @@ module.exports = D;
 "use strict";
 ///<reference path='typeofAmbientExternalModules_0.ts'/>
 ///<reference path='typeofAmbientExternalModules_1.ts'/>
-var ext = require('./typeofAmbientExternalModules_0');
-var exp = require('./typeofAmbientExternalModules_1');
+var ext = require("./typeofAmbientExternalModules_0");
+var exp = require("./typeofAmbientExternalModules_1");
 var y1 = ext;
 y1 = exp;
 var y2 = exp;
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index 0bb9f6820f6..1c43d28be8b 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -34,8 +34,8 @@ var D = (function () {
 module.exports = D;
 //// [typeofExternalModules_core.js]
 "use strict";
-var ext = require('./typeofExternalModules_external');
-var exp = require('./typeofExternalModules_exportAssign');
+var ext = require("./typeofExternalModules_external");
+var exp = require("./typeofExternalModules_exportAssign");
 var y1 = ext;
 y1 = exp;
 var y2 = exp;
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
index a90cf63bac4..1424f9343aa 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
@@ -24,7 +24,7 @@ var y: {M2: Object} = foo0;
 "use strict";
 //// [foo_1.js]
 "use strict";
-var foo0 = require('./foo_0');
+var foo0 = require("./foo_0");
 // Per 11.2.3, foo_0 should still be "instantiated", albeit with no members
 var x = {};
 var y = foo0;
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
index b3ffcf670a8..ee4c143486c 100644
--- a/tests/baselines/reference/umd-augmentation-1.js
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -42,7 +42,7 @@ var t = p.x;
 //// [b.js]
 "use strict";
 /// <reference path="math2d-augment.d.ts" />
-var m = require('math2d');
+var m = require("math2d");
 var v = new m.Vector(3, 2);
 var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
index 2b8eac7bf63..e9abf724881 100644
--- a/tests/baselines/reference/umd-augmentation-3.js
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -48,7 +48,7 @@ var t = p.x;
 //// [b.js]
 "use strict";
 /// <reference path="math2d-augment.d.ts" />
-var m = require('math2d');
+var m = require("math2d");
 var v = new m.Vector(3, 2);
 var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
index 5e869148beb..03e15be2ecf 100644
--- a/tests/baselines/reference/umd3.js
+++ b/tests/baselines/reference/umd3.js
@@ -16,7 +16,7 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
-var Foo = require('./foo');
+var Foo = require("./foo");
 Foo.fn();
 var x;
 var y = x.n;
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
index b7a7d1da0e2..d06fc3aba93 100644
--- a/tests/baselines/reference/umd4.js
+++ b/tests/baselines/reference/umd4.js
@@ -16,7 +16,7 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
-var Bar = require('./foo');
+var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index d054daf93fd..95626132f77 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -18,7 +18,7 @@ let z = Foo;
 
 //// [a.js]
 "use strict";
-var Bar = require('./foo');
+var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js
index e73a5350d79..68cffd22023 100644
--- a/tests/baselines/reference/umdDependencyComment2.js
+++ b/tests/baselines/reference/umdDependencyComment2.js
@@ -7,14 +7,14 @@ m1.f();
 
 //// [umdDependencyComment2.js]
 ///<amd-dependency path='bar'/>
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports", "bar", "m2"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports", "bar", "m2"], function (require, exports) {
     "use strict";
     var m1 = require("m2");
     m1.f();
diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js
index 7716ca949a3..ac2fcc99981 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.js
+++ b/tests/baselines/reference/umdDependencyCommentName1.js
@@ -7,14 +7,14 @@ m1.f();
 
 //// [umdDependencyCommentName1.js]
 ///<amd-dependency path='bar' name='b'/>
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports", "bar", "m2"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports, b) {
+})(["require", "exports", "bar", "m2"], function (require, exports, b) {
     "use strict";
     var m1 = require("m2");
     m1.f();
diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js
index 4650a8408e1..06bd2c8a90c 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.js
+++ b/tests/baselines/reference/umdDependencyCommentName2.js
@@ -11,14 +11,14 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 ///<amd-dependency path='foo'/>
 ///<amd-dependency path='goo' name='c'/>
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports", "bar", "goo", "foo", "m2"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports, b, c) {
+})(["require", "exports", "bar", "goo", "foo", "m2"], function (require, exports, b, c) {
     "use strict";
     var m1 = require("m2");
     m1.f();
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index b768b0d9114..c9a43ab4ce6 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -16,7 +16,7 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
 }
 
 //// [undeclaredModuleError.js]
-define(["require", "exports", 'fs'], function (require, exports, fs) {
+define(["require", "exports", "fs"], function (require, exports, fs) {
     "use strict";
     function readdir(path, accept, callback) { }
     function join() {
diff --git a/tests/baselines/reference/unqualifiedCallToClassStatic1.js b/tests/baselines/reference/unqualifiedCallToClassStatic1.js
index 6c78a737fe8..906e9d3795f 100644
--- a/tests/baselines/reference/unqualifiedCallToClassStatic1.js
+++ b/tests/baselines/reference/unqualifiedCallToClassStatic1.js
@@ -10,9 +10,9 @@ class Vector {
 var Vector = (function () {
     function Vector() {
     }
-    Vector.foo = function () {
-        // 'foo' cannot be called in an unqualified manner.
-        foo();
-    };
     return Vector;
 }());
+Vector.foo = function () {
+    // 'foo' cannot be called in an unqualified manner.
+    foo();
+};
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index 86561e1021e..109c2e5a886 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -30,9 +30,9 @@ exports.__esModule = true;
 exports["default"] = Member;
 //// [a.js]
 "use strict";
-var b_1 = require('./b');
-var b_2 = require('./b');
-var ns = require('./b');
+var b_1 = require("./b");
+var b_2 = require("./b");
+var ns = require("./b");
 var r = require("./b");
 new b_1.Member();
 new b_2["default"]();
diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
index 7fbfd15c526..d6e2326842a 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
@@ -259,31 +259,31 @@ var o = {
     })
 };
 o;
-// in a for..in statment
-var _loop_1 = function(i) {
+var _loop_1 = function (i) {
     defered(function () {
         i;
     });
 };
+// in a for..in statment
 for (var i in o) {
     _loop_1(i);
 }
-// in a for..of statment
-var _loop_2 = function(i) {
+var _loop_2 = function (i) {
     defered(function () {
         i;
     });
 };
+// in a for..of statment
 for (var _i = 0, _a = [1, 2, 3]; _i < _a.length; _i++) {
     var i = _a[_i];
     _loop_2(i);
 }
-// in a for. statment
-var _loop_3 = function(i) {
+var _loop_3 = function (i) {
     defered(function () {
         i;
     });
 };
+// in a for. statment
 for (var i = 0; i < 10; i++) {
     _loop_3(i);
 }
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
index 692c4e3aebe..ed6111ec3c5 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
@@ -132,11 +132,11 @@ var WinJS;
 var Errors;
 (function (Errors) {
     var ConnectionError /* extends Error */ = (function () {
-        function ConnectionError /* extends Error */(request) {
+        function ConnectionError(request) {
         }
-        return ConnectionError /* extends Error */;
+        return ConnectionError;
     }());
-    Errors.ConnectionError /* extends Error */ = ConnectionError /* extends Error */;
+    Errors.ConnectionError = ConnectionError;
 })(Errors || (Errors = {}));
 var FileService = (function () {
     function FileService() {
diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js
index e0a4c356873..56294a7cbb9 100644
--- a/tests/baselines/reference/witness.js
+++ b/tests/baselines/reference/witness.js
@@ -262,9 +262,9 @@ var c2inst;
 var C3 = (function () {
     function C3() {
     }
-    C3.q = C3.q;
     return C3;
 }());
+C3.q = C3.q;
 var qq = C3.q;
 var qq;
 // Parentheses - tested a bunch above
diff --git a/tests/baselines/reference/yieldExpression1.js b/tests/baselines/reference/yieldExpression1.js
index 671c2cce262..e4d5748a761 100644
--- a/tests/baselines/reference/yieldExpression1.js
+++ b/tests/baselines/reference/yieldExpression1.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [yieldExpression1.js]
-function foo() {
+function* foo() {
     yield;
 }
diff --git a/tests/cases/compiler/classExpressionWithStaticProperties1.ts b/tests/cases/compiler/classExpressionWithStaticProperties1.ts
index 19fe035e6a7..79c669c32a9 100644
--- a/tests/cases/compiler/classExpressionWithStaticProperties1.ts
+++ b/tests/cases/compiler/classExpressionWithStaticProperties1.ts
@@ -1 +1,5 @@
-var v = class C { static a = 1; static b = 2 };
\ No newline at end of file
+var v = class C {
+    static a = 1;
+    static b = 2;
+    static c = C.a + C.b;
+};
\ No newline at end of file
diff --git a/tests/cases/compiler/classExpressionWithStaticProperties2.ts b/tests/cases/compiler/classExpressionWithStaticProperties2.ts
index f7b9606b6e0..353926e7abd 100644
--- a/tests/cases/compiler/classExpressionWithStaticProperties2.ts
+++ b/tests/cases/compiler/classExpressionWithStaticProperties2.ts
@@ -1 +1,9 @@
-var v = class C { static a = 1; static b };
\ No newline at end of file
+//@target: es5
+var v = class C {
+    static a = 1;
+    static b
+    static c = {
+        x: "hi"
+    }
+    static d = C.c.x + " world";
+ };
\ No newline at end of file
diff --git a/tests/cases/compiler/classExpressionWithStaticProperties3.ts b/tests/cases/compiler/classExpressionWithStaticProperties3.ts
new file mode 100644
index 00000000000..7c733c458be
--- /dev/null
+++ b/tests/cases/compiler/classExpressionWithStaticProperties3.ts
@@ -0,0 +1,11 @@
+//@target: es5
+
+declare var console: any;
+const arr: {y(): number}[] = [];
+for (let i = 0; i < 3; i++) {
+    arr.push(class C {
+        static x = i;
+        static y = () => C.x * 2;
+    });
+}
+arr.forEach(C => console.log(C.y()));
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsOnRequireStatement.ts b/tests/cases/compiler/commentsOnRequireStatement.ts
new file mode 100644
index 00000000000..c6b319d6ddf
--- /dev/null
+++ b/tests/cases/compiler/commentsOnRequireStatement.ts
@@ -0,0 +1,17 @@
+// @target: es5
+// @module: commonjs
+
+// @Filename: 0.ts
+export var subject = 10;
+
+// @Filename: 1.ts
+export var subject1 = 10;
+
+// @Filename: 2.ts
+/* blah0 */
+// blah 
+// blah 
+// blah 
+export {subject} from './0';
+/* blah1 */
+export {subject1} from './1';
diff --git a/tests/cases/compiler/disallowAsyncModifierInES5.ts b/tests/cases/compiler/disallowAsyncModifierInES5.ts
deleted file mode 100644
index 5417e678dce..00000000000
--- a/tests/cases/compiler/disallowAsyncModifierInES5.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// @target: es5
-
-async function foo() { return 42; } // ERROR: Async functions are only available in ES6+
-let bar = async function () { return 42; } // OK, but should be an error
-let baz = async () => 42; // OK, but should be an error
\ No newline at end of file
diff --git a/tests/cases/compiler/enumWithComputedMember.ts b/tests/cases/compiler/enumWithComputedMember.ts
new file mode 100644
index 00000000000..10c7b1994a9
--- /dev/null
+++ b/tests/cases/compiler/enumWithComputedMember.ts
@@ -0,0 +1,5 @@
+enum A { 
+    X = "".length, 
+    Y = X,
+    Z
+}
diff --git a/tests/cases/compiler/es5-asyncFunction.ts b/tests/cases/compiler/es5-asyncFunction.ts
new file mode 100644
index 00000000000..2ee2ccb3f91
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunction.ts
@@ -0,0 +1,10 @@
+// @lib: es5,es2015.promise
+// @target: ES5
+declare var x;
+
+async function empty() {
+}
+
+async function singleAwait() {
+    await x;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts b/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts
new file mode 100644
index 00000000000..69240010c27
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionArrayLiterals.ts
@@ -0,0 +1,36 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a;
+
+async function arrayLiteral0() {
+    x = [await y, z];
+}
+
+async function arrayLiteral1() {
+    x = [y, await z];
+}
+
+async function arrayLiteral2() {
+    x = [...(await y), z];
+}
+
+async function arrayLiteral3() {
+    x = [...y, await z];
+}
+
+async function arrayLiteral4() {
+    x = [await y, ...z];
+}
+
+async function arrayLiteral5() {
+    x = [y, ...(await z)];
+}
+
+async function arrayLiteral6() {
+    x = [y, await z, a];
+}
+
+async function arrayLiteral7() {
+    x = [await y, z, await a];
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts b/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts
new file mode 100644
index 00000000000..cb633640466
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionBinaryExpressions.ts
@@ -0,0 +1,125 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function binaryPlus0() {
+    (await x) + y;
+}
+
+async function binaryPlus1() {
+    x + await y;
+}
+
+async function binaryLogicalAnd0() {
+    (await x) && y;
+}
+
+async function binaryLogicalAnd1() {
+    x && await y;
+}
+
+async function binaryAssignment0() {
+    x = await y;
+}
+
+async function binaryAssignment1() {
+    x.a = await y;
+}
+
+async function binaryAssignment2() {
+    x.a.b = await y;
+}
+
+async function binaryAssignment3() {
+    x[z] = await y;
+}
+
+async function binaryAssignment4() {
+    x[z].b = await y;
+}
+
+async function binaryAssignment5() {
+    x.a[z] = await y;
+}
+
+async function binaryAssignment6() {
+    (await x).a = y;
+}
+
+async function binaryAssignment7() {
+    (await x.a).b = y;
+}
+
+async function binaryAssignment8() {
+    (await x)[z] = y;
+}
+
+async function binaryAssignment9() {
+    x[await z] = y;
+}
+
+async function binaryAssignment10() {
+    x[await z].b = y;
+}
+
+async function binaryAssignment11() {
+    (await x[z]).b = y;
+}
+
+async function binaryAssignment12() {
+    x.a[await z] = y;
+}
+
+async function binaryAssignment13() {
+    (await x.a)[z] = y;
+}
+
+async function binaryCompoundAssignment0() {
+    x += await y;
+}
+
+async function binaryCompoundAssignment1() {
+    x.a += await y;
+}
+
+async function binaryCompoundAssignment2() {
+    x[a] += await y;
+}
+
+async function binaryCompoundAssignment3() {
+    (await x).a += y;
+}
+
+async function binaryCompoundAssignment4() {
+    (await x)[a] += y;
+}
+
+async function binaryCompoundAssignment5() {
+    x[await a] += y;
+}
+
+async function binaryCompoundAssignment6() {
+    (await x).a += await y;
+}
+
+async function binaryCompoundAssignment7() {
+    (await x)[a] += await y;
+}
+
+async function binaryCompoundAssignment8() {
+    x[await a] += await y;
+}
+
+async function binaryExponentiation() {
+    (await x) ** y;
+    x ** await y;
+}
+
+async function binaryComma0() {
+    return (await x), y;
+}
+
+async function binaryComma1(): Promise<any> {
+    return x, await y;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts b/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts
new file mode 100644
index 00000000000..7b748b95bdf
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionCallExpressions.ts
@@ -0,0 +1,88 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function callExpression0() {
+    await x(y, z);
+}
+
+async function callExpression1() {
+    (await x)(y, z);
+}
+
+async function callExpression2() {
+    x(await y, z);
+}
+
+async function callExpression3() {
+    x(y, await z);
+}
+
+async function callExpression4() {
+    await x(...y, z);
+}
+
+async function callExpression5() {
+    (await x)(...y, z);
+}
+
+async function callExpression6() {
+    x(...(await y), z);
+}
+
+async function callExpression7() {
+    x(...y, await z);
+}
+
+async function callExpression8() {
+    x(await y, ...z);
+}
+
+async function callExpression9() {
+    x(y, ...(await z));
+}
+
+async function callExpression10() {
+    await x.a(y, z);
+}
+
+async function callExpression11() {
+    (await x.a)(y, z);
+}
+
+async function callExpression12() {
+    (await x).a(y, z);
+}
+
+async function callExpression13() {
+    x.a(await y, z);
+}
+
+async function callExpression14() {
+    x.a(y, await z);
+}
+
+async function callExpression15() {
+    await x[a](y, z);
+}
+
+async function callExpression16() {
+    (await x[a])(y, z);
+}
+
+async function callExpression17() {
+    (await x)[a](y, z);
+}
+
+async function callExpression18() {
+    x[await a](y, z);
+}
+
+async function callExpression19() {
+    x[a](await y, z);
+}
+
+async function callExpression20() {
+    x[a](y, await z);
+}
diff --git a/tests/cases/compiler/es5-asyncFunctionConditionals.ts b/tests/cases/compiler/es5-asyncFunctionConditionals.ts
new file mode 100644
index 00000000000..fbc577b9833
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionConditionals.ts
@@ -0,0 +1,16 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function conditional0() {
+    a = (await x) ? y : z;
+}
+
+async function conditional1() {
+    a = x ? await y : z;
+}
+
+async function conditional2() {
+    a = x ? y : await z;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionDoStatements.ts b/tests/cases/compiler/es5-asyncFunctionDoStatements.ts
new file mode 100644
index 00000000000..6501e27769f
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionDoStatements.ts
@@ -0,0 +1,80 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function doStatement0() {
+    do { x; } while (y);
+}
+
+async function doStatement1() {
+    do { await x; } while (y);
+}
+
+async function doStatement2() {
+    do { x; } while (await y);
+}
+
+async function doStatement3() {
+    do { continue; } while (y);
+}
+
+async function doStatement4() {
+    do { await x; continue; } while (y);
+}
+
+async function doStatement5() {
+    do { if (1) continue; await x; } while (y);
+}
+
+async function doStatement6() {
+    do { continue; } while (await y);
+}
+
+async function doStatement7() {
+    A: do { continue A; } while (y);
+}
+
+async function doStatement8() {
+    B: do { await x; continue B; } while (y);
+}
+
+async function doStatement9() {
+    C: do { if (1) continue C; await x; } while (y);
+}
+
+async function doStatement10() {
+    D: do { continue D; } while (await y);
+}
+
+async function doStatement11() {
+    do { break; } while (y);
+}
+
+async function doStatement12() {
+    do { await x; break; } while (y);
+}
+
+async function doStatement13() {
+    do { if (1) break; await x; } while (y);
+}
+
+async function doStatement14() {
+    do { break; } while (await y);
+}
+
+async function doStatement15() {
+    E: do { break E; } while (y);
+}
+
+async function doStatement16() {
+    F: do { await x; break F; } while (y);
+}
+
+async function doStatement17() {
+    G: do { if (1) break G; await x; } while (y);
+}
+
+async function doStatement18() {
+    H: do { break H; } while (await y);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionElementAccess.ts b/tests/cases/compiler/es5-asyncFunctionElementAccess.ts
new file mode 100644
index 00000000000..01372b43f5e
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionElementAccess.ts
@@ -0,0 +1,16 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function elementAccess0() {
+    z = await x[y];
+}
+
+async function elementAccess1() {
+    z = (await x)[y];
+}
+
+async function elementAccess2() {
+    z = x[await y];
+}
diff --git a/tests/cases/compiler/es5-asyncFunctionForInStatements.ts b/tests/cases/compiler/es5-asyncFunctionForInStatements.ts
new file mode 100644
index 00000000000..b1593041080
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionForInStatements.ts
@@ -0,0 +1,40 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function forInStatement0() {
+    for (x in y) { z; }
+}
+
+async function forInStatement1() {
+    for (x in await y) { z; }
+}
+
+async function forInStatement2() {
+    for (x in y) { await z; }
+}
+
+async function forInStatement3() {
+    for ((await x).a in y) { z; }
+}
+
+async function forInStatement4() {
+    for (x.a in await y) { z; }
+}
+
+async function forInStatement5() {
+    for (x.a in y) { await z; }
+}
+
+async function forInStatement6() {
+    for (var a in y) { z; }
+}
+
+async function forInStatement7() {
+    for (var b in await y) { z; }
+}
+
+async function forInStatement8() {
+    for (var c in y) { await z; }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts b/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts
new file mode 100644
index 00000000000..d741c55e31e
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionForOfStatements.ts
@@ -0,0 +1,80 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function forOfStatement0() {
+    for (x of y) { z; }
+}
+
+async function forOfStatement1() {
+    for (x of await y) { z; }
+}
+
+async function forOfStatement2() {
+    for (x of y) { await z; }
+}
+
+async function forOfStatement3() {
+    for ((await x).a of y) { z; }
+}
+
+async function forOfStatement4() {
+    for (x.a of await y) { z; }
+}
+
+async function forOfStatement5() {
+    for (x.a of y) { await z; }
+}
+
+async function forOfStatement6() {
+    for (var b of y) { z; }
+}
+
+async function forOfStatement7() {
+    for (var c of await y) { z; }
+}
+
+async function forOfStatement8() {
+    for (var d of y) { await z; }
+}
+
+async function forOfStatement9() {
+    for ([x] of await y) { z; }
+}
+
+async function forOfStatement10() {
+    for ([x] of y) { await z; }
+}
+
+async function forOfStatement11() {
+    for ([x = await a] of y) { z; }
+}
+
+async function forOfStatement12() {
+    for ([x = a] of await y) { z; }
+}
+
+async function forOfStatement13() {
+    for ([x = a] of y) { await z; }
+}
+
+async function forOfStatement14() {
+    for ({ x } of await y) { z; }
+}
+
+async function forOfStatement15() {
+    for ({ x } of y) { await z; }
+}
+
+async function forOfStatement16() {
+    for ({ x = await a } of y) { z; }
+}
+
+async function forOfStatement17() {
+    for ({ x = a } of await y) { z; }
+}
+
+async function forOfStatement18() {
+    for ({ x = a } of y) { await z; }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionForStatements.ts b/tests/cases/compiler/es5-asyncFunctionForStatements.ts
new file mode 100644
index 00000000000..4fddf395588
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionForStatements.ts
@@ -0,0 +1,32 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function forStatement0() {
+    for (x; y; z) { a; }
+}
+
+async function forStatement1() {
+    for (await x; y; z) { a; }
+}
+
+async function forStatement2() {
+    for (x; await y; z) { a; }
+}
+
+async function forStatement3() {
+    for (x; y; await z) { a; }
+}
+
+async function forStatement4() {
+    for (x; y; z) { await a; }
+}
+
+async function forStatement5() {
+    for (var b; y; z) { a; }
+}
+
+async function forStatement6() {
+    for (var c = x; y; z) { a; }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionHoisting.ts b/tests/cases/compiler/es5-asyncFunctionHoisting.ts
new file mode 100644
index 00000000000..7c05372ada9
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionHoisting.ts
@@ -0,0 +1,54 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var y;
+
+async function hoisting() {
+    var a0, a1 = 1;
+    function z() {
+        var b0, b1 = 1;
+    }
+
+    if (true) {
+        var c0, c1 = 1;
+    }
+
+    for (var a = 0; y;) {
+
+    }
+
+    for (var b in y) {
+
+    }
+
+    for (var c of y) {
+
+    }
+}
+
+async function hoistingWithAwait() {
+    var a0, a1 = 1;
+
+    function z() {
+        var b0, b1 = 1;
+    }
+
+    await 0;
+
+    if (true) {
+        var c0, c1 = 1;
+    }
+
+    for (var a = 0; y;) {
+
+    }
+
+    for (var b in y) {
+
+    }
+
+    for (var c of y) {
+
+    }
+}
+
diff --git a/tests/cases/compiler/es5-asyncFunctionIfStatements.ts b/tests/cases/compiler/es5-asyncFunctionIfStatements.ts
new file mode 100644
index 00000000000..65bda05ee79
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionIfStatements.ts
@@ -0,0 +1,16 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function ifStatement1() {
+    if (await x) { y; } else { z; }
+}
+
+async function ifStatement2() {
+    if (x) { await y; } else { z; }
+}
+
+async function ifStatement3() {
+    if (x) { y; } else { await z; }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts b/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts
new file mode 100644
index 00000000000..dd6f3126bcf
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionNestedLoops.ts
@@ -0,0 +1,16 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function nestedLoops() {
+    A: while (x) {
+        await y;
+        while (z) {
+            continue A;
+        }
+        while (a) {
+            continue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts b/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts
new file mode 100644
index 00000000000..d7f0da9f433
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionNewExpressions.ts
@@ -0,0 +1,88 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function newExpression0() {
+    await new x(y, z);
+}
+
+async function newExpression1() {
+    new (await x)(y, z);
+}
+
+async function newExpression2() {
+    new x(await y, z);
+}
+
+async function newExpression3() {
+    new x(y, await z);
+}
+
+async function newExpression4() {
+    await new x(...y, z);
+}
+
+async function newExpression5() {
+    new (await x)(...y, z);
+}
+
+async function newExpression6() {
+    new x(...(await y), z);
+}
+
+async function newExpression7() {
+    new x(...y, await z);
+}
+
+async function newExpression8() {
+    new x(await y, ...z);
+}
+
+async function newExpression9() {
+    new x(y, ...(await z));
+}
+
+async function newExpression10() {
+    await new x.a(y, z);
+}
+
+async function newExpression11() {
+    new (await x.a)(y, z);
+}
+
+async function newExpression12() {
+    new (await x).a(y, z);
+}
+
+async function newExpression13() {
+    new x.a(await y, z);
+}
+
+async function newExpression14() {
+    new x.a(y, await z);
+}
+
+async function newExpression15() {
+    await new x[a](y, z);
+}
+
+async function newExpression16() {
+    new (await x[a])(y, z);
+}
+
+async function newExpression17() {
+    new (await x)[a](y, z);
+}
+
+async function newExpression18() {
+    new x[await a](y, z);
+}
+
+async function newExpression19() {
+    new x[a](await y, z);
+}
+
+async function newExpression20() {
+    new x[a](y, await z);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts b/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts
new file mode 100644
index 00000000000..42d03f90494
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionObjectLiterals.ts
@@ -0,0 +1,53 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function objectLiteral0() {
+    x = {
+        a: await y,
+        b: z
+    };
+}
+
+async function objectLiteral1() {
+    x = {
+        a: y,
+        b: await z
+    };
+}
+
+async function objectLiteral2() {
+    x = {
+        [await a]: y,
+        b: z
+    };
+}
+
+async function objectLiteral3() {
+    x = {
+        [a]: await y,
+        b: z
+    };
+}
+
+async function objectLiteral4() {
+    x = {
+        a: await y,
+        [b]: z
+    };
+}
+
+async function objectLiteral5() {
+    x = {
+        a: y,
+        [await b]: z
+    };
+}
+
+async function objectLiteral6() {
+    x = {
+        a: y,
+        [b]: await z
+    };
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts b/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts
new file mode 100644
index 00000000000..3541c1b354b
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionPropertyAccess.ts
@@ -0,0 +1,16 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function propertyAccess0() {
+    y = await x.a;
+}
+
+async function propertyAccess1() {
+    y = (await x).a;
+}
+
+async function callExpression0() {
+    await x(y, z);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts b/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts
new file mode 100644
index 00000000000..944c61b568c
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionReturnStatements.ts
@@ -0,0 +1,29 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function returnStatement0(): Promise<any> {
+    return;
+}
+
+async function returnStatement1(): Promise<any> {
+    return x;
+}
+
+async function returnStatement2(): Promise<any> {
+    return await x;
+}
+
+async function returnStatement3(): Promise<any> {
+    { return; }
+}
+
+async function returnStatement4(): Promise<any> {
+    await x;
+    { return; }
+}
+
+async function returnStatement5(): Promise<any>{
+    { return await x; }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts b/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts
new file mode 100644
index 00000000000..b321c7115ce
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionSwitchStatements.ts
@@ -0,0 +1,70 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function switchStatement0() {
+    switch (x) {
+        case y: a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement1() {
+    switch (await x) {
+        case y: a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement2() {
+    switch (x) {
+        case await y: a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement3() {
+    switch (x) {
+        case y: await a; break;
+        default: b; break;
+    }
+}
+
+async function switchStatement4() {
+    switch (x) {
+        case y: a; break;
+        default: await b; break;
+    }
+}
+
+async function switchStatement5() {
+    switch (x) {
+        case y: a; break;
+        case await z: b; break;
+    }
+}
+
+async function switchStatement6() {
+    switch (x) {
+        default: c; break;
+        case await y: a; break;
+        case z: b; break;
+    }
+}
+
+async function switchStatement7() {
+    switch (x) {
+        default: c; break;
+        case y: a; break;
+        case await z: b; break;
+    }
+}
+
+async function switchStatement8() {
+    switch (x) {
+        default: c;
+        case y: a; break;
+        case await z: b; break;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionTryStatements.ts b/tests/cases/compiler/es5-asyncFunctionTryStatements.ts
new file mode 100644
index 00000000000..11459295f47
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionTryStatements.ts
@@ -0,0 +1,125 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function tryCatch0() {
+    var x, y;
+    try {
+        x;
+    }
+    catch (e) {
+        y;
+    }
+}
+
+async function tryCatch1() {
+    var x, y;
+    try {
+        await x;
+    }
+    catch (e) {
+        y;
+    }
+}
+
+async function tryCatch2() {
+    var x, y;
+    try {
+        x;
+    }
+    catch (e) {
+        await y;
+    }
+}
+
+async function tryCatch3(): Promise<Function> {
+    var x, y;
+    try {
+        await x;
+    }
+    catch (e) {
+        return () => e;
+    }
+}
+async function tryFinally0() {
+    var x, y;
+    try {
+        x;
+    }
+    finally {
+        y;
+    }
+}
+
+async function tryFinally1() {
+    var x, y;
+    try {
+        await x;
+    }
+    finally {
+        y;
+    }
+}
+
+async function tryFinally2() {
+    var x, y;
+    try {
+        x;
+    }
+    finally {
+        await y;
+    }
+}
+
+async function tryCatchFinally0() {
+    var x, y, z;
+    try {
+        x;
+    }
+    catch (e) {
+        y;
+    }
+    finally {
+        z;
+    }
+}
+
+async function tryCatchFinally1() {
+    var x, y, z;
+    try {
+        await x;
+    }
+    catch (e) {
+        y;
+    }
+    finally {
+        z;
+    }
+}
+
+async function tryCatchFinally2() {
+    var x, y, z;
+    try {
+        x;
+    }
+    catch (e) {
+        await y;
+    }
+    finally {
+        z;
+    }
+}
+
+async function tryCatchFinally3() {
+    var x, y, z;
+    try {
+        x;
+    }
+    catch (e) {
+        y;
+    }
+    finally {
+        await z;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts b/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts
new file mode 100644
index 00000000000..d31ab21ab7b
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionWhileStatements.ts
@@ -0,0 +1,80 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function whileStatement0() {
+    while (x) { y; }
+}
+
+async function whileStatement1() {
+    while (await x) { y; }
+}
+
+async function whileStatement2() {
+    while (x) { await y; }
+}
+
+async function whileStatement3() {
+    while (x) { continue; }
+}
+
+async function whileStatement4() {
+    while (await x) { continue; }
+}
+
+async function whileStatement5() {
+    while (x) { await y; continue; }
+}
+
+async function whileStatement6() {
+    while (x) { if (1) continue; await y; }
+}
+
+async function whileStatement7() {
+    A: while (x) { continue A; }
+}
+
+async function whileStatement8() {
+    B: while (await x) { continue B; }
+}
+
+async function whileStatement9() {
+    C: while (x) { await y; continue C; }
+}
+
+async function whileStatement10() {
+    D: while (x) { if (1) continue D; await y; }
+}
+
+async function whileStatement11() {
+    while (x) { break; }
+}
+
+async function whileStatement12() {
+    while (await x) { break; }
+}
+
+async function whileStatement13() {
+    while (x) { await y; break; }
+}
+
+async function whileStatement14() {
+    while (x) { if (1) break; await y; }
+}
+
+async function whileStatement15() {
+    E: while (x) { break E; }
+}
+
+async function whileStatement16() {
+    F: while (await x) { break F; }
+}
+
+async function whileStatement17() {
+    G: while (x) { await y; break G; }
+}
+
+async function whileStatement18() {
+    H: while (x) { if (1) break H; await y; }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-asyncFunctionWithStatements.ts b/tests/cases/compiler/es5-asyncFunctionWithStatements.ts
new file mode 100644
index 00000000000..c82901ac9fd
--- /dev/null
+++ b/tests/cases/compiler/es5-asyncFunctionWithStatements.ts
@@ -0,0 +1,34 @@
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+// @target: ES5
+declare var x, y, z, a, b, c;
+
+async function withStatement0() {
+    with (x) {
+        y;
+    }
+}
+
+async function withStatement1() {
+    with (await x) {
+        y;
+    }
+}
+
+async function withStatement2() {
+    with (x) {
+        a;
+        await y;
+        b;
+    }
+}
+
+async function withStatement3() {
+    with (x) {
+        with (z) {
+            a;
+            await y;
+            b;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts b/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
new file mode 100644
index 00000000000..87acc67a59b
--- /dev/null
+++ b/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
@@ -0,0 +1,21 @@
+// @lib: es5,es2015.promise
+// @importHelpers: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @filename: external.ts
+export async function foo() {
+}
+
+// @filename: script.ts
+async function foo() {
+}
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+export declare function __generator(body: Function): any;
\ No newline at end of file
diff --git a/tests/cases/compiler/es5ModuleInternalNamedImports.ts b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
index 05943d1c67e..62b976a7df7 100644
--- a/tests/cases/compiler/es5ModuleInternalNamedImports.ts
+++ b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
@@ -30,4 +30,8 @@ export module M {
     export {M_F as f};
     export {M_E as e};
     export {M_A as a};
+    import * as M2 from "M2";
+    import M4 from "M4";
+    export import M5 = require("M5");
 }
+import M3 from "M3";
diff --git a/tests/cases/compiler/importHelpers.ts b/tests/cases/compiler/importHelpers.ts
new file mode 100644
index 00000000000..2e15eb6352b
--- /dev/null
+++ b/tests/cases/compiler/importHelpers.ts
@@ -0,0 +1,37 @@
+// @importHelpers: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @filename: external.ts
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: script.ts
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/importHelpersAmd.ts b/tests/cases/compiler/importHelpersAmd.ts
new file mode 100644
index 00000000000..bef63328d52
--- /dev/null
+++ b/tests/cases/compiler/importHelpersAmd.ts
@@ -0,0 +1,17 @@
+// @importHelpers: true
+// @target: es5
+// @module: amd
+// @filename: a.ts
+export class A { }
+
+// @filename: b.ts
+import { A } from "./a";
+export class B extends A { }
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/importHelpersES6.ts b/tests/cases/compiler/importHelpersES6.ts
new file mode 100644
index 00000000000..9be680a88d6
--- /dev/null
+++ b/tests/cases/compiler/importHelpersES6.ts
@@ -0,0 +1,16 @@
+// @importHelpers: true
+// @target: es6
+// @experimentalDecorators: true
+// @filename: a.ts
+declare var dec: any;
+@dec export class A {
+
+}
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/importHelpersInIsolatedModules.ts b/tests/cases/compiler/importHelpersInIsolatedModules.ts
new file mode 100644
index 00000000000..4c1dfd06ec0
--- /dev/null
+++ b/tests/cases/compiler/importHelpersInIsolatedModules.ts
@@ -0,0 +1,38 @@
+// @importHelpers: true
+// @isolatedModules: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @filename: external.ts
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: script.ts
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/importHelpersInTsx.tsx b/tests/cases/compiler/importHelpersInTsx.tsx
new file mode 100644
index 00000000000..32e0e5bf3a0
--- /dev/null
+++ b/tests/cases/compiler/importHelpersInTsx.tsx
@@ -0,0 +1,24 @@
+// @importHelpers: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @jsx: react
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @filename: external.tsx
+declare var React: any;
+declare var o: any;
+export const x = <span {...o} />
+
+// @filename: script.tsx
+declare var React: any;
+declare var o: any;
+const x = <span {...o} />
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/importHelpersNoHelpers.ts b/tests/cases/compiler/importHelpersNoHelpers.ts
new file mode 100644
index 00000000000..82428552548
--- /dev/null
+++ b/tests/cases/compiler/importHelpersNoHelpers.ts
@@ -0,0 +1,32 @@
+// @importHelpers: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @filename: external.ts
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: script.ts
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: tslib.d.ts
+export {}
\ No newline at end of file
diff --git a/tests/cases/compiler/importHelpersNoModule.ts b/tests/cases/compiler/importHelpersNoModule.ts
new file mode 100644
index 00000000000..e824f2afb48
--- /dev/null
+++ b/tests/cases/compiler/importHelpersNoModule.ts
@@ -0,0 +1,29 @@
+// @importHelpers: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @filename: external.ts
+export class A { }
+export class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
+
+// @filename: script.ts
+class A { }
+class B extends A { }
+
+declare var dec: any;
+
+@dec
+class C {
+    method(@dec x: number) {
+    }
+}
diff --git a/tests/cases/compiler/importHelpersOutFile.ts b/tests/cases/compiler/importHelpersOutFile.ts
new file mode 100644
index 00000000000..69e1e692617
--- /dev/null
+++ b/tests/cases/compiler/importHelpersOutFile.ts
@@ -0,0 +1,22 @@
+// @importHelpers: true
+// @target: es5
+// @module: amd
+// @outfile: out.js
+// @filename: a.ts
+export class A { }
+
+// @filename: b.ts
+import { A } from "./a";
+export class B extends A { }
+
+// @filename: c.ts
+import { A } from "./a";
+export class C extends A { }
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/importHelpersSystem.ts b/tests/cases/compiler/importHelpersSystem.ts
new file mode 100644
index 00000000000..5b6081f17f3
--- /dev/null
+++ b/tests/cases/compiler/importHelpersSystem.ts
@@ -0,0 +1,17 @@
+// @importHelpers: true
+// @target: es5
+// @module: system
+// @filename: a.ts
+export class A { }
+
+// @filename: b.ts
+import { A } from "./a";
+export class B extends A { }
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __assign(t: any, ...sources: any[]): any;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
diff --git a/tests/cases/compiler/optionsOutAndNoModuleGen.ts b/tests/cases/compiler/optionsOutAndNoModuleGen.ts
new file mode 100644
index 00000000000..b0a7cf22d21
--- /dev/null
+++ b/tests/cases/compiler/optionsOutAndNoModuleGen.ts
@@ -0,0 +1,3 @@
+// @out: output.js
+
+export var x = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives11.ts b/tests/cases/compiler/typeReferenceDirectives11.ts
index 8b56459cd69..8763c9f0458 100644
--- a/tests/cases/compiler/typeReferenceDirectives11.ts
+++ b/tests/cases/compiler/typeReferenceDirectives11.ts
@@ -4,6 +4,7 @@
 // @traceResolution: true
 // @types: lib
 // @out: output.js
+
 // @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
diff --git a/tests/cases/compiler/typeReferenceDirectives12.ts b/tests/cases/compiler/typeReferenceDirectives12.ts
index f1abe27f05f..3273c9b7276 100644
--- a/tests/cases/compiler/typeReferenceDirectives12.ts
+++ b/tests/cases/compiler/typeReferenceDirectives12.ts
@@ -3,6 +3,7 @@
 // @typeRoots: /types
 // @traceResolution: true
 // @out: output.js
+
 // @currentDirectory: /
 
 // @filename: /types/lib/index.d.ts
diff --git a/tests/cases/compiler/typeRootsFromMultipleNodeModulesDirectories.ts b/tests/cases/compiler/typeRootsFromMultipleNodeModulesDirectories.ts
new file mode 100644
index 00000000000..b7f194706a8
--- /dev/null
+++ b/tests/cases/compiler/typeRootsFromMultipleNodeModulesDirectories.ts
@@ -0,0 +1,27 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @currentDirectory: /src
+
+// @Filename: /node_modules/@types/dopey/index.d.ts
+declare module "xyz" {
+    export const x: number;
+}
+
+// @Filename: /foo/node_modules/@types/grumpy/index.d.ts
+declare module "pdq" {
+    export const y: number; 
+}
+
+// @Filename: /foo/node_modules/@types/sneezy/index.d.ts
+declare module "abc" {
+    export const z: number;
+}
+
+// @Filename: /foo/bar/a.ts
+import { x } from "xyz";
+import { y } from "pdq";
+import { z } from "abc";
+x + y + z;
+
+// @Filename: /foo/bar/tsconfig.json
+{}
diff --git a/tests/cases/compiler/typeRootsFromNodeModulesInParentDirectory.ts b/tests/cases/compiler/typeRootsFromNodeModulesInParentDirectory.ts
new file mode 100644
index 00000000000..59b7d6a3188
--- /dev/null
+++ b/tests/cases/compiler/typeRootsFromNodeModulesInParentDirectory.ts
@@ -0,0 +1,15 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @currentDirectory: /src
+
+// @Filename: /node_modules/@types/foo/index.d.ts
+declare module "xyz" {
+    export const x: number;
+}
+
+// @Filename: /src/a.ts
+import { x } from "xyz";
+x;
+
+// @Filename: /src/tsconfig.json
+{}
diff --git a/tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts b/tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts
new file mode 100644
index 00000000000..5ab13f88b36
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+type PromiseAlias<T> = Promise<T>;
+
+async function f(): PromiseAlias<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts
new file mode 100644
index 00000000000..e6bb588b2b0
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+const x = async => async;
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction10_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction10_es5.ts
new file mode 100644
index 00000000000..14540c2a232
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction10_es5.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+var foo = async (): Promise<void> => {
+   // Legal to use 'await' in a type context.
+   var v: await;
+}
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction1_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction1_es5.ts
new file mode 100644
index 00000000000..d2aaea2a481
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction1_es5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+var foo = async (): Promise<void> => {
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts
new file mode 100644
index 00000000000..120b5127a00
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction2_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+var f = (await) => {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts
new file mode 100644
index 00000000000..810d7bc7e05
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction3_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+function f(await = await) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction4_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction4_es5.ts
new file mode 100644
index 00000000000..e6b2bab3c79
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction4_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+var await = () => {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts
new file mode 100644
index 00000000000..728e2e8ee72
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction5_es5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+var foo = async (await): Promise<void> => {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction6_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction6_es5.ts
new file mode 100644
index 00000000000..41e26b2e695
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction6_es5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+var foo = async (a = await): Promise<void> => {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction7_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction7_es5.ts
new file mode 100644
index 00000000000..f99ea629dd6
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction7_es5.ts
@@ -0,0 +1,9 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+var bar = async (): Promise<void> => {
+  // 'await' here is an identifier, and not an await expression.
+  var foo = async (a = await): Promise<void> => {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction8_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction8_es5.ts
new file mode 100644
index 00000000000..4331a1c151a
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction8_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+var foo = async (): Promise<void> => {
+  var v = { [await]: foo }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts
new file mode 100644
index 00000000000..7f1e072a3f2
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+var foo = async (a = await => await): Promise<void> => {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5.ts
new file mode 100644
index 00000000000..4a800c1c2ce
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5.ts
@@ -0,0 +1,9 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class C {
+   method() {
+      function other() {}
+      var fn = async () => await other.apply(this, arguments);
+   }
+}
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5.ts
new file mode 100644
index 00000000000..e863af24490
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class C {
+   method() {
+      var fn = async () => await this;
+   }
+}
diff --git a/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts
new file mode 100644
index 00000000000..7db76c57084
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+
+declare function someOtherFunction(i: any): Promise<void>;
+const x = async i => await someOtherFunction(i)
+const x1 = async (i) => await someOtherFunction(i);
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts b/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts
new file mode 100644
index 00000000000..4ee04b2b3e9
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts
@@ -0,0 +1,42 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @isolatedModules: true
+import { MyPromise } from "missing";
+
+declare var p: Promise<number>;
+declare var mp: MyPromise<number>;
+
+async function f0() { }
+async function f1(): Promise<void> { }
+async function f3(): MyPromise<void> { }
+
+let f4 = async function() { }
+let f5 = async function(): Promise<void> { }
+let f6 = async function(): MyPromise<void> { }
+
+let f7 = async () => { };
+let f8 = async (): Promise<void> => { };
+let f9 = async (): MyPromise<void> => { };
+let f10 = async () => p;
+let f11 = async () => mp;
+let f12 = async (): Promise<number> => mp;
+let f13 = async (): MyPromise<number> => p;
+
+let o = {
+	async m1() { },
+	async m2(): Promise<void> { },
+	async m3(): MyPromise<void> { }
+};
+
+class C {
+	async m1() { }
+	async m2(): Promise<void> { }
+	async m3(): MyPromise<void> { }
+	static async m4() { }
+	static async m5(): Promise<void> { }
+	static async m6(): MyPromise<void> { }
+}
+
+module M {
+	export async function f1() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncAwait_es5.ts b/tests/cases/conformance/async/es5/asyncAwait_es5.ts
new file mode 100644
index 00000000000..88cda3201dc
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncAwait_es5.ts
@@ -0,0 +1,41 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+type MyPromise<T> = Promise<T>;
+declare var MyPromise: typeof Promise;
+declare var p: Promise<number>;
+declare var mp: MyPromise<number>;
+
+async function f0() { }
+async function f1(): Promise<void> { }
+async function f3(): MyPromise<void> { }
+
+let f4 = async function() { }
+let f5 = async function(): Promise<void> { }
+let f6 = async function(): MyPromise<void> { }
+
+let f7 = async () => { };
+let f8 = async (): Promise<void> => { };
+let f9 = async (): MyPromise<void> => { };
+let f10 = async () => p;
+let f11 = async () => mp;
+let f12 = async (): Promise<number> => mp;
+let f13 = async (): MyPromise<number> => p;
+
+let o = {
+	async m1() { },
+	async m2(): Promise<void> { },
+	async m3(): MyPromise<void> { }
+};
+
+class C {
+	async m1() { }
+	async m2(): Promise<void> { }
+	async m3(): MyPromise<void> { }
+	static async m4() { }
+	static async m5(): Promise<void> { }
+	static async m6(): MyPromise<void> { }
+}
+
+module M {
+	export async function f1() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncClass_es5.ts b/tests/cases/conformance/async/es5/asyncClass_es5.ts
new file mode 100644
index 00000000000..70f32702bd0
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncClass_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncConstructor_es5.ts b/tests/cases/conformance/async/es5/asyncConstructor_es5.ts
new file mode 100644
index 00000000000..57cb07561b9
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncConstructor_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class C {
+  async constructor() {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncDeclare_es5.ts b/tests/cases/conformance/async/es5/asyncDeclare_es5.ts
new file mode 100644
index 00000000000..aad035337d3
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncDeclare_es5.ts
@@ -0,0 +1,4 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare async function foo(): Promise<void>;
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncEnum_es5.ts b/tests/cases/conformance/async/es5/asyncEnum_es5.ts
new file mode 100644
index 00000000000..7f0060bf04f
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncEnum_es5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async enum E {
+  Value
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncGetter_es5.ts b/tests/cases/conformance/async/es5/asyncGetter_es5.ts
new file mode 100644
index 00000000000..8c12c4f3462
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncGetter_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class C {
+  async get foo() {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncImportedPromise_es5.ts b/tests/cases/conformance/async/es5/asyncImportedPromise_es5.ts
new file mode 100644
index 00000000000..9e8494b3c2f
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncImportedPromise_es5.ts
@@ -0,0 +1,11 @@
+// @target: es5
+// @lib: es5,es2015.promise
+// @module: commonjs
+// @filename: task.ts
+export class Task<T> extends Promise<T> { }
+
+// @filename: test.ts
+import { Task } from "./task";
+class Test {
+    async example<T>(): Task<T> { return; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncInterface_es5.ts b/tests/cases/conformance/async/es5/asyncInterface_es5.ts
new file mode 100644
index 00000000000..7ac70f40a69
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncInterface_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async interface I {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncMethodWithSuper_es5.ts b/tests/cases/conformance/async/es5/asyncMethodWithSuper_es5.ts
new file mode 100644
index 00000000000..496d8d1c802
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncMethodWithSuper_es5.ts
@@ -0,0 +1,53 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class A {
+    x() {
+    }
+}
+
+class B extends A {
+    // async method with only call/get on 'super' does not require a binding
+    async simple() {
+        // call with property access
+        super.x();
+
+        // call with element access
+        super["x"]();
+
+        // property access (read)
+        const a = super.x;
+
+        // element access (read)
+        const b = super["x"];
+    }
+
+    // async method with assignment/destructuring on 'super' requires a binding
+    async advanced() {
+        const f = () => {};
+
+        // call with property access
+        super.x();
+
+        // call with element access
+        super["x"]();
+
+        // property access (read)
+        const a = super.x;
+
+        // element access (read)
+        const b = super["x"];
+
+        // property access (assign)
+        super.x = f;
+
+        // element access (assign)
+        super["x"] = f;
+
+        // destructuring assign with property access
+        ({ f: super.x } = { f });
+
+        // destructuring assign with element access
+        ({ f: super["x"] } = { f });
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncModule_es5.ts b/tests/cases/conformance/async/es5/asyncModule_es5.ts
new file mode 100644
index 00000000000..55df9f89dc3
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncModule_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async module M {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncMultiFile_es5.ts b/tests/cases/conformance/async/es5/asyncMultiFile_es5.ts
new file mode 100644
index 00000000000..66d4f4e673f
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncMultiFile_es5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+// @lib: es5,es2015.promise
+// @filename: a.ts
+async function f() {}
+// @filename: b.ts
+function g() { }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncQualifiedReturnType_es5.ts b/tests/cases/conformance/async/es5/asyncQualifiedReturnType_es5.ts
new file mode 100644
index 00000000000..34fc1b13389
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncQualifiedReturnType_es5.ts
@@ -0,0 +1,10 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+namespace X {
+    export class MyPromise<T> extends Promise<T> {
+    }
+}
+
+async function f(): X.MyPromise<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncSetter_es5.ts b/tests/cases/conformance/async/es5/asyncSetter_es5.ts
new file mode 100644
index 00000000000..419922b0806
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncSetter_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class C {
+  async set foo(value) {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/asyncUseStrict_es5.ts b/tests/cases/conformance/async/es5/asyncUseStrict_es5.ts
new file mode 100644
index 00000000000..cc20d594de5
--- /dev/null
+++ b/tests/cases/conformance/async/es5/asyncUseStrict_es5.ts
@@ -0,0 +1,9 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+async function func(): Promise<void> {
+    "use strict";
+    var b = await p || a;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5.ts b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5.ts
new file mode 100644
index 00000000000..3ef62d83bf8
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5.ts
@@ -0,0 +1,12 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = await p || a;
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5.ts b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5.ts
new file mode 100644
index 00000000000..07d9bfd2214
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5.ts
@@ -0,0 +1,12 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = await p && a;
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5.ts b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5.ts
new file mode 100644
index 00000000000..1acb6930b49
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5.ts
@@ -0,0 +1,12 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: number;
+declare var p: Promise<number>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = await p + a;
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5.ts b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5.ts
new file mode 100644
index 00000000000..44c1f643156
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5.ts
@@ -0,0 +1,12 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = (await p, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5.ts b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5.ts
new file mode 100644
index 00000000000..9e29c5d6cef
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5.ts
@@ -0,0 +1,13 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var o: { a: boolean; };
+    o.a = await p;
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression1_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression1_es5.ts
new file mode 100644
index 00000000000..8f133327c02
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression1_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = fn(a, a, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression2_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression2_es5.ts
new file mode 100644
index 00000000000..b6949b97fcf
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression2_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = fn(await p, a, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression3_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression3_es5.ts
new file mode 100644
index 00000000000..10eef215ccc
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression3_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = fn(a, await p, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression4_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression4_es5.ts
new file mode 100644
index 00000000000..9e2159e5730
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression4_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = (await pfn)(a, a, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression5_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression5_es5.ts
new file mode 100644
index 00000000000..19415c30de5
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression5_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = o.fn(a, a, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression6_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression6_es5.ts
new file mode 100644
index 00000000000..23804c47a32
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression6_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = o.fn(await p, a, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression7_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression7_es5.ts
new file mode 100644
index 00000000000..5227f480c8e
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression7_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = o.fn(a, await p, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression8_es5.ts b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression8_es5.ts
new file mode 100644
index 00000000000..ab47d34aac0
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitCallExpression/awaitCallExpression8_es5.ts
@@ -0,0 +1,16 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
+declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
+declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
+async function func(): Promise<void> {
+    before();
+    var b = (await po).fn(a, a, a);
+    after();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitClassExpression_es5.ts b/tests/cases/conformance/async/es5/awaitClassExpression_es5.ts
new file mode 100644
index 00000000000..27eafeb1af5
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitClassExpression_es5.ts
@@ -0,0 +1,10 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare class C { }
+declare var p: Promise<typeof C>;
+
+async function func(): Promise<void> {
+    class D extends (await p) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/awaitUnion_es5.ts b/tests/cases/conformance/async/es5/awaitUnion_es5.ts
new file mode 100644
index 00000000000..44ceb1374d6
--- /dev/null
+++ b/tests/cases/conformance/async/es5/awaitUnion_es5.ts
@@ -0,0 +1,15 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare let a: number | string;
+declare let b: PromiseLike<number> | PromiseLike<string>;
+declare let c: PromiseLike<number | string>;
+declare let d: number | PromiseLike<string>;
+declare let e: number | PromiseLike<number | string>;
+async function f() {
+	let await_a = await a;
+	let await_b = await b;
+	let await_c = await c;
+	let await_d = await d;
+	let await_e = await e;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts
new file mode 100644
index 00000000000..f1cb80162bd
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(a = await => await): Promise<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts
new file mode 100644
index 00000000000..8edf36f9a2f
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function await(): Promise<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts
new file mode 100644
index 00000000000..4601fba6ea2
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration12_es5.ts
@@ -0,0 +1,4 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+var v = async function await(): Promise<void> { }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5.ts
new file mode 100644
index 00000000000..2b70bc4c641
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(): Promise<void> {
+   // Legal to use 'await' in a type context.
+   var v: await;
+}
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts
new file mode 100644
index 00000000000..eedfd438b7c
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(): Promise<void> {
+  return;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts
new file mode 100644
index 00000000000..373677bf58f
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration15_es5.ts
@@ -0,0 +1,26 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+declare class Thenable { then(): void; }
+declare let a: any;
+declare let obj: { then: string; };
+declare let thenable: Thenable;
+async function fn1() { } // valid: Promise<void>
+async function fn2(): { } { } // error
+async function fn3(): any { } // error
+async function fn4(): number { } // error
+async function fn5(): PromiseLike<void> { } // error
+async function fn6(): Thenable { } // error
+async function fn7() { return; } // valid: Promise<void>
+async function fn8() { return 1; } // valid: Promise<number>
+async function fn9() { return null; } // valid: Promise<any>
+async function fn10() { return undefined; } // valid: Promise<any>
+async function fn11() { return a; } // valid: Promise<any>
+async function fn12() { return obj; } // valid: Promise<{ then: string; }>
+async function fn13() { return thenable; } // error
+async function fn14() { await 1; } // valid: Promise<void>
+async function fn15() { await null; } // valid: Promise<void>
+async function fn16() { await undefined; } // valid: Promise<void>
+async function fn17() { await a; } // valid: Promise<void>
+async function fn18() { await obj; } // valid: Promise<void>
+async function fn19() { await thenable; } // error
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts
new file mode 100644
index 00000000000..1448b335992
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(): Promise<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts
new file mode 100644
index 00000000000..b1e337938e0
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+function f(await) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts
new file mode 100644
index 00000000000..810d7bc7e05
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+function f(await = await) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5.ts
new file mode 100644
index 00000000000..40bd69d592f
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+function await() {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts
new file mode 100644
index 00000000000..3c71741da14
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration5_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(await): Promise<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration6_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration6_es5.ts
new file mode 100644
index 00000000000..34ff3b3c4c5
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration6_es5.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(a = await): Promise<void> {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts
new file mode 100644
index 00000000000..53d7bc5edb5
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function bar(): Promise<void> {
+  // 'await' here is an identifier, and not a yield expression.
+  async function foo(a = await): Promise<void> {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts
new file mode 100644
index 00000000000..27db170b080
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5.ts
@@ -0,0 +1,4 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+var v = { [await]: foo }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration9_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration9_es5.ts
new file mode 100644
index 00000000000..7a1130f8abf
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration9_es5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+async function foo(): Promise<void> {
+  var v = { [await]: foo }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5.ts b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5.ts
new file mode 100644
index 00000000000..b5c82688ddf
--- /dev/null
+++ b/tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5.ts
@@ -0,0 +1,11 @@
+// @target: ES5
+// @lib: es5,es2015.promise
+// @noEmitHelpers: true
+class C {
+   method() {
+      function other() {}
+      async function fn () {
+           await other.apply(this, arguments);
+      }
+   }
+}
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
similarity index 100%
rename from tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts
rename to tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
index 0959ed6c561..1d7f6e3079e 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
@@ -1,7 +1,7 @@
 // @target: ES6
 // @noEmitHelpers: true
 
-var foo = async foo(): Promise<void> => {
+var foo = async (): Promise<void> => {
    // Legal to use 'await' in a type context.
    var v: await;
 }
diff --git a/tests/cases/conformance/async/es6/asyncMultiFile.ts b/tests/cases/conformance/async/es6/asyncMultiFile_es6.ts
similarity index 100%
rename from tests/cases/conformance/async/es6/asyncMultiFile.ts
rename to tests/cases/conformance/async/es6/asyncMultiFile_es6.ts
diff --git a/tests/cases/conformance/async/es6/asyncUseStrict_es6.ts b/tests/cases/conformance/async/es6/asyncUseStrict_es6.ts
new file mode 100644
index 00000000000..b3948daf384
--- /dev/null
+++ b/tests/cases/conformance/async/es6/asyncUseStrict_es6.ts
@@ -0,0 +1,8 @@
+// @target: ES6
+// @noEmitHelpers: true
+declare var a: boolean;
+declare var p: Promise<boolean>;
+async function func(): Promise<void> {
+    "use strict";
+    var b = await p || a;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts
index 46060f309b2..da7c0d09142 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p || a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts
index 362f1ecc446..a81f50c51ef 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p && a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts
index d3b02033252..3ba0fa7ef07 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: number;
 declare var p: Promise<number>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p + a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts
index eba3be31acf..c5c007a1483 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
-    var b = await p, a;
-    "after";
+    before();
+    var b = (await p, a);
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts
index 71b173f9e73..91fbc3cd17b 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts
@@ -2,9 +2,11 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var o: { a: boolean; };
     o.a = await p;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts
index d0442f0968d..6a73dcca453 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts
index 6de07ef12ff..dd4c8a2d4d9 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(await p, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts
index 2cc0b7b12d0..01d29cd5163 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, await p, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts
index 8e349fbc5c3..1a57debb6b1 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await pfn)(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts
index bbe81ac94b1..2a24fe28df4 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts
index 09e88f5acbc..e2d0877a39b 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(await p, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts
index fe0182da4aa..f309874232d 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, await p, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts
index e3280eb7c10..ccd82ffef2f 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await po).fn(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitClassExpression_es6.ts b/tests/cases/conformance/async/es6/awaitClassExpression_es6.ts
new file mode 100644
index 00000000000..f503985ba94
--- /dev/null
+++ b/tests/cases/conformance/async/es6/awaitClassExpression_es6.ts
@@ -0,0 +1,9 @@
+// @target: ES6
+// @noEmitHelpers: true
+declare class C { }
+declare var p: Promise<typeof C>;
+
+async function func(): Promise<void> {
+    class D extends (await p) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitUnion_es6.ts b/tests/cases/conformance/async/es6/awaitUnion_es6.ts
index a132ae01dfd..1618ea28a86 100644
--- a/tests/cases/conformance/async/es6/awaitUnion_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitUnion_es6.ts
@@ -10,5 +10,5 @@ async function f() {
 	let await_b = await b;
 	let await_c = await c;
 	let await_d = await d;
-	let await_e = await e; 
+	let await_e = await e;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts
new file mode 100644
index 00000000000..dece1cc992c
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts
@@ -0,0 +1,16 @@
+// @target: es5
+// @module: commonjs
+// @experimentaldecorators: true
+
+// @Filename: 0.ts
+export class base { }
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+
+// @Filename: 2.ts
+import {base} from "./0.ts"
+import {foo} from "./0.ts"
+export class C  extends base{
+    constructor(@foo prop: any) {
+        super();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts
new file mode 100644
index 00000000000..ca89b65a7ac
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts
@@ -0,0 +1,18 @@
+// @target: es5
+// @module: commonjs
+// @experimentaldecorators: true
+
+// @Filename: 0.ts
+export class base { }
+export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+
+// @Filename: 2.ts
+import {base} from "./0"
+import {foo} from "./0"
+
+/* Comment on the Class Declaration */
+export class C  extends base{
+    constructor(@foo prop: any) {
+        super();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/templates/templateStringWithEmbeddedCommentsES6.ts b/tests/cases/conformance/es6/templates/templateStringWithEmbeddedCommentsES6.ts
index 2cb295bbfeb..974aaec5a57 100644
--- a/tests/cases/conformance/es6/templates/templateStringWithEmbeddedCommentsES6.ts
+++ b/tests/cases/conformance/es6/templates/templateStringWithEmbeddedCommentsES6.ts
@@ -1,4 +1,5 @@
-`head${ // single line comment
+// @target: ES6
+`head${ // single line comment
 10
 }
 middle${
diff --git a/tests/cases/conformance/fixSignatureCaching.ts b/tests/cases/conformance/fixSignatureCaching.ts
new file mode 100644
index 00000000000..e9f3f3e3be5
--- /dev/null
+++ b/tests/cases/conformance/fixSignatureCaching.ts
@@ -0,0 +1,985 @@
+// Repro from #10697
+
+(function (define, undefined) {
+define(function () {
+    'use strict';
+
+    var impl = {};
+
+    impl.mobileDetectRules = {
+    "phones": {
+        "iPhone": "\\biPhone\\b|\\biPod\\b",
+        "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",
+        "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",
+        "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",
+        "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",
+        "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",
+        "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",
+        "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",
+        "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",
+        "Asus": "Asus.*Galaxy|PadFone.*Mobile",
+        "NokiaLumia": "Lumia [0-9]{3,4}",
+        "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",
+        "Palm": "PalmSource|Palm",
+        "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",
+        "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",
+        "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",
+        "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",
+        "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",
+        "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",
+        "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",
+        "Alcatel": "Alcatel",
+        "Nintendo": "Nintendo 3DS",
+        "Amoi": "Amoi",
+        "INQ": "INQ",
+        "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
+    },
+    "tablets": {
+        "iPad": "iPad|iPad.*Mobile",
+        "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",
+        "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",
+        "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",
+        "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",
+        "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",
+        "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",
+        "BlackBerryTablet": "PlayBook|RIM Tablet",
+        "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",
+        "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",
+        "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",
+        "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",
+        "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",
+        "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",
+        "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",
+        "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",
+        "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",
+        "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",
+        "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",
+        "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",
+        "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",
+        "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",
+        "IRUTablet": "M702pro",
+        "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",
+        "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",
+        "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",
+        "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",
+        "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",
+        "NokiaLumiaTablet": "Lumia 2520",
+        "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",
+        "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",
+        "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",
+        "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",
+        "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",
+        "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",
+        "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",
+        "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",
+        "FlyTablet": "IQ310|Fly Vision",
+        "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",
+        "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",
+        "NecTablet": "\\bN-06D|\\bN-08D",
+        "PantechTablet": "Pantech.*P4100",
+        "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",
+        "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",
+        "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",
+        "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",
+        "NabiTablet": "Android.*\\bNabi",
+        "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",
+        "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",
+        "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",
+        "PlaystationTablet": "Playstation.*(Portable|Vita)",
+        "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",
+        "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",
+        "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",
+        "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",
+        "GalapadTablet": "Android.*\\bG1\\b",
+        "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",
+        "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",
+        "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",
+        "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",
+        "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",
+        "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",
+        "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",
+        "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",
+        "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",
+        "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",
+        "DPSTablet": "DPS Dream 9|DPS Dual 7",
+        "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",
+        "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",
+        "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",
+        "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",
+        "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",
+        "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",
+        "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",
+        "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",
+        "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",
+        "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",
+        "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",
+        "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",
+        "iMobileTablet": "i-mobile i-note",
+        "TolinoTablet": "tolino tab [0-9.]+|tolino shine",
+        "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",
+        "AMPETablet": "Android.* A78 ",
+        "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",
+        "TecnoTablet": "TECNO P9",
+        "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",
+        "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",
+        "FX2Tablet": "FX2 PAD7|FX2 PAD10",
+        "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",
+        "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",
+        "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",
+        "CaptivaTablet": "CAPTIVA PAD",
+        "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",
+        "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",
+        "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",
+        "JaytechTablet": "TPC-PA762",
+        "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",
+        "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",
+        "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",
+        "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",
+        "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",
+        "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",
+        "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",
+        "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",
+        "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",
+        "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",
+        "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",
+        "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",
+        "UbislateTablet": "UbiSlate[\\s]?7C",
+        "PocketBookTablet": "Pocketbook",
+        "KocasoTablet": "\\b(TB-1207)\\b",
+        "Hudl": "Hudl HT7S3|Hudl 2",
+        "TelstraTablet": "T-Hub2",
+        "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
+    },
+    "oss": {
+        "AndroidOS": "Android",
+        "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",
+        "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",
+        "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",
+        "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",
+        "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",
+        "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",
+        "MeeGoOS": "MeeGo",
+        "MaemoOS": "Maemo",
+        "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",
+        "webOS": "webOS|hpwOS",
+        "badaOS": "\\bBada\\b",
+        "BREWOS": "BREW"
+    },
+    "uas": {
+        "Vivaldi": "Vivaldi",
+        "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",
+        "Dolfin": "\\bDolfin\\b",
+        "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",
+        "Skyfire": "Skyfire",
+        "Edge": "Mobile Safari\/[.0-9]* Edge",
+        "IE": "IEMobile|MSIEMobile",
+        "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",
+        "Bolt": "bolt",
+        "TeaShark": "teashark",
+        "Blazer": "Blazer",
+        "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",
+        "Tizen": "Tizen",
+        "UCBrowser": "UC.*Browser|UCWEB",
+        "baiduboxapp": "baiduboxapp",
+        "baidubrowser": "baidubrowser",
+        "DiigoBrowser": "DiigoBrowser",
+        "Puffin": "Puffin",
+        "Mercury": "\\bMercury\\b",
+        "ObigoBrowser": "Obigo",
+        "NetFront": "NF-Browser",
+        "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",
+        "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"
+    },
+    "props": {
+        "Mobile": "Mobile\/[VER]",
+        "Build": "Build\/[VER]",
+        "Version": "Version\/[VER]",
+        "VendorID": "VendorID\/[VER]",
+        "iPad": "iPad.*CPU[a-z ]+[VER]",
+        "iPhone": "iPhone.*CPU[a-z ]+[VER]",
+        "iPod": "iPod.*CPU[a-z ]+[VER]",
+        "Kindle": "Kindle\/[VER]",
+        "Chrome": [
+            "Chrome\/[VER]",
+            "CriOS\/[VER]",
+            "CrMo\/[VER]"
+        ],
+        "Coast": [
+            "Coast\/[VER]"
+        ],
+        "Dolfin": "Dolfin\/[VER]",
+        "Firefox": "Firefox\/[VER]",
+        "Fennec": "Fennec\/[VER]",
+        "Edge": "Edge\/[VER]",
+        "IE": [
+            "IEMobile\/[VER];",
+            "IEMobile [VER]",
+            "MSIE [VER];",
+            "Trident\/[0-9.]+;.*rv:[VER]"
+        ],
+        "NetFront": "NetFront\/[VER]",
+        "NokiaBrowser": "NokiaBrowser\/[VER]",
+        "Opera": [
+            " OPR\/[VER]",
+            "Opera Mini\/[VER]",
+            "Version\/[VER]"
+        ],
+        "Opera Mini": "Opera Mini\/[VER]",
+        "Opera Mobi": "Version\/[VER]",
+        "UC Browser": "UC Browser[VER]",
+        "MQQBrowser": "MQQBrowser\/[VER]",
+        "MicroMessenger": "MicroMessenger\/[VER]",
+        "baiduboxapp": "baiduboxapp\/[VER]",
+        "baidubrowser": "baidubrowser\/[VER]",
+        "Iron": "Iron\/[VER]",
+        "Safari": [
+            "Version\/[VER]",
+            "Safari\/[VER]"
+        ],
+        "Skyfire": "Skyfire\/[VER]",
+        "Tizen": "Tizen\/[VER]",
+        "Webkit": "webkit[ \/][VER]",
+        "PaleMoon": "PaleMoon\/[VER]",
+        "Gecko": "Gecko\/[VER]",
+        "Trident": "Trident\/[VER]",
+        "Presto": "Presto\/[VER]",
+        "Goanna": "Goanna\/[VER]",
+        "iOS": " \\bi?OS\\b [VER][ ;]{1}",
+        "Android": "Android [VER]",
+        "BlackBerry": [
+            "BlackBerry[\\w]+\/[VER]",
+            "BlackBerry.*Version\/[VER]",
+            "Version\/[VER]"
+        ],
+        "BREW": "BREW [VER]",
+        "Java": "Java\/[VER]",
+        "Windows Phone OS": [
+            "Windows Phone OS [VER]",
+            "Windows Phone [VER]"
+        ],
+        "Windows Phone": "Windows Phone [VER]",
+        "Windows CE": "Windows CE\/[VER]",
+        "Windows NT": "Windows NT [VER]",
+        "Symbian": [
+            "SymbianOS\/[VER]",
+            "Symbian\/[VER]"
+        ],
+        "webOS": [
+            "webOS\/[VER]",
+            "hpwOS\/[VER];"
+        ]
+    },
+    "utils": {
+        "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",
+        "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",
+        "DesktopMode": "WPDesktop",
+        "TV": "SonyDTV|HbbTV",
+        "WebKit": "(webkit)[ \/]([\\w.]+)",
+        "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",
+        "Watch": "SM-V700"
+    }
+};
+
+    // following patterns come from http://detectmobilebrowsers.com/
+    impl.detectMobileBrowsers = {
+        fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i,
+        shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i,
+        tabletPattern: /android|ipad|playbook|silk/i
+    };
+
+    var hasOwnProp = Object.prototype.hasOwnProperty,
+        isArray;
+
+    impl.FALLBACK_PHONE = 'UnknownPhone';
+    impl.FALLBACK_TABLET = 'UnknownTablet';
+    impl.FALLBACK_MOBILE = 'UnknownMobile';
+
+    isArray = ('isArray' in Array) ?
+        Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; };
+
+    function equalIC(a, b) {
+        return a != null && b != null && a.toLowerCase() === b.toLowerCase();
+    }
+
+    function containsIC(array, value) {
+        var valueLC, i, len = array.length;
+        if (!len || !value) {
+            return false;
+        }
+        valueLC = value.toLowerCase();
+        for (i = 0; i < len; ++i) {
+            if (valueLC === array[i].toLowerCase()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function convertPropsToRegExp(object) {
+        for (var key in object) {
+            if (hasOwnProp.call(object, key)) {
+                object[key] = new RegExp(object[key], 'i');
+            }
+        }
+    }
+
+    (function init() {
+        var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules;
+        for (key in mobileDetectRules.props) {
+            if (hasOwnProp.call(mobileDetectRules.props, key)) {
+                values = mobileDetectRules.props[key];
+                if (!isArray(values)) {
+                    values = [values];
+                }
+                len = values.length;
+                for (i = 0; i < len; ++i) {
+                    value = values[i];
+                    verPos = value.indexOf('[VER]');
+                    if (verPos >= 0) {
+                        value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5);
+                    }
+                    values[i] = new RegExp(value, 'i');
+                }
+                mobileDetectRules.props[key] = values;
+            }
+        }
+        convertPropsToRegExp(mobileDetectRules.oss);
+        convertPropsToRegExp(mobileDetectRules.phones);
+        convertPropsToRegExp(mobileDetectRules.tablets);
+        convertPropsToRegExp(mobileDetectRules.uas);
+        convertPropsToRegExp(mobileDetectRules.utils);
+
+        // copy some patterns to oss0 which are tested first (see issue#15)
+        mobileDetectRules.oss0 = {
+            WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS,
+            WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS
+        };
+    }());
+
+    /**
+     * Test userAgent string against a set of rules and find the first matched key.
+     * @param {Object} rules (key is String, value is RegExp)
+     * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+     * @returns {String|null} the matched key if found, otherwise <tt>null</tt>
+     * @private
+     */
+    impl.findMatch = function(rules, userAgent) {
+        for (var key in rules) {
+            if (hasOwnProp.call(rules, key)) {
+                if (rules[key].test(userAgent)) {
+                    return key;
+                }
+            }
+        }
+        return null;
+    };
+
+    /**
+     * Test userAgent string against a set of rules and return an array of matched keys.
+     * @param {Object} rules (key is String, value is RegExp)
+     * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent').
+     * @returns {Array} an array of matched keys, may be empty when there is no match, but not <tt>null</tt>
+     * @private
+     */
+    impl.findMatches = function(rules, userAgent) {
+        var result = [];
+        for (var key in rules) {
+            if (hasOwnProp.call(rules, key)) {
+                if (rules[key].test(userAgent)) {
+                    result.push(key);
+                }
+            }
+        }
+        return result;
+    };
+
+    /**
+     * Check the version of the given property in the User-Agent.
+     *
+     * @param {String} propertyName
+     * @param {String} userAgent
+     * @return {String} version or <tt>null</tt> if version not found
+     * @private
+     */
+    impl.getVersionStr = function (propertyName, userAgent) {
+        var props = impl.mobileDetectRules.props, patterns, i, len, match;
+        if (hasOwnProp.call(props, propertyName)) {
+            patterns = props[propertyName];
+            len = patterns.length;
+            for (i = 0; i < len; ++i) {
+                match = patterns[i].exec(userAgent);
+                if (match !== null) {
+                    return match[1];
+                }
+            }
+        }
+        return null;
+    };
+
+    /**
+     * Check the version of the given property in the User-Agent.
+     * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+     *
+     * @param {String} propertyName
+     * @param {String} userAgent
+     * @return {Number} version or <tt>NaN</tt> if version not found
+     * @private
+     */
+    impl.getVersion = function (propertyName, userAgent) {
+        var version = impl.getVersionStr(propertyName, userAgent);
+        return version ? impl.prepareVersionNo(version) : NaN;
+    };
+
+    /**
+     * Prepare the version number.
+     *
+     * @param {String} version
+     * @return {Number} the version number as a floating number
+     * @private
+     */
+    impl.prepareVersionNo = function (version) {
+        var numbers;
+
+        numbers = version.split(/[a-z._ \/\-]/i);
+        if (numbers.length === 1) {
+            version = numbers[0];
+        }
+        if (numbers.length > 1) {
+            version = numbers[0] + '.';
+            numbers.shift();
+            version += numbers.join('');
+        }
+        return Number(version);
+    };
+
+    impl.isMobileFallback = function (userAgent) {
+        return impl.detectMobileBrowsers.fullPattern.test(userAgent) ||
+            impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4));
+    };
+
+    impl.isTabletFallback = function (userAgent) {
+        return impl.detectMobileBrowsers.tabletPattern.test(userAgent);
+    };
+
+    impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) {
+        if (cache.mobile !== undefined) {
+            return;
+        }
+        var phone, tablet, phoneSized;
+
+        // first check for stronger tablet rules, then phone (see issue#5)
+        tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent);
+        if (tablet) {
+            cache.mobile = cache.tablet = tablet;
+            cache.phone = null;
+            return; // unambiguously identified as tablet
+        }
+
+        phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent);
+        if (phone) {
+            cache.mobile = cache.phone = phone;
+            cache.tablet = null;
+            return; // unambiguously identified as phone
+        }
+
+        // our rules haven't found a match -> try more general fallback rules
+        if (impl.isMobileFallback(userAgent)) {
+            phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth);
+            if (phoneSized === undefined) {
+                cache.mobile = impl.FALLBACK_MOBILE;
+                cache.tablet = cache.phone = null;
+            } else if (phoneSized) {
+                cache.mobile = cache.phone = impl.FALLBACK_PHONE;
+                cache.tablet = null;
+            } else {
+                cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+                cache.phone = null;
+            }
+        } else if (impl.isTabletFallback(userAgent)) {
+            cache.mobile = cache.tablet = impl.FALLBACK_TABLET;
+            cache.phone = null;
+        } else {
+            // not mobile at all!
+            cache.mobile = cache.tablet = cache.phone = null;
+        }
+    };
+
+    // t is a reference to a MobileDetect instance
+    impl.mobileGrade = function (t) {
+        // impl note:
+        // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version.
+        // When changes are made in Mobile_Detect.php, copy this method and replace:
+        //     $this-> / t.
+        //     self::MOBILE_GRADE_(.) / '$1'
+        //     , self::VERSION_TYPE_FLOAT / (nothing)
+        //     isIOS() / os('iOS')
+        //     [reg] / (nothing)   <-- jsdelivr complaining about unescaped unicode character U+00AE
+        var $isMobile = t.mobile() !== null;
+
+        if (
+            // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1)
+            t.os('iOS') && t.version('iPad')>=4.3 ||
+            t.os('iOS') && t.version('iPhone')>=3.1 ||
+            t.os('iOS') && t.version('iPod')>=3.1 ||
+
+            // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+            // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
+            // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
+            // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
+            ( t.version('Android')>2.1 && t.is('Webkit') ) ||
+
+            // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800
+            t.version('Windows Phone OS')>=7.0 ||
+
+            // Blackberry 7 - Tested on BlackBerry Torch 9810
+            // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670
+            t.is('BlackBerry') && t.version('BlackBerry')>=6.0 ||
+            // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
+            t.match('Playbook.*Tablet') ||
+
+            // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)
+            ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) ||
+            // Palm WebOS 3.0  - Tested on HP TouchPad
+            t.match('hp.*TouchPad') ||
+
+            // Firefox Mobile (12 Beta) - Tested on Android 2.3 device
+            ( t.is('Firefox') && t.version('Firefox')>=12 ) ||
+
+            // Chrome for Android - Tested on Android 4.0, 4.1 device
+            ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) ||
+
+            // Skyfire 4.1 - Tested on Android 2.3 device
+            ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) ||
+
+            // Opera Mobile 11.5-12: Tested on Android 2.3
+            ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) ||
+
+            // Meego 1.2 - Tested on Nokia 950 and N9
+            t.is('MeeGoOS') ||
+
+            // Tizen (pre-release) - Tested on early hardware
+            t.is('Tizen') ||
+
+            // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
+            // @todo: more tests here!
+            t.is('Dolfin') && t.version('Bada')>=2.0 ||
+
+            // UC Browser - Tested on Android 2.3 device
+            ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) ||
+
+            // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
+            ( t.match('Kindle Fire') ||
+                t.is('Kindle') && t.version('Kindle')>=3.0 ) ||
+
+            // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
+            t.is('AndroidOS') && t.is('NookTablet') ||
+
+            // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7
+            t.version('Chrome')>=11 && !$isMobile ||
+
+            // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7
+            t.version('Safari')>=5.0 && !$isMobile ||
+
+            // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7
+            t.version('Firefox')>=4.0 && !$isMobile ||
+
+            // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
+            t.version('MSIE')>=7.0 && !$isMobile ||
+
+            // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
+            // @reference: http://my.opera.com/community/openweb/idopera/
+            t.version('Opera')>=10 && !$isMobile
+
+            ){
+            return 'A';
+        }
+
+        if (
+            t.os('iOS') && t.version('iPad')<4.3 ||
+            t.os('iOS') && t.version('iPhone')<3.1 ||
+            t.os('iOS') && t.version('iPod')<3.1 ||
+
+            // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
+            t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 ||
+
+            //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
+            ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 &&
+                (t.version('Android')>=2.3 || t.is('iOS')) ) ||
+
+            // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+            t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
+
+            // @todo: report this (tested on Nokia N71)
+            t.version('Opera Mobi')>=11 && t.is('SymbianOS')
+            ){
+            return 'B';
+        }
+
+        if (
+        // Blackberry 4.x - Tested on the Curve 8330
+            t.version('BlackBerry')<5.0 ||
+            // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
+            t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2
+
+            ){
+            return 'C';
+        }
+
+        //All older smartphone platforms and featurephones - Any device that doesn't support media queries
+        //will receive the basic, C grade experience.
+        return 'C';
+    };
+
+    impl.detectOS = function (ua) {
+        return impl.findMatch(impl.mobileDetectRules.oss0, ua) ||
+            impl.findMatch(impl.mobileDetectRules.oss, ua);
+    };
+
+    impl.getDeviceSmallerSide = function () {
+        return window.screen.width < window.screen.height ?
+            window.screen.width :
+            window.screen.height;
+    };
+
+    /**
+     * Constructor for MobileDetect object.
+     * <br>
+     * Such an object will keep a reference to the given user-agent string and cache most of the detect queries.<br>
+     * <div style="background-color: #d9edf7; border: 1px solid #bce8f1; color: #3a87ad; padding: 14px; border-radius: 2px; margin-top: 20px">
+     *     <strong>Find information how to download and install:</strong>
+     *     <a href="https://github.com/hgoebl/mobile-detect.js/">github.com/hgoebl/mobile-detect.js/</a>
+     * </div>
+     *
+     * @example <pre>
+     *     var md = new MobileDetect(window.navigator.userAgent);
+     *     if (md.mobile()) {
+     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';
+     *     }
+     * </pre>
+     *
+     * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent']
+     * @param {number} [maxPhoneWidth=600] <strong>only for browsers</strong> specify a value for the maximum
+     *        width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled
+     *        as phone.
+     *        This is only used in cases where the device cannot be classified as phone or tablet.<br>
+     *        See <a href="http://developer.android.com/guide/practices/screens_support.html">Declaring Tablet Layouts
+     *        for Android</a>.<br>
+     *        If you provide a value < 0, then this "fuzzy" check is disabled.
+     * @constructor
+     * @global
+     */
+    function MobileDetect(userAgent, maxPhoneWidth) {
+        this.ua = userAgent || '';
+        this._cache = {};
+        //600dp is typical 7" tablet minimum width
+        this.maxPhoneWidth = maxPhoneWidth || 600;
+    }
+
+    MobileDetect.prototype = {
+        constructor: MobileDetect,
+
+        /**
+         * Returns the detected phone or tablet type or <tt>null</tt> if it is not a mobile device.
+         * <br>
+         * For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.<br>
+         * <br>
+         * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+         * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+         * is positive, a value of <code>UnknownPhone</code>, <code>UnknownTablet</code> or
+         * <code>UnknownMobile</code> is returned.<br>
+         * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+         * <br>
+         * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+         * and <code>UnknownMobile</code>, so you will get <code>UnknownMobile</code> here.<br>
+         * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+         * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+         * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+         * <br>
+         * In most cases you will use the return value just as a boolean.
+         *
+         * @returns {String} the key for the phone family or tablet family, e.g. "Nexus".
+         * @function MobileDetect#mobile
+         */
+        mobile: function () {
+            impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+            return this._cache.mobile;
+        },
+
+        /**
+         * Returns the detected phone type/family string or <tt>null</tt>.
+         * <br>
+         * The returned tablet (family or producer) is one of following keys:<br>
+         * <br><tt>iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus,
+         * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley,
+         * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone</tt><br>
+         * <br>
+         * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+         * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+         * is positive, a value of <code>UnknownPhone</code> or <code>UnknownMobile</code> is returned.<br>
+         * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+         * <br>
+         * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+         * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+         * will return <code>UnknownMobile</code>.<br>
+         * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+         * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+         * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+         * <br>
+         * In most cases you will use the return value just as a boolean.
+         *
+         * @returns {String} the key of the phone family or producer, e.g. "iPhone"
+         * @function MobileDetect#phone
+         */
+        phone: function () {
+            impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+            return this._cache.phone;
+        },
+
+        /**
+         * Returns the detected tablet type/family string or <tt>null</tt>.
+         * <br>
+         * The returned tablet (family or producer) is one of following keys:<br>
+         * <br><tt>iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet,
+         * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet,
+         * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet,
+         * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet,
+         * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet,
+         * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet,
+         * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet,
+         * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet,
+         * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet,
+         * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet,
+         * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet,
+         * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet,
+         * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet,
+         * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet,
+         * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet,
+         * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet,
+         * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet,
+         * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet,
+         * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet,
+         * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet,
+         * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl,
+         * TelstraTablet, GenericTablet</tt><br>
+         * <br>
+         * If the device is not detected by the regular expressions from Mobile-Detect, a test is made against
+         * the patterns of <a href="http://detectmobilebrowsers.com/">detectmobilebrowsers.com</a>. If this test
+         * is positive, a value of <code>UnknownTablet</code> or <code>UnknownMobile</code> is returned.<br>
+         * When used in browser, the decision whether phone or tablet is made based on <code>screen.width/height</code>.<br>
+         * <br>
+         * When used server-side (node.js), there is no way to tell the difference between <code>UnknownTablet</code>
+         * and <code>UnknownMobile</code>, so you will get <code>null</code> here, while {@link MobileDetect#mobile}
+         * will return <code>UnknownMobile</code>.<br>
+         * Be aware that since v1.0.0 in this special case you will get <code>UnknownMobile</code> only for:
+         * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
+         * In versions before v1.0.0 all 3 methods returned <code>UnknownMobile</code> which was tedious to use.
+         * <br>
+         * In most cases you will use the return value just as a boolean.
+         *
+         * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet"
+         * @function MobileDetect#tablet
+         */
+        tablet: function () {
+            impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth);
+            return this._cache.tablet;
+        },
+
+        /**
+         * Returns the (first) detected user-agent string or <tt>null</tt>.
+         * <br>
+         * The returned user-agent is one of following keys:<br>
+         * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+         * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+         * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+         * <br>
+         * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+         * cases where a mobile device pretends to be more than one particular browser. You can get the
+         * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+         * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+         *
+         * @returns {String} the key for the detected user-agent or <tt>null</tt>
+         * @function MobileDetect#userAgent
+         */
+        userAgent: function () {
+            if (this._cache.userAgent === undefined) {
+                this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua);
+            }
+            return this._cache.userAgent;
+        },
+
+        /**
+         * Returns all detected user-agent strings.
+         * <br>
+         * The array is empty or contains one or more of following keys:<br>
+         * <br><tt>Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark,
+         * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser,
+         * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon</tt><br>
+         * <br>
+         * In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare
+         * cases where a mobile device pretends to be more than one particular browser. You can get the
+         * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by
+         * providing one of the defined keys as first argument to {@link MobileDetect#is}.
+         *
+         * @returns {Array} the array of detected user-agent keys or <tt>[]</tt>
+         * @function MobileDetect#userAgents
+         */
+        userAgents: function () {
+            if (this._cache.userAgents === undefined) {
+                this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua);
+            }
+            return this._cache.userAgents;
+        },
+
+        /**
+         * Returns the detected operating system string or <tt>null</tt>.
+         * <br>
+         * The operating system is one of following keys:<br>
+         * <br><tt>AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS,
+         * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS</tt><br>
+         *
+         * @returns {String} the key for the detected operating system.
+         * @function MobileDetect#os
+         */
+        os: function () {
+            if (this._cache.os === undefined) {
+                this._cache.os = impl.detectOS(this.ua);
+            }
+            return this._cache.os;
+        },
+
+        /**
+         * Get the version (as Number) of the given property in the User-Agent.
+         * <br>
+         * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+         *
+         * @param {String} key a key defining a thing which has a version.<br>
+         *        You can use one of following keys:<br>
+         * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+         * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+         * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+         * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+         * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+         * CE, Windows NT, Symbian, webOS</tt><br>
+         *
+         * @returns {Number} the version as float or <tt>NaN</tt> if User-Agent doesn't contain this version.
+         *          Be careful when comparing this value with '==' operator!
+         * @function MobileDetect#version
+         */
+        version: function (key) {
+            return impl.getVersion(key, this.ua);
+        },
+
+        /**
+         * Get the version (as String) of the given property in the User-Agent.
+         * <br>
+         *
+         * @param {String} key a key defining a thing which has a version.<br>
+         *        You can use one of following keys:<br>
+         * <br><tt>Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast,
+         * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini,
+         * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser,
+         * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna,
+         * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows
+         * CE, Windows NT, Symbian, webOS</tt><br>
+         *
+         * @returns {String} the "raw" version as String or <tt>null</tt> if User-Agent doesn't contain this version.
+         *
+         * @function MobileDetect#versionStr
+         */
+        versionStr: function (key) {
+            return impl.getVersionStr(key, this.ua);
+        },
+
+        /**
+         * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string.
+         *
+         * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or
+         *        tablet family.<br>
+         *        For a complete list of possible values, see {@link MobileDetect#userAgent},
+         *        {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.<br>
+         *        Additionally you have following keys:<br>
+         * <br><tt>Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch</tt><br>
+         *
+         * @returns {boolean} <tt>true</tt> when the given key is one of the defined keys of userAgent, os, phone,
+         *                    tablet or one of the listed additional keys, otherwise <tt>false</tt>
+         * @function MobileDetect#is
+         */
+        is: function (key) {
+            return containsIC(this.userAgents(), key) ||
+                   equalIC(key, this.os()) ||
+                   equalIC(key, this.phone()) ||
+                   equalIC(key, this.tablet()) ||
+                   containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key);
+        },
+
+        /**
+         * Do a quick test against navigator::userAgent.
+         *
+         * @param {String|RegExp} pattern the pattern, either as String or RegExp
+         *                        (a string will be converted to a case-insensitive RegExp).
+         * @returns {boolean} <tt>true</tt> when the pattern matches, otherwise <tt>false</tt>
+         * @function MobileDetect#match
+         */
+        match: function (pattern) {
+            if (!(pattern instanceof RegExp)) {
+                pattern = new RegExp(pattern, 'i');
+            }
+            return pattern.test(this.ua);
+        },
+
+        /**
+         * Checks whether the mobile device can be considered as phone regarding <code>screen.width</code>.
+         * <br>
+         * Obviously this method makes sense in browser environments only (not for Node.js)!
+         * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.<br>
+         *        The argument is optional and if not present or falsy, the value of the constructor is taken.
+         * @returns {boolean|undefined} <code>undefined</code> if screen size wasn't detectable, else <code>true</code>
+         *          when screen.width is less or equal to maxPhoneWidth, otherwise <code>false</code>.<br>
+         *          Will always return <code>undefined</code> server-side.
+         */
+        isPhoneSized: function (maxPhoneWidth) {
+            return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth);
+        },
+
+        /**
+         * Returns the mobile grade ('A', 'B', 'C').
+         *
+         * @returns {String} one of the mobile grades ('A', 'B', 'C').
+         * @function MobileDetect#mobileGrade
+         */
+        mobileGrade: function () {
+            if (this._cache.grade === undefined) {
+                this._cache.grade = impl.mobileGrade(this);
+            }
+            return this._cache.grade;
+        }
+    };
+
+    // environment-dependent
+    if (typeof window !== 'undefined' && window.screen) {
+        MobileDetect.isPhoneSized = function (maxPhoneWidth) {
+            return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth;
+        };
+    } else {
+        MobileDetect.isPhoneSized = function () {};
+    }
+
+    // should not be replaced by a completely new object - just overwrite existing methods
+    MobileDetect._impl = impl;
+    
+    MobileDetect.version = '1.3.3 2016-07-31';
+
+    return MobileDetect;
+}); // end of call of define()
+})((function (undefined) {
+    if (typeof module !== 'undefined' && module.exports) {
+        return function (factory) { module.exports = factory(); };
+    } else if (typeof define === 'function' && define.amd) {
+        return define;
+    } else if (typeof window !== 'undefined') {
+        return function (factory) { window.MobileDetect = factory(); };
+    } else {
+        // please file a bug if you get this error!
+        throw new Error('unknown environment');
+    }
+})());
\ No newline at end of file
diff --git a/tests/cases/fourslash/ambientShorthandGotoDefinition.ts b/tests/cases/fourslash/ambientShorthandGotoDefinition.ts
index 970b87f8ec2..f7fcbe9f053 100644
--- a/tests/cases/fourslash/ambientShorthandGotoDefinition.ts
+++ b/tests/cases/fourslash/ambientShorthandGotoDefinition.ts
@@ -12,28 +12,25 @@
 
 goTo.marker("useFoo");
 verify.quickInfoIs("import foo");
-goTo.definition();
-verify.caretAtMarker("importFoo");
-goTo.definition();
-verify.caretAtMarker("module");
+verify.goToDefinition({
+    useFoo: "importFoo",
+    importFoo: "module"
+});
 
 goTo.marker("useBar");
 verify.quickInfoIs("import bar");
-goTo.definition();
-verify.caretAtMarker("module");
+verify.goToDefinition("useBar", "module");
 
 goTo.marker("useBaz");
 verify.quickInfoIs("import baz");
-goTo.definition();
-verify.caretAtMarker("importBaz");
-goTo.marker("idBaz");
-goTo.definition();
-verify.caretAtMarker("module");
+verify.goToDefinition({
+    useBaz: "importBaz",
+    idBaz: "module"
+});
 
 goTo.marker("useBang");
 verify.quickInfoIs("import bang = require(\"jquery\")");
-goTo.definition();
-verify.caretAtMarker("importBang");
-goTo.marker("idBang");
-goTo.definition();
-verify.caretAtMarker("module");
+verify.goToDefinition({
+    useBang: "importBang",
+    idBang: "module"
+});
diff --git a/tests/cases/fourslash/completionForStringLiteralImport1.ts b/tests/cases/fourslash/completionForStringLiteralImport1.ts
new file mode 100644
index 00000000000..4cdee889538
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralImport1.ts
@@ -0,0 +1,33 @@
+/// <reference path='fourslash.ts' />
+
+// Should define spans for replacement that appear after the last directory seperator in import statements
+
+// @typeRoots: my_typings
+
+// @Filename: test.ts
+//// import * as foo0 from  "./[|some|]/*0*/
+//// import * as foo1 from  "./sub/[|some|]/*1*/
+//// import * as foo2 from  "[|some-|]/*2*/"
+//// import * as foo3 from  "../[||]/*3*/";
+
+
+// @Filename: someFile1.ts
+//// /*someFile1*/
+
+// @Filename: sub/someFile2.ts
+//// /*someFile2*/
+
+// @Filename: my_typings/some-module/index.d.ts
+//// export var x = 9;
+
+goTo.marker("0");
+verify.completionListContains("someFile1", undefined, undefined, undefined, 0);
+
+goTo.marker("1");
+verify.completionListContains("someFile2", undefined, undefined, undefined, 1);
+
+goTo.marker("2");
+verify.completionListContains("some-module", undefined, undefined, undefined, 2);
+
+goTo.marker("3");
+verify.completionListContains("fourslash", undefined, undefined, undefined, 3);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralImport2.ts b/tests/cases/fourslash/completionForStringLiteralImport2.ts
new file mode 100644
index 00000000000..25de3d2240a
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralImport2.ts
@@ -0,0 +1,33 @@
+/// <reference path='fourslash.ts' />
+
+// Should define spans for replacement that appear after the last directory seperator in triple slash references
+
+// @typeRoots: my_typings
+
+// @Filename: test.ts
+//// /// <reference path="./[|some|]/*0*/
+//// /// <reference types="[|some|]/*1*/
+
+//// /// <reference path="./sub/[|some|]/*2*/" />
+//// /// <reference types="[|some|]/*3*/" />
+
+// @Filename: someFile.ts
+//// /*someFile*/
+
+// @Filename: sub/someOtherFile.ts
+//// /*someOtherFile*/
+
+// @Filename: my_typings/some-module/index.d.ts
+//// export var x = 9;
+
+goTo.marker("0");
+verify.completionListContains("someFile.ts", undefined, undefined, undefined, 0);
+
+goTo.marker("1");
+verify.completionListContains("some-module", undefined, undefined, undefined, 1);
+
+goTo.marker("2");
+verify.completionListContains("someOtherFile.ts", undefined, undefined, undefined, 2);
+
+goTo.marker("3");
+verify.completionListContains("some-module", undefined, undefined, undefined, 3);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport1.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport1.ts
new file mode 100644
index 00000000000..c0e5ebbcd90
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport1.ts
@@ -0,0 +1,63 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for node modules and files within those modules with ts file extensions
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "f/*import_as0*/
+//// import * as foo2 from "fake-module//*import_as1*/
+//// import * as foo3 from "fake-module/*import_as2*/
+
+//// import foo4 = require("f/*import_equals0*/
+//// import foo5 = require("fake-module//*import_equals1*/
+//// import foo6 = require("fake-module/*import_equals2*/
+
+//// var foo7 = require("f/*require0*/
+//// var foo8 = require("fake-module//*require1*/
+//// var foo9 = require("fake-module/*require2*/
+
+// @Filename: package.json
+//// { "dependencies": { "fake-module": "latest" }, "devDependencies": { "fake-module-dev": "latest" } }
+
+// @Filename: node_modules/fake-module/index.js
+//// /*fake-module*/
+// @Filename: node_modules/fake-module/index.d.ts
+//// /*fakemodule-d-ts*/
+// @Filename: node_modules/fake-module/ts.ts
+//// /*ts*/
+// @Filename: node_modules/fake-module/dts.d.ts
+//// /*dts*/
+// @Filename: node_modules/fake-module/tsx.tsx
+//// /*tsx*/
+// @Filename: node_modules/fake-module/js.js
+//// /*js*/
+// @Filename: node_modules/fake-module/jsx.jsx
+//// /*jsx*/
+
+// @Filename: node_modules/fake-module-dev/index.js
+//// /*fakemodule-dev*/
+// @Filename: node_modules/fake-module-dev/index.d.ts
+//// /*fakemodule-dev-d-ts*/
+
+// @Filename: node_modules/unlisted-module/index.ts
+//// /*unlisted-module*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("fake-module");
+    verify.completionListContains("fake-module-dev");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+
+    goTo.marker(kind + "1");
+    verify.completionListContains("index");
+    verify.completionListContains("ts");
+    verify.completionListContains("dts");
+    verify.completionListContains("tsx");
+    verify.not.completionListItemsCountIsGreaterThan(4);
+
+    goTo.marker(kind + "2");
+    verify.completionListContains("fake-module");
+    verify.completionListContains("fake-module-dev");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport10.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport10.ts
new file mode 100644
index 00000000000..24a323bc6e5
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport10.ts
@@ -0,0 +1,35 @@
+/// <reference path='fourslash.ts' />
+
+// Should not give node module completions if classic module resolution is enabled
+
+// @moduleResolution: classic
+
+// @Filename: dir1/dir2/dir3/dir4/test0.ts
+//// import * as foo1 from "f/*import_as0*/
+//// import * as foo3 from "fake-module/*import_as1*/
+
+//// import foo4 = require("f/*import_equals0*/
+//// import foo6 = require("fake-module/*import_equals1*/
+
+//// var foo7 = require("f/*require0*/
+//// var foo9 = require("fake-module/*require1*/
+
+// @Filename: package.json
+//// { "dependencies": { "fake-module": "latest" } }
+// @Filename: node_modules/fake-module/ts.ts
+//// /*module1*/
+
+// @Filename: dir1/dir2/dir3/package.json
+//// { "dependencies": { "fake-module3": "latest" } }
+// @Filename: dir1/dir2/dir3/node_modules/fake-module3/ts.ts
+//// /*module3*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListIsEmpty();
+
+    goTo.marker(kind + "1");
+    verify.completionListIsEmpty();
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport11.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport11.ts
new file mode 100644
index 00000000000..7b81c4da106
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport11.ts
@@ -0,0 +1,38 @@
+/// <reference path='fourslash.ts' />
+
+// Should handle nested files in folders discovered via the baseUrl compiler option
+
+// @baseUrl: tests/cases/fourslash/modules
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "subfolder//*import_as0*/
+//// import foo2 = require("subfolder//*import_equals0*/
+//// var foo3 = require("subfolder//*require0*/
+
+//// import * as foo1 from "module-from-node//*import_as1*/
+//// import foo2 = require("module-from-node//*import_equals1*/
+//// var foo3 = require("module-from-node//*require1*/
+
+// @Filename: modules/subfolder/module.ts
+//// export var x = 5;
+
+// @Filename: package.json
+//// { "dependencies": { "module-from-node": "latest" } }
+// @Filename: node_modules/module-from-node/index.ts
+//// /*module1*/
+
+
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+
+    verify.completionListContains("module");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+
+    goTo.marker(kind + "1");
+
+    verify.completionListContains("index");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport12.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport12.ts
new file mode 100644
index 00000000000..ed202d68ec1
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport12.ts
@@ -0,0 +1,28 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for all dependencies in package.json
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "m/*import_as0*/
+//// import foo2 = require("m/*import_equals0*/
+//// var foo3 = require("m/*require0*/
+
+// @Filename: package.json
+//// {
+////     "dependencies": { "module": "latest" },
+////     "devDependencies": { "dev-module": "latest" },
+////     "optionalDependencies": { "optional-module": "latest" },
+////     "peerDependencies": { "peer-module": "latest" }
+//// }
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+
+    verify.completionListContains("module");
+    verify.completionListContains("dev-module");
+    verify.completionListContains("optional-module");
+    verify.completionListContains("peer-module");
+    verify.not.completionListItemsCountIsGreaterThan(4);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport2.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport2.ts
new file mode 100644
index 00000000000..bac5c54ff23
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport2.ts
@@ -0,0 +1,37 @@
+/// <reference path='fourslash.ts' />
+
+// Should not give duplicate entries for similarly named files with different extensions
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "fake-module//*import_as0*/
+//// import foo2 = require("fake-module//*import_equals0*/
+//// var foo3 = require("fake-module//*require0*/
+
+// @Filename: package.json
+//// { "dependencies": { "fake-module": "latest" }, "devDependencies": { "fake-module-dev": "latest" } }
+
+// @Filename: node_modules/fake-module/repeated.ts
+//// /*repeatedts*/
+// @Filename: node_modules/fake-module/repeated.tsx
+//// /*repeatedtsx*/
+// @Filename: node_modules/fake-module/repeated.d.ts
+//// /*repeateddts*/
+// @Filename: node_modules/fake-module/other.js
+//// /*other*/
+// @Filename: node_modules/fake-module/other2.js
+//// /*other2*/
+
+// @Filename: node_modules/unlisted-module/index.js
+//// /*unlisted-module*/
+
+// @Filename: ambient.ts
+//// declare module "fake-module/other"
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("repeated");
+    verify.completionListContains("other");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport3.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport3.ts
new file mode 100644
index 00000000000..d2103f6f10c
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport3.ts
@@ -0,0 +1,38 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for js files in node modules when allowJs is set to true
+
+// @allowJs: true
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "fake-module//*import_as0*/
+//// import foo2 = require("fake-module//*import_equals0*/
+//// var foo3 = require("fake-module//*require0*/
+
+// @Filename: package.json
+//// { "dependencies": { "fake-module": "latest" } }
+
+// @Filename: node_modules/fake-module/ts.ts
+//// /*ts*/
+// @Filename: node_modules/fake-module/tsx.tsx
+//// /*tsx*/
+// @Filename: node_modules/fake-module/dts.d.ts
+//// /*dts*/
+// @Filename: node_modules/fake-module/js.js
+//// /*js*/
+// @Filename: node_modules/fake-module/jsx.jsx
+//// /*jsx*/
+// @Filename: node_modules/fake-module/repeated.js
+//// /*repeatedjs*/
+// @Filename: node_modules/fake-module/repeated.jsx
+//// /*repeatedjsx*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("ts");
+    verify.completionListContains("tsx");
+    verify.completionListContains("dts");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport4.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport4.ts
new file mode 100644
index 00000000000..b95fd96f380
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport4.ts
@@ -0,0 +1,34 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for all node modules visible to the script
+
+// @Filename: dir1/dir2/dir3/dir4/test0.ts
+//// import * as foo1 from "f/*import_as0*/
+//// import foo4 = require("f/*import_equals0*/
+//// var foo7 = require("f/*require0*/
+
+// @Filename: package.json
+//// { "dependencies": { "fake-module": "latest" } }
+// @Filename: node_modules/fake-module/ts.ts
+//// /*module1*/
+
+// @Filename: dir1/package.json
+//// { "dependencies": { "fake-module2": "latest" } }
+// @Filename: dir1/node_modules/fake-module2/index.ts
+//// /*module2*/
+
+// @Filename: dir1/dir2/dir3/package.json
+//// { "dependencies": { "fake-module3": "latest" } }
+// @Filename: dir1/dir2/dir3/node_modules/fake-module3/ts.ts
+//// /*module3*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+
+    verify.completionListContains("fake-module");
+    verify.completionListContains("fake-module2");
+    verify.completionListContains("fake-module3");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport5.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport5.ts
new file mode 100644
index 00000000000..c8c9a18ff85
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport5.ts
@@ -0,0 +1,39 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for ambiently declared modules
+
+// @Filename: test0.ts
+//// /// <reference path="./ambientModules.d.ts" />
+//// /// <reference path="./ambientModules2.d.ts" />
+//// import * as foo1 from "/*import_as0*/
+//// import * as foo2 from "a/*import_as1*/
+
+//// import foo3 = require("/*import_equals0*/
+//// import foo4 = require("a/*import_equals1*/
+
+//// var foo5 = require("/*require0*/
+//// var foo6 = require("a/*require1*/
+
+// @Filename: ambientModules.d.ts
+//// declare module "ambientModule" {}
+//// declare module "otherAmbientModule" {} /*dummy0*/
+
+// @Filename: ambientModules2.d.ts
+//// declare module "otherOtherAmbientModule" {} /*dummy1*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+
+    verify.completionListContains("ambientModule");
+    verify.completionListContains("otherAmbientModule");
+    verify.completionListContains("otherOtherAmbientModule");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+
+    goTo.marker(kind + "1");
+
+    verify.completionListContains("ambientModule");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+}
+
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport7.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport7.ts
new file mode 100644
index 00000000000..57ba6e440cf
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport7.ts
@@ -0,0 +1,30 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for files that are discovered via the baseUrl compiler option
+
+// @baseUrl: tests/cases/fourslash/modules
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "mod/*import_as0*/
+//// import foo2 = require("mod/*import_equals0*/
+//// var foo3 = require("mod/*require0*/
+
+// @Filename: modules/module.ts
+//// export var x = 5;
+
+// @Filename: package.json
+//// { "dependencies": { "module-from-node": "latest" } }
+// @Filename: node_modules/module-from-node/index.ts
+//// /*module1*/
+
+
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+
+    verify.completionListContains("module");
+    verify.completionListContains("module-from-node");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport8.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport8.ts
new file mode 100644
index 00000000000..603e8d1104d
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport8.ts
@@ -0,0 +1,55 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for modules referenced via baseUrl and paths compiler options with wildcards
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "baseUrl": "./modules",
+////         "paths": {
+////             "*": [
+////                 "prefix/0*/suffix.ts",
+////                 "prefix-only/*",
+////                 "*/suffix-only.ts"
+////             ]
+////         }
+////     }
+//// }
+
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "0/*import_as0*/
+//// import foo2 = require("0/*import_equals0*/
+//// var foo3 = require("0/*require0*/
+
+//// import * as foo1 from "1/*import_as1*/
+//// import foo2 = require("1/*import_equals1*/
+//// var foo3 = require("1/*require1*/
+
+//// import * as foo1 from "2/*import_as2*/
+//// import foo2 = require("2/*import_equals2*/
+//// var foo3 = require("2/*require2*/
+
+
+// @Filename: modules/prefix/00test/suffix.ts
+//// export var x = 5;
+
+// @Filename: modules/prefix-only/1test.ts
+//// export var y = 5;
+
+// @Filename: modules/2test/suffix-only.ts
+//// export var z = 5;
+
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("0test");
+
+    goTo.marker(kind + "1");
+    verify.completionListContains("1test");
+
+    goTo.marker(kind + "2");
+    verify.completionListContains("2test");
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport9.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport9.ts
new file mode 100644
index 00000000000..8703c608462
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport9.ts
@@ -0,0 +1,36 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for modules referenced via baseUrl and paths compiler options with explicit name mappings
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "baseUrl": "./modules",
+////         "paths": {
+////             "module1": ["some/path/whatever.ts"],
+////             "module2": ["some/other/path.ts"]
+////         }
+////     }
+//// }
+
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "m/*import_as0*/
+//// import foo2 = require("m/*import_equals0*/
+//// var foo3 = require("m/*require0*/
+
+// @Filename: some/path/whatever.ts
+//// export var x = 9;
+
+// @Filename: some/other/path.ts
+//// export var y = 10;
+
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("module1");
+    verify.completionListContains("module2");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings1.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings1.ts
new file mode 100644
index 00000000000..687103629e2
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings1.ts
@@ -0,0 +1,35 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for typings discovered via the typeRoots compiler option
+
+// @typeRoots: my_typings,my_other_typings
+
+
+// @Filename: tests/test0.ts
+//// /// <reference types="m/*types_ref0*/" />
+//// import * as foo1 from "m/*import_as0*/
+//// import foo2 = require("m/*import_equals0*/
+//// var foo3 = require("m/*require0*/
+
+// @Filename: my_typings/module-x/index.d.ts
+//// export var x = 9;
+
+// @Filename: my_typings/module-x/whatever.d.ts
+//// export var w = 9;
+
+// @Filename: my_typings/module-y/index.d.ts
+//// export var y = 9;
+
+// @Filename: my_other_typings/module-z/index.d.ts
+//// export var z = 9;
+
+
+const kinds = ["types_ref", "import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("module-x");
+    verify.completionListContains("module-y");
+    verify.completionListContains("module-z");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings2.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings2.ts
new file mode 100644
index 00000000000..12a4fcf243f
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings2.ts
@@ -0,0 +1,32 @@
+/// <reference path='fourslash.ts' />
+
+// Should respect the types compiler option when giving completions
+
+// @typeRoots: my_typings,my_other_typings
+// @types: module-x,module-z
+
+
+// @Filename: tests/test0.ts
+//// /// <reference types="m/*types_ref0*/" />
+//// import * as foo1 from "m/*import_as0*/
+//// import foo2 = require("m/*import_equals0*/
+//// var foo3 = require("m/*require0*/
+
+// @Filename: my_typings/module-x/index.d.ts
+//// export var x = 9;
+
+// @Filename: my_typings/module-y/index.d.ts
+//// export var y = 9;
+
+// @Filename: my_other_typings/module-z/index.d.ts
+//// export var z = 9;
+
+
+const kinds = ["types_ref", "import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("module-x");
+    verify.completionListContains("module-z");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings3.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings3.ts
new file mode 100644
index 00000000000..14cf71ad0dc
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImportTypings3.ts
@@ -0,0 +1,28 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for typings discovered in all visible @types directories
+
+// @Filename: subdirectory/test0.ts
+//// /// <reference types="m/*types_ref0*/" />
+//// import * as foo1 from "m/*import_as0*/
+//// import foo2 = require("m/*import_equals0*/
+//// var foo3 = require("m/*require0*/
+
+// @Filename: subdirectory/node_modules/@types/module-x/index.d.ts
+//// export var x = 9;
+// @Filename: subdirectory/package.json
+//// { "dependencies": { "@types/module-x": "latest" } }
+
+// @Filename: node_modules/@types/module-y/index.d.ts
+//// export var y = 9;
+// @Filename: package.json
+//// { "dependencies": { "@types/module-y": "latest" } }
+
+const kinds = ["types_ref", "import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("module-x");
+    verify.completionListContains("module-y");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts
new file mode 100644
index 00000000000..3ba82fb0acf
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts
@@ -0,0 +1,70 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for ts files when allowJs is false
+
+// @Filename: test0.ts
+//// import * as foo1 from "./*import_as0*/
+//// import * as foo2 from ".//*import_as1*/
+//// import * as foo4 from "./folder//*import_as2*/
+
+//// import foo6 = require("./*import_equals0*/
+//// import foo7 = require(".//*import_equals1*/
+//// import foo9 = require("./folder//*import_equals2*/
+
+//// var foo11 = require("./*require0*/
+//// var foo12 = require(".//*require1*/
+//// var foo14 = require("./folder//*require2*/
+
+// @Filename: parentTest/sub/test5.ts
+//// import * as foo16 from "../g/*import_as3*/
+//// import foo17 = require("../g/*import_equals3*/
+//// var foo18 = require("../g/*require3*/
+
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f1.js
+//// /*f1j*/
+// @Filename: f1.d.ts
+//// /*f1d*/
+// @Filename: f2.tsx
+//// /f2*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: folder/f3.ts
+//// /*subf1*/
+// @Filename: folder/h1.ts
+//// /*subh1*/
+// @Filename: parentTest/f4.ts
+//// /*parentf1*/
+// @Filename: parentTest/g1.ts
+//// /*parentg1*/
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListIsEmpty();
+
+    goTo.marker(kind + "1");
+    verify.completionListContains("f1");
+    verify.completionListContains("f2");
+    verify.completionListContains("e1");
+    verify.completionListContains("folder");
+    verify.completionListContains("parentTest");
+    verify.not.completionListItemsCountIsGreaterThan(5);
+
+    goTo.marker(kind + "2");
+    verify.completionListContains("f3");
+    verify.completionListContains("h1");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+
+    goTo.marker(kind + "3");
+    verify.completionListContains("f4");
+    verify.completionListContains("g1");
+    verify.completionListContains("sub");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts
new file mode 100644
index 00000000000..18a80ab3481
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts
@@ -0,0 +1,53 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for ts and js files when allowJs is true
+
+// @allowJs: true
+
+// @Filename: test0.ts
+//// import * as foo1 from ".//*import_as0*/
+//// import * as foo2 from "./f/*import_as1*/
+
+//// import foo3 = require(".//*import_equals0*/
+//// import foo4 = require("./f/*import_equals1*/
+
+//// var foo5 = require(".//*require0*/
+//// var foo6 = require("./f/*require1*/
+
+// @Filename: f1.ts
+//// /f1*/
+// @Filename: f1.js
+//// /*f1j*/
+// @Filename: f1.d.ts
+//// /*f1d*/
+// @Filename: f2.tsx
+//// /*f2*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: e2.js
+//// /*e2*/
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("f1");
+    verify.completionListContains("f2");
+    verify.completionListContains("f3");
+    verify.completionListContains("f4");
+    verify.completionListContains("e1");
+    verify.completionListContains("e2");
+    verify.not.completionListItemsCountIsGreaterThan(6);
+
+    goTo.marker(kind + "1");
+    verify.completionListContains("f1");
+    verify.completionListContains("f2");
+    verify.completionListContains("f3");
+    verify.completionListContains("f4");
+    verify.completionListContains("e1");
+    verify.completionListContains("e2");
+    verify.not.completionListItemsCountIsGreaterThan(6);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport3.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImport3.ts
new file mode 100644
index 00000000000..915cebdf6e7
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImport3.ts
@@ -0,0 +1,51 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for absolute paths
+
+// @Filename: tests/test0.ts
+//// import * as foo1 from "/tests/cases/f/*import_as0*/
+//// import * as foo2 from "/tests/cases/fourslash/*import_as1*/
+//// import * as foo3 from "/tests/cases/fourslash//*import_as2*/
+
+//// import foo4 = require("/tests/cases/f/*import_equals0*/
+//// import foo5 = require("/tests/cases/fourslash/*import_equals1*/
+//// import foo6 = require("/tests/cases/fourslash//*import_equals2*/
+
+//// var foo7 = require("/tests/cases/f/*require0*/
+//// var foo8 = require("/tests/cases/fourslash/*require1*/
+//// var foo9 = require("/tests/cases/fourslash//*require2*/
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.tsx
+//// /*f2*/
+// @Filename: folder/f1.ts
+//// /*subf1*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: e2.js
+//// /*e2*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+    verify.completionListContains("fourslash");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+
+    goTo.marker(kind + "1");
+    verify.completionListContains("fourslash");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+
+    goTo.marker(kind + "2");
+    verify.completionListContains("f1");
+    verify.completionListContains("f2");
+    verify.completionListContains("e1");
+    verify.completionListContains("folder");
+    verify.completionListContains("tests");
+    verify.not.completionListItemsCountIsGreaterThan(5);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport4.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImport4.ts
new file mode 100644
index 00000000000..b9750de9c17
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImport4.ts
@@ -0,0 +1,52 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for directories that are merged via the rootDirs compiler option
+
+// @rootDirs: tests/cases/fourslash/sub/src1,tests/cases/fourslash/src2
+
+// @Filename: src2/test0.ts
+//// import * as foo1 from "./mo/*import_as0*/
+//// import foo2 = require("./mo/*import_equals0*/
+//// var foo3 = require("./mo/*require0*/
+
+// @Filename: src2/module0.ts
+//// export var w = 0;
+
+// @Filename: sub/src1/module1.ts
+//// export var x = 0;
+
+// @Filename: sub/src1/module2.ts
+//// export var y = 0;
+
+// @Filename: sub/src1/more/module3.ts
+//// export var z = 0;
+
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.tsx
+//// /*f2*/
+// @Filename: folder/f1.ts
+//// /*subf1*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: e2.js
+//// /*e2*/
+
+const kinds = ["import_as", "import_equals", "require"];
+
+for (const kind of kinds) {
+    goTo.marker(kind + "0");
+
+    verify.completionListContains("module0");
+    verify.completionListContains("module1");
+    verify.completionListContains("module2");
+    verify.completionListContains("more");
+
+    // Should not contain itself
+    verify.not.completionListItemsCountIsGreaterThan(4);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference1.ts b/tests/cases/fourslash/completionForTripleSlashReference1.ts
new file mode 100644
index 00000000000..2ce4de2e72e
--- /dev/null
+++ b/tests/cases/fourslash/completionForTripleSlashReference1.ts
@@ -0,0 +1,51 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for relative references to ts files when allowJs is false
+
+// @Filename: test0.ts
+//// /// <reference path="/*0*/
+//// /// <reference path="./*1*/
+//// /// <reference path="../*2*/
+//// /// <reference path=".//*3*/
+//// /// <reference path="./f/*4*/" />
+//// /// <reference path="./parentTest//*5*/
+
+// @Filename: parentTest/sub/test1.ts
+//// /// <reference path="../g/*6*/
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f1.js
+//// /*f1j*/
+// @Filename: f1.d.ts
+//// /*f1d*/
+// @Filename: f2.tsx
+//// /f2*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: parentTest/g1.ts
+//// /*parentg1*/
+
+for (let i = 0; i < 5; i++) {
+    goTo.marker("" + i);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f1.d.ts");
+    verify.completionListContains("f2.tsx");
+    verify.completionListContains("e1.ts");
+    verify.completionListContains("parentTest");
+    verify.not.completionListItemsCountIsGreaterThan(5);
+}
+
+goTo.marker("5");
+verify.completionListContains("g1.ts");
+verify.completionListContains("sub");
+verify.not.completionListItemsCountIsGreaterThan(2);
+
+goTo.marker("6");
+verify.completionListContains("g1.ts");
+verify.completionListContains("sub");
+verify.not.completionListItemsCountIsGreaterThan(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference2.ts b/tests/cases/fourslash/completionForTripleSlashReference2.ts
new file mode 100644
index 00000000000..e6553ce8e73
--- /dev/null
+++ b/tests/cases/fourslash/completionForTripleSlashReference2.ts
@@ -0,0 +1,33 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for relative references to js and ts files when allowJs is true
+
+// @allowJs: true
+
+// @Filename: test0.ts
+//// /// <reference path="/*0*/
+//// /// <reference path="./*1*/
+//// /// <reference path="../*2*/
+//// /// <reference path=".//*3*/
+//// /// <reference path="./f/*4*/" />
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f1.js
+//// /*f1j*/
+// @Filename: f1.d.ts
+//// /*f1d*/
+// @Filename: f2.tsx
+//// /f2*/
+// @Filename: f4.jsx
+//// /*f4*/
+
+for (let i = 0; i < 5; i++) {
+    goTo.marker("" + i);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f1.js");
+    verify.completionListContains("f1.d.ts");
+    verify.completionListContains("f2.tsx");
+    verify.completionListContains("f4.jsx");
+    verify.not.completionListItemsCountIsGreaterThan(5);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference3.ts b/tests/cases/fourslash/completionForTripleSlashReference3.ts
new file mode 100644
index 00000000000..798e556be58
--- /dev/null
+++ b/tests/cases/fourslash/completionForTripleSlashReference3.ts
@@ -0,0 +1,43 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for absolute paths
+
+// @Filename: tests/test0.ts
+//// /// <reference path="/tests/cases/f/*0*/
+
+// @Filename: tests/test1.ts
+//// /// <reference path="/tests/cases/fourslash/*1*/
+
+// @Filename: tests/test2.ts
+//// /// <reference path="/tests/cases/fourslash//*2*/
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.tsx
+//// /*f2*/
+// @Filename: folder/f1.ts
+//// /*subf1*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: e2.js
+//// /*e2*/
+
+goTo.marker("0");
+verify.completionListContains("fourslash");
+verify.not.completionListItemsCountIsGreaterThan(1);
+
+goTo.marker("1");
+verify.completionListContains("fourslash");
+verify.not.completionListItemsCountIsGreaterThan(1);
+
+goTo.marker("2");
+verify.completionListContains("f1.ts");
+verify.completionListContains("f2.tsx");
+verify.completionListContains("e1.ts");
+verify.completionListContains("folder");
+verify.completionListContains("tests");
+verify.not.completionListItemsCountIsGreaterThan(5);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference4.ts b/tests/cases/fourslash/completionForTripleSlashReference4.ts
new file mode 100644
index 00000000000..2eb58646675
--- /dev/null
+++ b/tests/cases/fourslash/completionForTripleSlashReference4.ts
@@ -0,0 +1,43 @@
+/// <reference path='fourslash.ts' />
+
+// Should NOT give completions for directories that are merged via the rootDirs compiler option
+
+// @rootDirs: sub/src1,src2
+
+// @Filename: src2/test0.ts
+//// /// <reference path="./mo/*0*/
+
+// @Filename: src2/module0.ts
+//// export var w = 0;
+
+// @Filename: sub/src1/module1.ts
+//// export var x = 0;
+
+// @Filename: sub/src1/module2.ts
+//// export var y = 0;
+
+// @Filename: sub/src1/more/module3.ts
+//// export var z = 0;
+
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.tsx
+//// /*f2*/
+// @Filename: folder/f1.ts
+//// /*subf1*/
+// @Filename: f3.js
+//// /*f3*/
+// @Filename: f4.jsx
+//// /*f4*/
+// @Filename: e1.ts
+//// /*e1*/
+// @Filename: e2.js
+//// /*e2*/
+
+
+goTo.marker("0");
+
+verify.completionListContains("module0.ts");
+
+verify.not.completionListItemsCountIsGreaterThan(1);
\ No newline at end of file
diff --git a/tests/cases/fourslash/definition.ts b/tests/cases/fourslash/definition.ts
index 13abe094376..705cdd65583 100644
--- a/tests/cases/fourslash/definition.ts
+++ b/tests/cases/fourslash/definition.ts
@@ -7,6 +7,4 @@
 // @Filename: a.ts
 //// /*2*/export class Foo {}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/definitionNameOnEnumMember.ts b/tests/cases/fourslash/definitionNameOnEnumMember.ts
index d88e1ef688e..b82b0dc0465 100644
--- a/tests/cases/fourslash/definitionNameOnEnumMember.ts
+++ b/tests/cases/fourslash/definitionNameOnEnumMember.ts
@@ -8,4 +8,4 @@
 ////var enumMember = e./*1*/thirdMember;
 
 goTo.marker("1");
-verify.verifyDefinitionsName("thirdMember", "e");
\ No newline at end of file
+verify.goToDefinitionName("thirdMember", "e");
diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor.ts b/tests/cases/fourslash/findAllReferencesOfConstructor.ts
new file mode 100644
index 00000000000..b25508a60db
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesOfConstructor.ts
@@ -0,0 +1,46 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a.ts
+////export class C {
+////    [|constructor|](n: number);
+////    [|constructor|]();
+////    [|constructor|](n?: number){}
+////    static f() {
+////        this.f();
+////        new [|this|]();
+////    }
+////}
+////new [|C|]();
+// Does not handle alias.
+////const D = C;
+////new D();
+
+// @Filename: b.ts
+////import { C } from "./a";
+////new [|C|]();
+
+// @Filename: c.ts
+////import { C } from "./a";
+////class D extends C {
+////    constructor() {
+////        [|super|]();
+////        super.method();
+////    }
+////    method() { super(); }
+////}
+// Does not find 'super()' calls for a class that merely implements 'C',
+// since those must be calling a different constructor.
+////class E implements C {
+////    constructor() { super(); }
+////}
+
+// Works with qualified names too
+// @Filename: d.ts
+////import * as a from "./a";
+////new a.[|C|]();
+////class d extends a.C { constructor() { [|super|](); }
+
+const ranges = test.ranges();
+for (const ctr of ranges.slice(0, 3)) {
+    verify.referencesOf(ctr, ranges);
+}
diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
new file mode 100644
index 00000000000..77479bad113
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////class C {
+////    [|constructor|](n: number);
+////    [|constructor|](){}
+////}
+
+verify.rangesReferenceEachOther();
diff --git a/tests/cases/fourslash/formattingOptionsChange.ts b/tests/cases/fourslash/formattingOptionsChange.ts
index f266a8e96c1..62272958b8a 100644
--- a/tests/cases/fourslash/formattingOptionsChange.ts
+++ b/tests/cases/fourslash/formattingOptionsChange.ts
@@ -12,6 +12,7 @@
 ////}
 /////*PlaceOpenBraceOnNewLineForControlBlocks*/if (true)   {
 ////}
+/////*InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces*/{          var t = 1};
 
 runTest("InsertSpaceAfterCommaDelimiter", "[1, 2, 3];[72,];", "[1,2,3];[72,];");
 runTest("InsertSpaceAfterSemicolonInForStatements", "for (i = 0; i; i++);", "for (i = 0;i;i++);");
@@ -23,6 +24,7 @@ runTest("InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets", "[ 1 ];[];[];
 runTest("InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces", "`${ 1 }`; `${ 1 }`", "`${1}`; `${1}`");
 runTest("PlaceOpenBraceOnNewLineForFunctions", "class foo", "class foo {");
 runTest("PlaceOpenBraceOnNewLineForControlBlocks", "if ( true )", "if ( true ) {");
+runTest("InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces", "{ var t = 1 };", "{var t = 1};");
 
 
 function runTest(propertyName: string, expectedStringWhenTrue: string, expectedStringWhenFalse: string) {
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 59037e0de67..05bf2d97681 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -99,6 +99,7 @@ declare namespace FourSlashInterface {
     }
     class test_ {
         markers(): Marker[];
+        markerNames(): string[];
         marker(name?: string): Marker;
         ranges(): Range[];
         rangesByText(): { [text: string]: Range[] };
@@ -108,7 +109,6 @@ declare namespace FourSlashInterface {
         marker(name?: string): void;
         bof(): void;
         eof(): void;
-        definition(definitionIndex?: number): void;
         type(definitionIndex?: number): void;
         position(position: number, fileIndex?: number): any;
         position(position: number, fileName?: string): any;
@@ -121,7 +121,7 @@ declare namespace FourSlashInterface {
         constructor(negative?: boolean);
         memberListContains(symbol: string, text?: string, documenation?: string, kind?: string): void;
         memberListCount(expectedCount: number): void;
-        completionListContains(symbol: string, text?: string, documentation?: string, kind?: string): void;
+        completionListContains(symbol: string, text?: string, documentation?: string, kind?: string, spanIndex?: number): void;
         completionListItemsCountIsGreaterThan(count: number): void;
         completionListIsEmpty(): void;
         completionListAllowsNewIdentifier(): void;
@@ -132,10 +132,7 @@ declare namespace FourSlashInterface {
         errorExistsBeforeMarker(markerName?: string): void;
         quickInfoIs(expectedText?: string, expectedDocumentation?: string): void;
         quickInfoExists(): void;
-        definitionCountIs(expectedCount: number): void;
         typeDefinitionCountIs(expectedCount: number): void;
-        definitionLocationExists(): void;
-        verifyDefinitionsName(name: string, containerName: string): void;
         isValidBraceCompletionAtPosition(openingBrace?: string): void;
     }
     class verify extends verifyNegatable {
@@ -152,8 +149,24 @@ declare namespace FourSlashInterface {
         eval(expr: string, value: any): void;
         currentLineContentIs(text: string): void;
         currentFileContentIs(text: string): void;
+        /** Verifies that goToDefinition at the current position would take you to `endMarker`. */
+        goToDefinitionIs(endMarkers: string | string[]): void;
+        goToDefinitionName(name: string, containerName: string): void;
+        /**
+         * `verify.goToDefinition("a", "b");` verifies that go-to-definition at marker "a" takes you to marker "b".
+         * `verify.goToDefinition(["a", "aa"], "b");` verifies that markers "a" and "aa" have the same definition "b".
+         * `verify.goToDefinition("a", ["b", "bb"]);` verifies that "a" has multiple definitions available.
+         */
+        goToDefinition(startMarkerNames: string | string[], endMarkerNames: string | string[]): void;
+        /** Performs `goToDefinition` for each pair. */
+        goToDefinition(startsAndEnds: [string | string[], string | string[]][]): void;
+        /** Performs `goToDefinition` on each key and value. */
+        goToDefinition(startsAndEnds: { [startMarkerName: string]: string | string[] }): void;
+        /** Verifies goToDefinition for each `${markerName}Reference` -> `${markerName}Definition` */
+        goToDefinitionForMarkers(...markerNames: string[]): void;
         verifyGetEmitOutputForCurrentFile(expected: string): void;
         verifyGetEmitOutputContentsForCurrentFile(expected: ts.OutputFile[]): void;
+        referencesCountIs(count: number): void;
         /**
          * Asserts that the given ranges are the references from the current position.
          * If ranges have markers, those markers may have "isDefinition" and "isWriteAccess" data
diff --git a/tests/cases/fourslash/getEmitOutputSingleFile2.ts b/tests/cases/fourslash/getEmitOutputSingleFile2.ts
index 5dd0276a936..5d616b19e13 100644
--- a/tests/cases/fourslash/getEmitOutputSingleFile2.ts
+++ b/tests/cases/fourslash/getEmitOutputSingleFile2.ts
@@ -4,7 +4,7 @@
 // @module: CommonJS
 // @declaration: true
 // @out: declSingleFile.js
-// @outDir: tests/cases/fourslash/
+// @outDir: /tests/cases/fourslash/
 
 // @Filename: inputFile1.ts
 //// var x: number = 5;
diff --git a/tests/cases/fourslash/goToDeclarationDecoratorOverloads.ts b/tests/cases/fourslash/goToDeclarationDecoratorOverloads.ts
new file mode 100644
index 00000000000..c107f7f6803
--- /dev/null
+++ b/tests/cases/fourslash/goToDeclarationDecoratorOverloads.ts
@@ -0,0 +1,19 @@
+// @Target: ES6
+// @experimentaldecorators: true
+
+////async function f() {}
+////
+/////*defDecString*/function dec(target: any, propertyKey: string): void;
+/////*defDecSymbol*/function dec(target: any, propertyKey: symbol): void;
+////function dec(target: any, propertyKey: string | symbol) {}
+////
+////declare const s: symbol;
+////class C {
+////    @/*useDecString*/dec f() {}
+////    @/*useDecSymbol*/dec [s]() {}
+////}
+
+verify.goToDefinition({
+    useDecString: "defDecString",
+    useDecSymbol: "defDecSymbol"
+});
diff --git a/tests/cases/fourslash/goToDefinitionAcrossMultipleProjects.ts b/tests/cases/fourslash/goToDefinitionAcrossMultipleProjects.ts
index bac47638be6..7c0565c626a 100644
--- a/tests/cases/fourslash/goToDefinitionAcrossMultipleProjects.ts
+++ b/tests/cases/fourslash/goToDefinitionAcrossMultipleProjects.ts
@@ -1,17 +1,14 @@
 /// <reference path="fourslash.ts" />
 
 //@Filename: a.ts
-////var x: number;
+////var /*def1*/x: number;
 
 //@Filename: b.ts
-////var x: number;
+////var /*def2*/x: number;
 
 //@Filename: c.ts
 /////// <reference path="a.ts" />
 /////// <reference path="b.ts" />
-/////**/x++;
+/////*use*/x++;
 
-goTo.file("c.ts");
-goTo.marker();
-
-verify.definitionCountIs(2);
\ No newline at end of file
+verify.goToDefinition("use", ["def1", "def2"]);
diff --git a/tests/cases/fourslash/goToDefinitionAlias.ts b/tests/cases/fourslash/goToDefinitionAlias.ts
index f8141db44e3..23cf849f101 100644
--- a/tests/cases/fourslash/goToDefinitionAlias.ts
+++ b/tests/cases/fourslash/goToDefinitionAlias.ts
@@ -23,20 +23,7 @@
 ////    x;
 ////}
 
-
-goTo.marker('alias1Type');
-goTo.definition();
-verify.caretAtMarker('alias1Definition');
-
-goTo.marker('alias2Type');
-goTo.definition();
-verify.caretAtMarker('alias2Definition');
-
-
-goTo.marker('alias1Value');
-goTo.definition();
-verify.caretAtMarker('alias1Definition');
-
-goTo.marker('alias2Value');
-goTo.definition();
-verify.caretAtMarker('alias2Definition');
+verify.goToDefinition([
+    [["alias1Type", "alias1Value"], "alias1Definition"],
+    [["alias2Type", "alias2Value"], "alias2Definition"]
+]);
diff --git a/tests/cases/fourslash/goToDefinitionAmbiants.ts b/tests/cases/fourslash/goToDefinitionAmbiants.ts
index d17ed8d43b0..57885bed4e9 100644
--- a/tests/cases/fourslash/goToDefinitionAmbiants.ts
+++ b/tests/cases/fourslash/goToDefinitionAmbiants.ts
@@ -14,16 +14,4 @@
 ////ambientClass./*staticMethodReference*/method();
 ////ambientClassVariable./*instanceMethodReference*/method();
 
-var markerList = [
-    "ambientVariable",
-    "ambientFunction",
-    "constructor",
-    "staticMethod",
-    "instanceMethod",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
+verify.goToDefinitionForMarkers("ambientVariable", "ambientFunction", "constructor", "staticMethod", "instanceMethod");
diff --git a/tests/cases/fourslash/goToDefinitionApparentTypeProperties.ts b/tests/cases/fourslash/goToDefinitionApparentTypeProperties.ts
index 1b1c15a1153..dd0d91810c4 100644
--- a/tests/cases/fourslash/goToDefinitionApparentTypeProperties.ts
+++ b/tests/cases/fourslash/goToDefinitionApparentTypeProperties.ts
@@ -8,10 +8,4 @@
 ////o./*reference1*/myObjectMethod();
 ////o["/*reference2*/myObjectMethod"]();
 
-goTo.marker("reference1");
-goTo.definition();
-verify.caretAtMarker("definition");
-
-goTo.marker("reference2");
-goTo.definition();
-verify.caretAtMarker("definition");
+verify.goToDefinition(["reference1", "reference2"], "definition");
diff --git a/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts b/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts
index 6ce9bf73f5d..ed7e0e9045c 100644
--- a/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts
+++ b/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts
@@ -5,7 +5,6 @@
 ////var b: /*boolean*/boolean;
 ////var v: /*void*/void;
 
-test.markers().forEach((m, i, a) => {
-    goTo.position(m.position, m.fileName);
-    verify.not.definitionLocationExists();
-});
\ No newline at end of file
+for (const marker of test.markerNames()) {
+    verify.goToDefinition(marker, []);
+}
diff --git a/tests/cases/fourslash/goToDefinitionBuiltInValues.ts b/tests/cases/fourslash/goToDefinitionBuiltInValues.ts
index 168bdd5a86e..da9bf31f2c2 100644
--- a/tests/cases/fourslash/goToDefinitionBuiltInValues.ts
+++ b/tests/cases/fourslash/goToDefinitionBuiltInValues.ts
@@ -6,7 +6,6 @@
 ////var t = /*true*/true;
 ////var f = /*false*/false;
 
-test.markers().forEach((m, i, a) => {
-    goTo.position(m.position, m.fileName);
-    verify.not.definitionLocationExists();
-});
\ No newline at end of file
+for (const marker of test.markerNames()) {
+    verify.goToDefinition(marker, []);
+}
diff --git a/tests/cases/fourslash/goToDefinitionConstructorOfClassExpression01.ts b/tests/cases/fourslash/goToDefinitionConstructorOfClassExpression01.ts
index aa96400a397..4b774b8b0ee 100644
--- a/tests/cases/fourslash/goToDefinitionConstructorOfClassExpression01.ts
+++ b/tests/cases/fourslash/goToDefinitionConstructorOfClassExpression01.ts
@@ -6,6 +6,4 @@
 ////    }
 ////}
 
-goTo.marker("usage");
-goTo.definition();
-verify.caretAtMarker("definition");
\ No newline at end of file
+verify.goToDefinition("usage", "definition");
diff --git a/tests/cases/fourslash/goToDefinitionConstructorOfClassWhenClassIsPrecededByNamespace01.ts b/tests/cases/fourslash/goToDefinitionConstructorOfClassWhenClassIsPrecededByNamespace01.ts
index dc5c362772c..bf698c0752d 100644
--- a/tests/cases/fourslash/goToDefinitionConstructorOfClassWhenClassIsPrecededByNamespace01.ts
+++ b/tests/cases/fourslash/goToDefinitionConstructorOfClassWhenClassIsPrecededByNamespace01.ts
@@ -11,6 +11,4 @@
 ////
 ////var x = new /*usage*/Foo();
 
-goTo.marker("usage");
-goTo.definition();
-verify.caretAtMarker("definition");
\ No newline at end of file
+verify.goToDefinition("usage", "definition");
diff --git a/tests/cases/fourslash/goToDefinitionConstructorOverloads.ts b/tests/cases/fourslash/goToDefinitionConstructorOverloads.ts
index a1fda8886db..a3a5e3286b2 100644
--- a/tests/cases/fourslash/goToDefinitionConstructorOverloads.ts
+++ b/tests/cases/fourslash/goToDefinitionConstructorOverloads.ts
@@ -9,14 +9,8 @@
 ////var constructorOverload = new /*constructorOverloadReference1*/ConstructorOverload();
 ////var constructorOverload = new /*constructorOverloadReference2*/ConstructorOverload("foo");
 
-goTo.marker('constructorOverloadReference1');
-goTo.definition();
-verify.caretAtMarker('constructorDefinition');
-
-goTo.marker('constructorOverloadReference2');
-goTo.definition();
-verify.caretAtMarker('constructorDefinition');
-
-goTo.marker('constructorOverload1');
-goTo.definition();
-verify.caretAtMarker('constructorDefinition');
+verify.goToDefinition({
+    constructorOverloadReference1: "constructorOverload1",
+    constructorOverloadReference2: "constructorOverload2",
+    constructorOverload1: "constructorDefinition"
+});
diff --git a/tests/cases/fourslash/goToDefinitionDecorator.ts b/tests/cases/fourslash/goToDefinitionDecorator.ts
index b0899a9576c..c86b02ab820 100644
--- a/tests/cases/fourslash/goToDefinitionDecorator.ts
+++ b/tests/cases/fourslash/goToDefinitionDecorator.ts
@@ -16,11 +16,7 @@
 ////    return target => target;
 ////}
 
-
-goTo.marker('decoratorUse');
-goTo.definition();
-verify.caretAtMarker('decoratorDefinition');
-
-goTo.marker('decoratorFactoryUse');
-goTo.definition();
-verify.caretAtMarker('decoratorFactoryDefinition');
+verify.goToDefinition({
+    decoratorUse: "decoratorDefinition",
+    decoratorFactoryUse: "decoratorFactoryDefinition"
+});
diff --git a/tests/cases/fourslash/goToDefinitionDifferentFile.ts b/tests/cases/fourslash/goToDefinitionDifferentFile.ts
index 3aa31d1556c..1679563942c 100644
--- a/tests/cases/fourslash/goToDefinitionDifferentFile.ts
+++ b/tests/cases/fourslash/goToDefinitionDifferentFile.ts
@@ -14,16 +14,4 @@
 ////class fooCls implements /*remoteInterfaceReference*/remoteInterface { }
 ////var fooVar = /*remoteModuleReference*/remoteModule.foo;
 
-var markerList = [
-    "remoteVariable",
-    "remoteFunction",
-    "remoteClass",
-    "remoteInterface",
-    "remoteModule",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
+verify.goToDefinitionForMarkers("remoteVariable", "remoteFunction", "remoteClass", "remoteInterface", "remoteModule");
diff --git a/tests/cases/fourslash/goToDefinitionDifferentFileIndirectly.ts b/tests/cases/fourslash/goToDefinitionDifferentFileIndirectly.ts
index 7287fde2d1d..96a65a22033 100644
--- a/tests/cases/fourslash/goToDefinitionDifferentFileIndirectly.ts
+++ b/tests/cases/fourslash/goToDefinitionDifferentFileIndirectly.ts
@@ -21,16 +21,4 @@
 ////class rem2fooCls implements /*remoteInterfaceReference*/rem2Int { }
 ////var rem2fooVar = /*remoteModuleReference*/rem2Mod.foo;
 
-var markerList = [
-    "remoteVariable",
-    "remoteFunction",
-    "remoteClass",
-    "remoteInterface",
-    "remoteModule",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
\ No newline at end of file
+verify.goToDefinitionForMarkers("remoteVariable", "remoteFunction", "remoteClass", "remoteInterface", "remoteModule")
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
index 13abe094376..705cdd65583 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
@@ -7,6 +7,4 @@
 // @Filename: a.ts
 //// /*2*/export class Foo {}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
index 06be8e676dd..866d21b3632 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
@@ -8,6 +8,4 @@
 /////*2*/class Foo {}
 ////export var x = 0;
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName3.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName3.ts
index cd31f027895..afd3b4054a2 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName3.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName3.ts
@@ -9,6 +9,4 @@
 ////    class Foo { }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName4.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName4.ts
index c8bbaa458e4..50d679f7e9e 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName4.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName4.ts
@@ -3,5 +3,4 @@
 // @Filename: b.ts
 ////import n = require('unknown/*1*/');
 
-goTo.marker('1');
-verify.not.definitionLocationExists();
\ No newline at end of file
+verify.goToDefinition("1", []);
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName5.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName5.ts
index 5a6596caccb..ae9343a8f5b 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName5.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName5.ts
@@ -5,6 +5,4 @@
 ////    class Foo { }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName6.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName6.ts
index 46cafbb806c..03c3a23febc 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName6.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName6.ts
@@ -8,6 +8,4 @@
 ////    class Foo { }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName7.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName7.ts
index dcaf4b1f021..4c82099ab20 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName7.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName7.ts
@@ -8,6 +8,4 @@
 ////    class Foo { }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName8.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName8.ts
index 03c36567dc0..5eab37e8393 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName8.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName8.ts
@@ -8,6 +8,4 @@
 ////    class Foo { }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName9.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName9.ts
index 43111c6763f..9e0c1b4986e 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName9.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName9.ts
@@ -8,6 +8,4 @@
 ////    class Foo { }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/goToDefinitionFunctionOverloads.ts b/tests/cases/fourslash/goToDefinitionFunctionOverloads.ts
index 488d788073a..e30150a1f45 100644
--- a/tests/cases/fourslash/goToDefinitionFunctionOverloads.ts
+++ b/tests/cases/fourslash/goToDefinitionFunctionOverloads.ts
@@ -1,20 +1,16 @@
 /// <reference path='fourslash.ts' />
 
-/////*functionOverload1*/function /*functionOverload*/functionOverload();
+/////*functionOverload1*/function /*functionOverload*/functionOverload(value: number);
 /////*functionOverload2*/function functionOverload(value: string);
 /////*functionOverloadDefinition*/function functionOverload() {}
 ////
-/////*functionOverloadReference1*/functionOverload();
+/////*functionOverloadReference1*/functionOverload(123);
 /////*functionOverloadReference2*/functionOverload("123");
+/////*brokenOverload*/functionOverload({});
 
-goTo.marker('functionOverloadReference1');
-goTo.definition();
-verify.caretAtMarker('functionOverloadDefinition');
-
-goTo.marker('functionOverloadReference2');
-goTo.definition();
-verify.caretAtMarker('functionOverloadDefinition');
-
-goTo.marker('functionOverload');
-goTo.definition();
-verify.caretAtMarker('functionOverloadDefinition');
+verify.goToDefinition({
+    functionOverloadReference1: "functionOverload1",
+    functionOverloadReference2: "functionOverload2",
+    brokenOverload: "functionOverload1",
+    functionOverload: "functionOverloadDefinition"
+});
diff --git a/tests/cases/fourslash/goToDefinitionFunctionOverloadsInClass.ts b/tests/cases/fourslash/goToDefinitionFunctionOverloadsInClass.ts
index d5f5a374c39..3426a4d5e1e 100644
--- a/tests/cases/fourslash/goToDefinitionFunctionOverloadsInClass.ts
+++ b/tests/cases/fourslash/goToDefinitionFunctionOverloadsInClass.ts
@@ -11,10 +11,7 @@
 ////    constructor() { }
 ////}
 
-goTo.marker('staticFunctionOverload');
-goTo.definition();
-verify.caretAtMarker('staticFunctionOverloadDefinition');
-
-goTo.marker('functionOverload');
-goTo.definition();
-verify.caretAtMarker('functionOverloadDefinition');
\ No newline at end of file
+verify.goToDefinition({
+    staticFunctionOverload: "staticFunctionOverloadDefinition",
+    functionOverload: "functionOverloadDefinition"
+});
diff --git a/tests/cases/fourslash/goToDefinitionImplicitConstructor.ts b/tests/cases/fourslash/goToDefinitionImplicitConstructor.ts
index 023d7da8ce8..bf24e35307f 100644
--- a/tests/cases/fourslash/goToDefinitionImplicitConstructor.ts
+++ b/tests/cases/fourslash/goToDefinitionImplicitConstructor.ts
@@ -4,6 +4,4 @@
 ////}
 ////var implicitConstructor = new /*constructorReference*/ImplicitConstructor();
 
-goTo.marker('constructorReference');
-goTo.definition();
-verify.caretAtMarker('constructorDefinition');
\ No newline at end of file
+verify.goToDefinitionForMarkers("constructor");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames.ts b/tests/cases/fourslash/goToDefinitionImportedNames.ts
index 98a791d23ae..b7374d00f18 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames.ts
@@ -14,8 +14,5 @@
 ////    x;
 ////}
 
-goTo.file("b.ts");
 
-goTo.marker('classAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
+verify.goToDefinition("classAliasDefinition", "classDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames2.ts b/tests/cases/fourslash/goToDefinitionImportedNames2.ts
index e5ab58d10cf..b0b8776ee37 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames2.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames2.ts
@@ -14,8 +14,4 @@
 ////    x;
 ////}
 
-goTo.file("b.ts");
-
-goTo.marker('classAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
+verify.goToDefinition("classAliasDefinition", "classDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames3.ts b/tests/cases/fourslash/goToDefinitionImportedNames3.ts
index 5e9376d70cb..f8016464360 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames3.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames3.ts
@@ -27,12 +27,4 @@
 ////    x;
 ////}
 
-goTo.file("e.ts");
-
-goTo.marker('classReference');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
-
-goTo.marker('classAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
+verify.goToDefinition(["classReference", "classAliasDefinition"], "classDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames4.ts b/tests/cases/fourslash/goToDefinitionImportedNames4.ts
index e0ef512dc41..4b6b019cfae 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames4.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames4.ts
@@ -14,8 +14,4 @@
 ////    x;
 ////}
 
-goTo.file("b.ts");
-
-goTo.marker('classAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
+verify.goToDefinition("classAliasDefinition", "classDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames5.ts b/tests/cases/fourslash/goToDefinitionImportedNames5.ts
index abd3bee998a..5add12ae0bc 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames5.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames5.ts
@@ -14,8 +14,4 @@
 ////    x;
 ////}
 
-goTo.file("b.ts");
-
-goTo.marker('classAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
+verify.goToDefinition("classAliasDefinition", "classDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames6.ts b/tests/cases/fourslash/goToDefinitionImportedNames6.ts
index c665946c3b1..21603cded42 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames6.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames6.ts
@@ -14,8 +14,4 @@
 ////    x;
 ////}
 
-goTo.file("b.ts");
-
-goTo.marker('moduleAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('moduleDefinition');
+verify.goToDefinition("moduleAliasDefinition", "moduleDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames7.ts b/tests/cases/fourslash/goToDefinitionImportedNames7.ts
index d5bcc499c7c..86be4af3d85 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames7.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames7.ts
@@ -10,8 +10,4 @@
 ////}
 ////export default Class;
 
-goTo.file("b.ts");
-
-goTo.marker('classAliasDefinition');
-goTo.definition();
-verify.caretAtMarker('classDefinition');
+verify.goToDefinition("classAliasDefinition", "classDefinition");
diff --git a/tests/cases/fourslash/goToDefinitionInMemberDeclaration.ts b/tests/cases/fourslash/goToDefinitionInMemberDeclaration.ts
index 1ee65e5644f..66719bb621b 100644
--- a/tests/cases/fourslash/goToDefinitionInMemberDeclaration.ts
+++ b/tests/cases/fourslash/goToDefinitionInMemberDeclaration.ts
@@ -19,35 +19,9 @@
 ////    }
 ////}
 
-
-goTo.marker("interfaceReference");
-goTo.definition();
-verify.caretAtMarker("interfaceDefinition");
-
-goTo.marker("interfaceReferenceInList");
-goTo.definition();
-verify.caretAtMarker("interfaceDefinition");
-
-goTo.marker("interfaceReferenceInConstructor");
-goTo.definition();
-verify.caretAtMarker("interfaceDefinition");
-
-goTo.marker("classReference");
-goTo.definition();
-verify.caretAtMarker("classDefinition");
-
-goTo.marker("classReferenceInInitializer");
-goTo.definition();
-verify.caretAtMarker("classDefinition");
-
-goTo.marker("enumReference");
-goTo.definition();
-verify.caretAtMarker("enumDefinition");
-
-goTo.marker("enumReferenceInInitializer");
-goTo.definition();
-verify.caretAtMarker("enumDefinition");
-
-goTo.marker("selfReference");
-goTo.definition();
-verify.caretAtMarker("selfDefinition");
\ No newline at end of file
+verify.goToDefinition([
+    [["interfaceReference", "interfaceReferenceInList", "interfaceReferenceInConstructor"], "interfaceDefinition"],
+    [["classReference", "classReferenceInInitializer"], "classDefinition"],
+    [["enumReference", "enumReferenceInInitializer"], "enumDefinition"],
+    ["selfReference", "selfDefinition"]
+]);
diff --git a/tests/cases/fourslash/goToDefinitionInTypeArgument.ts b/tests/cases/fourslash/goToDefinitionInTypeArgument.ts
index 2a12e49c5b7..343b5810df3 100644
--- a/tests/cases/fourslash/goToDefinitionInTypeArgument.ts
+++ b/tests/cases/fourslash/goToDefinitionInTypeArgument.ts
@@ -6,11 +6,4 @@
 ////
 ////var x = new Fo/*fooReference*/o<Ba/*barReference*/r>();
 
-
-goTo.marker("barReference");
-goTo.definition();
-verify.caretAtMarker("barDefinition");
-
-goTo.marker("fooReference");
-goTo.definition();
-verify.caretAtMarker("fooDefinition");
+verify.goToDefinitionForMarkers("bar", "foo");
diff --git a/tests/cases/fourslash/goToDefinitionInterfaceAfterImplement.ts b/tests/cases/fourslash/goToDefinitionInterfaceAfterImplement.ts
index e6a763a98f1..585cc187e48 100644
--- a/tests/cases/fourslash/goToDefinitionInterfaceAfterImplement.ts
+++ b/tests/cases/fourslash/goToDefinitionInterfaceAfterImplement.ts
@@ -11,6 +11,4 @@
 ////    }
 ////}
 
-goTo.marker('interfaceReference');
-goTo.definition();
-verify.caretAtMarker('interfaceDefinition');
\ No newline at end of file
+verify.goToDefinitionForMarkers("interface");
diff --git a/tests/cases/fourslash/goToDefinitionLabels.ts b/tests/cases/fourslash/goToDefinitionLabels.ts
index fea447a81fb..5cbf3ac8f2f 100644
--- a/tests/cases/fourslash/goToDefinitionLabels.ts
+++ b/tests/cases/fourslash/goToDefinitionLabels.ts
@@ -9,19 +9,11 @@
 ////    }
 ////}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('label1Definition');
-
-goTo.marker('2');
-goTo.definition();
-verify.caretAtMarker('label2Definition');
-
-// labels accross function bounderies
-goTo.marker('3');
-goTo.definition();
-verify.caretAtMarker('label1Definition');
-
-// undefined label
-goTo.marker('4');
-verify.not.definitionLocationExists();
\ No newline at end of file
+verify.goToDefinition({
+    1: "label1Definition",
+    2: "label2Definition",
+    // labels accross function boundaries
+    3: "label1Definition",
+    // undefined label
+    4: []
+});
diff --git a/tests/cases/fourslash/goToDefinitionMethodOverloads.ts b/tests/cases/fourslash/goToDefinitionMethodOverloads.ts
index 6d74881c2af..199b5aee226 100644
--- a/tests/cases/fourslash/goToDefinitionMethodOverloads.ts
+++ b/tests/cases/fourslash/goToDefinitionMethodOverloads.ts
@@ -1,11 +1,11 @@
 /// <reference path='fourslash.ts' />
 
 ////class MethodOverload {
-////    static me/*staticMethodOverload1*/thod();
-////    static me/*staticMethodOverload2*/thod(foo: string);
-/////*staticMethodDefinition*/static method(foo?: any) { }
-////    public met/*instanceMethodOverload1*/hod(): any;
-////    public met/*instanceMethodOverload2*/hod(foo: string);
+////    /*staticMethodOverload1*/static /*staticMethodOverload1Name*/method();
+////    /*staticMethodOverload2*/static method(foo: string);
+////    /*staticMethodDefinition*/static method(foo?: any) { }
+////    /*instanceMethodOverload1*/public /*instanceMethodOverload1Name*/method(): any;
+////    /*instanceMethodOverload2*/public method(foo: string);
 /////*instanceMethodDefinition*/public method(foo?: any) { return "foo" }
 ////}
 
@@ -18,27 +18,11 @@
 ////methodOverload./*instanceMethodReference1*/method();
 ////methodOverload./*instanceMethodReference2*/method("456");
 
-goTo.marker('staticMethodReference1');
-goTo.definition();
-verify.caretAtMarker('staticMethodDefinition');
-
-goTo.marker('staticMethodReference2');
-goTo.definition();
-verify.caretAtMarker('staticMethodDefinition');
-
-goTo.marker('instanceMethodReference1');
-goTo.definition();
-verify.caretAtMarker('instanceMethodDefinition');
-
-goTo.marker('instanceMethodReference2');
-goTo.definition();
-verify.caretAtMarker('instanceMethodDefinition');
-
-goTo.marker('staticMethodOverload1');
-goTo.definition();
-verify.caretAtMarker('staticMethodDefinition');
-
-goTo.marker('instanceMethodOverload1');
-goTo.definition();
-verify.caretAtMarker('instanceMethodDefinition');
-
+verify.goToDefinition({
+    staticMethodReference1: "staticMethodOverload1",
+    staticMethodReference2: "staticMethodOverload2",
+    instanceMethodReference1: "instanceMethodOverload1",
+    instanceMethodReference2: "instanceMethodOverload2",
+    staticMethodOverload1Name: "staticMethodDefinition",
+    instanceMethodOverload1Name: "instanceMethodDefinition"
+});
diff --git a/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts b/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts
index 6539a025398..7b2cf6e7a85 100644
--- a/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts
+++ b/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts
@@ -1,51 +1,34 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: a.ts
-/////*interfaceDefintion1*/interface IFoo {
+/////*interfaceDefinition1*/interface IFoo {
 ////    instance1: number;
 ////}
 
 // @Filename: b.ts
-/////*interfaceDefintion2*/interface IFoo {
+/////*interfaceDefinition2*/interface IFoo {
 ////    instance2: number;
 ////}
 ////
-/////*interfaceDefintion3*/interface IFoo {
+/////*interfaceDefinition3*/interface IFoo {
 ////    instance3: number;
 ////}
 ////
 ////var ifoo: IFo/*interfaceReference*/o;
 
-goTo.marker('interfaceReference');
-goTo.definition(0);
-verify.caretAtMarker('interfaceDefintion1');
-
-goTo.marker('interfaceReference');
-goTo.definition(1);
-verify.caretAtMarker('interfaceDefintion2');
-
-goTo.marker('interfaceReference');
-goTo.definition(2);
-verify.caretAtMarker('interfaceDefintion3');
-
+verify.goToDefinition("interfaceReference", ["interfaceDefinition1", "interfaceDefinition2", "interfaceDefinition3"]);
 
 // @Filename: c.ts
-/////*moduleDefintion1*/module Module {
+/////*moduleDefinition1*/module Module {
 ////    export class c1 { }
 ////}
 
 // @Filename: d.ts
-/////*moduleDefintion2*/module Module {
+/////*moduleDefinition2*/module Module {
 ////    export class c2 { }
 ////}
 
 // @Filename: e.ts
 ////Modul/*moduleReference*/e;
 
-goTo.marker('moduleReference');
-goTo.definition(0);
-verify.caretAtMarker('moduleDefintion1');
-
-goTo.marker('moduleReference');
-goTo.definition(1);
-verify.caretAtMarker('moduleDefintion2');
+verify.goToDefinition("moduleReference", ["moduleDefinition1", "moduleDefinition2"]);
diff --git a/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts
index 9348ba05678..32b08ab710d 100644
--- a/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts
+++ b/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts
@@ -8,7 +8,4 @@
 ////var foo: I;
 ////var { /*use*/property1: prop1 } = foo;
 
-goTo.marker("use");
-verify.definitionLocationExists();
-goTo.definition();
-verify.caretAtMarker("def");
\ No newline at end of file
+verify.goToDefinition("use", "def");
diff --git a/tests/cases/fourslash/goToDefinitionObjectLiteralProperties.ts b/tests/cases/fourslash/goToDefinitionObjectLiteralProperties.ts
index 545172fb186..8523df2111b 100644
--- a/tests/cases/fourslash/goToDefinitionObjectLiteralProperties.ts
+++ b/tests/cases/fourslash/goToDefinitionObjectLiteralProperties.ts
@@ -14,16 +14,4 @@
 ////o./*methodReference*/method;
 ////o./*es6StyleMethodReference*/es6StyleMethod;
 
-var markerList = [
-    "value",
-    "getter",
-    "setter",
-    "method",
-    "es6StyleMethod",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
\ No newline at end of file
+verify.goToDefinitionForMarkers("value", "getter", "setter", "method", "es6StyleMethod");
diff --git a/tests/cases/fourslash/goToDefinitionOverloadsInMultiplePropertyAccesses.ts b/tests/cases/fourslash/goToDefinitionOverloadsInMultiplePropertyAccesses.ts
new file mode 100644
index 00000000000..63c23cfe46f
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionOverloadsInMultiplePropertyAccesses.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// Test that we can climb past more than one property access to reach a call expression.
+
+////namespace A {
+////    export namespace B {
+////        export function f(value: number): void;
+////        /*1*/export function f(value: string): void;
+////        export function f(value: number | string) {}
+////    }
+////}
+////A.B./*2*/f("");
+
+verify.goToDefinition("2", "1");
diff --git a/tests/cases/fourslash/goToDefinitionPartialImplementation.ts b/tests/cases/fourslash/goToDefinitionPartialImplementation.ts
index 81e417b6c0f..90402b3f8e6 100644
--- a/tests/cases/fourslash/goToDefinitionPartialImplementation.ts
+++ b/tests/cases/fourslash/goToDefinitionPartialImplementation.ts
@@ -9,13 +9,11 @@
 
 // @Filename: goToDefinitionPartialImplementation_2.ts
 ////module A {
-////    export interface IA {
+////    /*Part2Definition*/export interface IA {
 ////        x: number;
 ////    }
 ////
 ////    var x: /*Part2Use*/IA;
 ////}
 
-goTo.marker('Part2Use');
-goTo.definition();
-verify.caretAtMarker('Part1Definition');
+verify.goToDefinition("Part2Use", ["Part1Definition", "Part2Definition"]);
diff --git a/tests/cases/fourslash/goToDefinitionPrimitives.ts b/tests/cases/fourslash/goToDefinitionPrimitives.ts
index 19840f3b228..c0bf2483594 100644
--- a/tests/cases/fourslash/goToDefinitionPrimitives.ts
+++ b/tests/cases/fourslash/goToDefinitionPrimitives.ts
@@ -2,7 +2,4 @@
 
 ////var x: st/*primitive*/ring;
 
-goTo.marker("primitive");
-verify.not.definitionLocationExists();
-
-
+verify.goToDefinition("primitive", []);
diff --git a/tests/cases/fourslash/goToDefinitionSameFile.ts b/tests/cases/fourslash/goToDefinitionSameFile.ts
index 1285932b3f2..6bbdaf3a189 100644
--- a/tests/cases/fourslash/goToDefinitionSameFile.ts
+++ b/tests/cases/fourslash/goToDefinitionSameFile.ts
@@ -13,16 +13,4 @@
 ////class fooCls implements /*localInterfaceReference*/localInterface { }
 ////var fooVar = /*localModuleReference*/localModule.foo;
 
-var markerList = [
-    "localVariable",
-    "localFunction",
-    "localClass",
-    "localInterface",
-    "localModule",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
+verify.goToDefinitionForMarkers("localVariable", "localFunction", "localClass", "localInterface", "localModule");
diff --git a/tests/cases/fourslash/goToDefinitionShadowVariable.ts b/tests/cases/fourslash/goToDefinitionShadowVariable.ts
index 69488026af0..0a30228790b 100644
--- a/tests/cases/fourslash/goToDefinitionShadowVariable.ts
+++ b/tests/cases/fourslash/goToDefinitionShadowVariable.ts
@@ -6,6 +6,4 @@
 ////    /*shadowVariableReference*/shadowVariable = 1;
 ////}
 
-goTo.marker('shadowVariableReference');
-goTo.definition();
-verify.caretAtMarker('shadowVariableDefinition');
+verify.goToDefinitionForMarkers("shadowVariable");
diff --git a/tests/cases/fourslash/goToDefinitionShadowVariableInsideModule.ts b/tests/cases/fourslash/goToDefinitionShadowVariableInsideModule.ts
index 92f2761b61a..953b8ea47fe 100644
--- a/tests/cases/fourslash/goToDefinitionShadowVariableInsideModule.ts
+++ b/tests/cases/fourslash/goToDefinitionShadowVariableInsideModule.ts
@@ -5,6 +5,4 @@
 ////    /*shadowVariableReference*/shdVar = 1;
 ////}
 
-goTo.marker('shadowVariableReference');
-goTo.definition();
-verify.caretAtMarker('shadowVariableDefinition');
\ No newline at end of file
+verify.goToDefinitionForMarkers("shadowVariable");
diff --git a/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts b/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts
index 5e906893719..4107049286c 100644
--- a/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts
+++ b/tests/cases/fourslash/goToDefinitionShorthandProperty01.ts
@@ -7,19 +7,9 @@
 //// obj./*valueReference1*/name;
 //// obj./*valueReference2*/id;
 
-goTo.marker("valueDefinition1");
-goTo.definition();
-verify.caretAtMarker("valueDeclaration1");
-
-goTo.marker("valueDefinition2");
-goTo.definition(0);
-verify.caretAtMarker("valueDeclaration2");
-goTo.definition(1);
-verify.caretAtMarker("valueDeclaration3");
-
-goTo.marker("valueReference1");
-goTo.definition();
-verify.caretAtMarker("valueDefinition1");
-goTo.marker("valueReference2");
-goTo.definition();
-verify.caretAtMarker("valueDefinition2");
+verify.goToDefinition({
+    valueDefinition1: "valueDeclaration1",
+    valueDefinition2: ["valueDeclaration2", "valueDeclaration3"],
+    valueReference1: "valueDefinition1",
+    valueReference2: "valueDefinition2"
+});
diff --git a/tests/cases/fourslash/goToDefinitionShorthandProperty02.ts b/tests/cases/fourslash/goToDefinitionShorthandProperty02.ts
index 1f8fe466277..0ecdcacdcd6 100644
--- a/tests/cases/fourslash/goToDefinitionShorthandProperty02.ts
+++ b/tests/cases/fourslash/goToDefinitionShorthandProperty02.ts
@@ -4,5 +4,4 @@
 ////    f/*1*/oo
 ////}
 
-goTo.marker("1");
-verify.not.definitionLocationExists();
\ No newline at end of file
+verify.goToDefinition("1", []);
diff --git a/tests/cases/fourslash/goToDefinitionShorthandProperty03.ts b/tests/cases/fourslash/goToDefinitionShorthandProperty03.ts
index eb21b159f5a..42a9ee0a4d6 100644
--- a/tests/cases/fourslash/goToDefinitionShorthandProperty03.ts
+++ b/tests/cases/fourslash/goToDefinitionShorthandProperty03.ts
@@ -7,10 +7,7 @@
 ////    /*letProp*/y
 ////}
 
-goTo.marker("varProp");
-goTo.definition();
-verify.caretAtMarker("varDef");
-
-goTo.marker("letProp");
-goTo.definition();
-verify.caretAtMarker("letDef");
\ No newline at end of file
+verify.goToDefinition({
+    varProp: "varDef",
+    letProp: "letDef"
+});
diff --git a/tests/cases/fourslash/goToDefinitionSimple.ts b/tests/cases/fourslash/goToDefinitionSimple.ts
index 47c1909cf12..39aa8ecfca9 100644
--- a/tests/cases/fourslash/goToDefinitionSimple.ts
+++ b/tests/cases/fourslash/goToDefinitionSimple.ts
@@ -7,10 +7,4 @@
 //// var n = new /*1*/c();
 //// var n = new c/*3*/();
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
-
-goTo.marker('3');
-goTo.definition();
-verify.caretAtMarker('2');
+verify.goToDefinition(["1", "3"], "2");
diff --git a/tests/cases/fourslash/goToDefinitionSourceUnit.ts b/tests/cases/fourslash/goToDefinitionSourceUnit.ts
index 09900ff41be..e66b5ef7960 100644
--- a/tests/cases/fourslash/goToDefinitionSourceUnit.ts
+++ b/tests/cases/fourslash/goToDefinitionSourceUnit.ts
@@ -16,9 +16,7 @@
 // @Filename: b.ts
 /////*fileB*/
 
-goTo.marker("unknownFile");
-verify.not.definitionLocationExists();
-
-goTo.marker("knownFile");
-goTo.definition();
-verify.caretAtMarker('fileB');
+verify.goToDefinition({
+    unknownFile: [],
+    knownFile: "fileB"
+});
diff --git a/tests/cases/fourslash/goToDefinitionTaggedTemplateOverloads.ts b/tests/cases/fourslash/goToDefinitionTaggedTemplateOverloads.ts
new file mode 100644
index 00000000000..fad27cabbb6
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionTaggedTemplateOverloads.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+/////*defFNumber*/function f(strs: TemplateStringsArray, x: number): void;
+/////*defFBool*/function f(strs: TemplateStringsArray, x: boolean): void;
+////function f(strs: TemplateStringsArray, x: number | boolean) {}
+////
+/////*useFNumber*/f`${0}`;
+/////*useFBool*/f`${false}`;
+
+verify.goToDefinition({
+    useFNumber: "defFNumber",
+    useFBool: "defFBool"
+});
diff --git a/tests/cases/fourslash/goToDefinitionThis.ts b/tests/cases/fourslash/goToDefinitionThis.ts
index 300e3423d81..5cb94ef35c7 100644
--- a/tests/cases/fourslash/goToDefinitionThis.ts
+++ b/tests/cases/fourslash/goToDefinitionThis.ts
@@ -1,6 +1,5 @@
 /// <reference path='fourslash.ts'/>
 
-// @noLib: true
 ////function f(/*fnDecl*/this: number) {
 ////    return /*fnUse*/this;
 ////}
@@ -9,12 +8,8 @@
 ////    get self(/*getterDecl*/this: number) { return /*getterUse*/this; }
 ////}
 
-function verifyDefinition(a, b) {
-    goTo.marker(a);
-    goTo.definition();
-    verify.caretAtMarker(b);
-}
-
-verifyDefinition("fnUse", "fnDecl");
-verifyDefinition("clsUse", "cls");
-verifyDefinition("getterUse", "getterDecl");
+verify.goToDefinition({
+    "fnUse": "fnDecl",
+    "clsUse": "cls",
+    "getterUse": "getterDecl"
+});
diff --git a/tests/cases/fourslash/goToDefinitionTypePredicate.ts b/tests/cases/fourslash/goToDefinitionTypePredicate.ts
index 40f1d1eb94c..dd2b69f37e8 100644
--- a/tests/cases/fourslash/goToDefinitionTypePredicate.ts
+++ b/tests/cases/fourslash/goToDefinitionTypePredicate.ts
@@ -5,12 +5,7 @@
 ////     return typeof parameter === "string";
 //// }
 
-goTo.marker('parameterName');
-
-goTo.definition();
-verify.caretAtMarker('parameterDeclaration');
-
-goTo.marker('typeReference');
-
-goTo.definition();
-verify.caretAtMarker('classDeclaration');
\ No newline at end of file
+verify.goToDefinition({
+    parameterName: "parameterDeclaration",
+    typeReference: "classDeclaration"
+});
diff --git a/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts b/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts
index 78dfa94c5e4..ad02bb9d851 100644
--- a/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts
+++ b/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts
@@ -8,6 +8,4 @@
 //// /// <reference types="lib/*1*/"/>
 //// $.x;
 
-goTo.marker("1");
-goTo.definition();
-verify.caretAtMarker("0");
\ No newline at end of file
+verify.goToDefinition("1", "0");
diff --git a/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts b/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts
index 8b7b19dc871..ceb1dc6d5be 100644
--- a/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts
+++ b/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts
@@ -5,7 +5,6 @@
 ////var x = {}; x.some/*undefinedProperty*/Property;
 ////var a: any; a.some/*unkownProperty*/Property;
 
-test.markers().forEach((m, i, a) => {
-    goTo.position(m.position, m.fileName);
-    verify.not.definitionLocationExists();
-});
+for (const marker of test.markerNames()) {
+    verify.goToDefinition(marker, []);
+}
diff --git a/tests/cases/fourslash/goToDefinitionUnionTypeProperty1.ts b/tests/cases/fourslash/goToDefinitionUnionTypeProperty1.ts
index 65d7201aecf..82bd07e32f0 100644
--- a/tests/cases/fourslash/goToDefinitionUnionTypeProperty1.ts
+++ b/tests/cases/fourslash/goToDefinitionUnionTypeProperty1.ts
@@ -15,12 +15,4 @@
 ////x./*propertyReference*/commonProperty;
 ////x./*3*/commonFunction;
 
-
-goTo.marker("propertyReference");
-verify.definitionCountIs(2);
-goTo.definition(0);
-verify.caretAtMarker("propertyDefinition1");
-
-goTo.marker("propertyReference");
-goTo.definition(1);
-verify.caretAtMarker("propertyDefinition2");
+verify.goToDefinition("propertyReference", ["propertyDefinition1", "propertyDefinition2"]);
diff --git a/tests/cases/fourslash/goToDefinitionUnionTypeProperty2.ts b/tests/cases/fourslash/goToDefinitionUnionTypeProperty2.ts
index 674d5f4b623..22ffb906e8e 100644
--- a/tests/cases/fourslash/goToDefinitionUnionTypeProperty2.ts
+++ b/tests/cases/fourslash/goToDefinitionUnionTypeProperty2.ts
@@ -16,11 +16,4 @@
 ////
 ////x.common./*propertyReference*/a;
 
-goTo.marker("propertyReference");
-verify.definitionCountIs(2);
-goTo.definition(0);
-verify.caretAtMarker("propertyDefinition2");
-
-goTo.marker("propertyReference");
-goTo.definition(1);
-verify.caretAtMarker("propertyDefinition1");
+verify.goToDefinition("propertyReference", ["propertyDefinition2", "propertyDefinition1"]);
diff --git a/tests/cases/fourslash/goToDefinitionUnionTypeProperty3.ts b/tests/cases/fourslash/goToDefinitionUnionTypeProperty3.ts
index 337bae7d520..fde4d2319fe 100644
--- a/tests/cases/fourslash/goToDefinitionUnionTypeProperty3.ts
+++ b/tests/cases/fourslash/goToDefinitionUnionTypeProperty3.ts
@@ -9,7 +9,4 @@
 ////
 ////var x = (strings || numbers)./*usage*/specialPop()
 
-goTo.marker("usage");
-verify.definitionCountIs(1);
-goTo.definition();
-verify.caretAtMarker("definition");
+verify.goToDefinition("usage", "definition");
diff --git a/tests/cases/fourslash/goToDefinitionUnionTypeProperty4.ts b/tests/cases/fourslash/goToDefinitionUnionTypeProperty4.ts
index eb17f9570c2..f69554098c5 100644
--- a/tests/cases/fourslash/goToDefinitionUnionTypeProperty4.ts
+++ b/tests/cases/fourslash/goToDefinitionUnionTypeProperty4.ts
@@ -18,15 +18,4 @@
 ////
 ////var x = (snapcrackle || magnitude || art)./*usage*/pop;
 
-goTo.marker("usage");
-verify.definitionCountIs(3);
-goTo.definition(0);
-verify.caretAtMarker("def1");
-
-goTo.marker("usage");
-goTo.definition(1);
-verify.caretAtMarker("def2");
-
-goTo.marker("usage");
-goTo.definition(2);
-verify.caretAtMarker("def3");
\ No newline at end of file
+verify.goToDefinition("usage", ["def1", "def2", "def3"]);
diff --git a/tests/cases/fourslash/goToDefinition_super.ts b/tests/cases/fourslash/goToDefinition_super.ts
new file mode 100644
index 00000000000..7a7008ba07f
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinition_super.ts
@@ -0,0 +1,29 @@
+///<reference path="fourslash.ts"/>
+
+////class A {
+////    /*ctr*/constructor() {}
+////    x() {}
+////}
+/////*B*/class B extends A {}
+////class C extends B {
+////    constructor() {
+////        /*super*/super();
+////    }
+////    method() {
+////        /*superExpression*/super.x();
+////    }
+////}
+////class D {
+////    constructor() {
+////        /*superBroken*/super();
+////    }
+////}
+
+
+verify.goToDefinition({
+    // Super in call position goes to constructor.
+    super: "ctr",
+    // Super in any other position goes to the superclass.
+    superExpression: "B",
+    superBroken: []
+});
diff --git a/tests/cases/fourslash/goToModuleAliasDefinition.ts b/tests/cases/fourslash/goToModuleAliasDefinition.ts
index 7b210df3e0f..cdec82fd0d4 100644
--- a/tests/cases/fourslash/goToModuleAliasDefinition.ts
+++ b/tests/cases/fourslash/goToModuleAliasDefinition.ts
@@ -7,7 +7,5 @@
 //// /*3*/import n = require('a');
 //// var x = new /*1*/n.Foo();
 
-goTo.marker('1');
-goTo.definition();
 // Won't-fixed: Should go to '2' instead
-verify.caretAtMarker('3');
+verify.goToDefinition("1", "3");
diff --git a/tests/cases/fourslash/hoverOverComment.ts b/tests/cases/fourslash/hoverOverComment.ts
index c0e585ca3b6..653eaedfcb7 100644
--- a/tests/cases/fourslash/hoverOverComment.ts
+++ b/tests/cases/fourslash/hoverOverComment.ts
@@ -6,6 +6,5 @@
 
 goTo.marker();
 verify.quickInfoIs("");
-verify.verifyDefinitionsName("", "");
-verify.typeDefinitionCountIs(0);
+verify.goToDefinitionIs([]);
 verify.referencesAre([]);
diff --git a/tests/cases/fourslash/javaScriptClass3.ts b/tests/cases/fourslash/javaScriptClass3.ts
index 47004d53b04..41ce79b35eb 100644
--- a/tests/cases/fourslash/javaScriptClass3.ts
+++ b/tests/cases/fourslash/javaScriptClass3.ts
@@ -15,10 +15,7 @@
 //// x.alpha/*src1*/;
 //// x.beta/*src2*/;
 
-goTo.marker('src1');
-goTo.definition();
-verify.caretAtMarker('dst1');
-
-goTo.marker('src2');
-goTo.definition();
-verify.caretAtMarker('dst2');
+verify.goToDefinition({
+    src1: "dst1",
+    src2: "dst2"
+});
diff --git a/tests/cases/fourslash/jsxSpreadReference.ts b/tests/cases/fourslash/jsxSpreadReference.ts
index 64ab03e6ab9..595549967e6 100644
--- a/tests/cases/fourslash/jsxSpreadReference.ts
+++ b/tests/cases/fourslash/jsxSpreadReference.ts
@@ -17,9 +17,7 @@
 //// var [|/*dst*/nn|]: {name?: string; size?: number};
 //// var x = <MyClass {...[|n/*src*/n|]}></MyClass>;
 
-goTo.marker('src');
-goTo.definition();
-verify.caretAtMarker('dst');
+verify.goToDefinition("src", "dst");
 
 goTo.marker('src');
 verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
diff --git a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts
index 8ede0f07ea0..30e96739ab0 100644
--- a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts
+++ b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts
@@ -90,6 +90,17 @@ verify.navigationBar([
         ],
         "indent": 2
     },
+    {
+        "text": "y",
+        "kind": "const",
+        "childItems": [
+            {
+                "text": "foo",
+                "kind": "function"
+            }
+        ],
+        "indent": 2
+    },
     {
         "text": "<function>",
         "kind": "function",
diff --git a/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts b/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts
new file mode 100644
index 00000000000..f14419a121a
--- /dev/null
+++ b/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts
@@ -0,0 +1,46 @@
+/// <reference path="fourslash.ts"/>
+
+////var a = {
+////    propA: function() {}
+////};
+////var b;
+////b = {
+////    propB: function() {}
+////};
+
+verify.navigationBar([
+  {
+    "text": "<global>",
+    "kind": "script",
+    "childItems": [
+      {
+        "text": "a",
+        "kind": "var"
+      },
+      {
+        "text": "b",
+        "kind": "var"
+      },
+      {
+        "text": "propB",
+        "kind": "function"
+      }
+    ]
+  },
+  {
+    "text": "a",
+    "kind": "var",
+    "childItems": [
+      {
+        "text": "propA",
+        "kind": "function"
+      }
+    ],
+    "indent": 1
+  },
+  {
+    "text": "propB",
+    "kind": "function",
+    "indent": 1
+  }
+]);
diff --git a/tests/cases/fourslash/proto.ts b/tests/cases/fourslash/proto.ts
index d99a3d8b5b5..638faa1d73e 100644
--- a/tests/cases/fourslash/proto.ts
+++ b/tests/cases/fourslash/proto.ts
@@ -14,7 +14,6 @@ verify.quickInfoIs("var __proto__: M.__proto__", "");
 goTo.marker('3');
 verify.completionListContains("__proto__", "var __proto__: M.__proto__", "");
 edit.insert("__proto__");
-goTo.definition();
-verify.caretAtMarker('2');
+verify.goToDefinitionIs("2");
 goTo.marker('4');
 verify.quickInfoIs("var fun: (__proto__: any) => boolean", "");
diff --git a/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts b/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts
index 97e5750241f..ea660aa89ec 100644
--- a/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts
+++ b/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts
@@ -21,6 +21,4 @@ verify.occurrencesAtPositionContains(def);
 verify.occurrencesAtPositionContains(imp);
 verify.occurrencesAtPositionContains(mem);
 
-goTo.definition();
-
-verify.caretAtMarker('def');
\ No newline at end of file
+verify.goToDefinitionIs("def");
diff --git a/tests/cases/fourslash/quickInfoMeaning.ts b/tests/cases/fourslash/quickInfoMeaning.ts
index 51b17337486..390dc367959 100644
--- a/tests/cases/fourslash/quickInfoMeaning.ts
+++ b/tests/cases/fourslash/quickInfoMeaning.ts
@@ -26,13 +26,11 @@ verify.navigationItemsListContains("foo", "const", "foo", "exact");
 
 goTo.marker("foo_value");
 verify.quickInfoIs("const foo: number");
-goTo.definition();
-verify.caretAtMarker("foo_value_declaration");
+verify.goToDefinitionIs("foo_value_declaration");
 
 goTo.marker("foo_type");
 verify.quickInfoIs("import foo = require(\"foo_module\")");
-goTo.definition();
-verify.caretAtMarker("foo_type_declaration");
+verify.goToDefinitionIs("foo_type_declaration");
 
 
 // Above tested for global const and imported interface. Now test with global interface and imported const.
@@ -58,10 +56,8 @@ verify.navigationItemsListContains("bar", "interface", "bar", "exact");
 
 goTo.marker("bar_value");
 verify.quickInfoIs("import bar = require(\"bar_module\")");
-goTo.definition();
-verify.caretAtMarker("bar_value_declaration");
+verify.goToDefinitionIs("bar_value_declaration");
 
 goTo.marker("bar_type");
 verify.quickInfoIs("interface bar");
-goTo.definition();
-verify.caretAtMarker("bar_type_declaration");
+verify.goToDefinitionIs("bar_type_declaration");
diff --git a/tests/cases/fourslash/renameForDefaultExport04.ts b/tests/cases/fourslash/renameForDefaultExport04.ts
index ba40374e262..b225c47b2b2 100644
--- a/tests/cases/fourslash/renameForDefaultExport04.ts
+++ b/tests/cases/fourslash/renameForDefaultExport04.ts
@@ -12,4 +12,4 @@
 ////var y = new DefaultExportedClass;
 
 goTo.marker();
-verify.renameInfoSucceeded("DefaultExportedClass", '"tests/cases/fourslash/foo".DefaultExportedClass');
\ No newline at end of file
+verify.renameInfoSucceeded("DefaultExportedClass", '"/tests/cases/fourslash/foo".DefaultExportedClass');
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport05.ts b/tests/cases/fourslash/renameForDefaultExport05.ts
index 099f878bda1..2e5fcd847d8 100644
--- a/tests/cases/fourslash/renameForDefaultExport05.ts
+++ b/tests/cases/fourslash/renameForDefaultExport05.ts
@@ -12,4 +12,4 @@
 ////var y = new DefaultExportedClass;
 
 goTo.marker();
-verify.renameInfoSucceeded("DefaultExportedClass", '"tests/cases/fourslash/foo".DefaultExportedClass');
\ No newline at end of file
+verify.renameInfoSucceeded("DefaultExportedClass", '"/tests/cases/fourslash/foo".DefaultExportedClass');
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport06.ts b/tests/cases/fourslash/renameForDefaultExport06.ts
index 3ec067b7029..ba7f8cac7d7 100644
--- a/tests/cases/fourslash/renameForDefaultExport06.ts
+++ b/tests/cases/fourslash/renameForDefaultExport06.ts
@@ -12,4 +12,4 @@
 ////var y = new /**/[|DefaultExportedClass|];
 
 goTo.marker();
-verify.renameInfoSucceeded("DefaultExportedClass", '"tests/cases/fourslash/foo".DefaultExportedClass');
\ No newline at end of file
+verify.renameInfoSucceeded("DefaultExportedClass", '"/tests/cases/fourslash/foo".DefaultExportedClass');
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport07.ts b/tests/cases/fourslash/renameForDefaultExport07.ts
index b65f348f2a0..9e3b4741b55 100644
--- a/tests/cases/fourslash/renameForDefaultExport07.ts
+++ b/tests/cases/fourslash/renameForDefaultExport07.ts
@@ -13,4 +13,4 @@
 ////var y = DefaultExportedFunction();
 
 goTo.marker();
-verify.renameInfoSucceeded("DefaultExportedFunction", '"tests/cases/fourslash/foo".DefaultExportedFunction');
\ No newline at end of file
+verify.renameInfoSucceeded("DefaultExportedFunction", '"/tests/cases/fourslash/foo".DefaultExportedFunction');
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport08.ts b/tests/cases/fourslash/renameForDefaultExport08.ts
index 9b3f23db2c1..ad8a2b8242f 100644
--- a/tests/cases/fourslash/renameForDefaultExport08.ts
+++ b/tests/cases/fourslash/renameForDefaultExport08.ts
@@ -13,4 +13,4 @@
 ////var y = DefaultExportedFunction();
 
 goTo.marker();
-verify.renameInfoSucceeded("DefaultExportedFunction", '"tests/cases/fourslash/foo".DefaultExportedFunction');
\ No newline at end of file
+verify.renameInfoSucceeded("DefaultExportedFunction", '"/tests/cases/fourslash/foo".DefaultExportedFunction');
\ No newline at end of file
diff --git a/tests/cases/fourslash/server/definition01.ts b/tests/cases/fourslash/server/definition01.ts
index c0c297f89e5..7889d185fcd 100644
--- a/tests/cases/fourslash/server/definition01.ts
+++ b/tests/cases/fourslash/server/definition01.ts
@@ -7,6 +7,4 @@
 // @Filename: a.ts
 //// /*2*/export class Foo {}
 
-goTo.marker('1');
-goTo.definition();
-verify.caretAtMarker('2');
\ No newline at end of file
+verify.goToDefinition("1", "2");
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts b/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts
index 4db14611938..2183c8d5471 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagGoToDefinition.ts
@@ -19,11 +19,7 @@
 //// /** @type {Animal} */
 //// var animal; animal.animalName/*4*/
 
-goTo.file('jsdocCompletion_typedef.js');
-goTo.marker('3');
-goTo.definition();
-verify.caretAtMarker('1');
-
-goTo.marker('4');
-goTo.definition();
-verify.caretAtMarker('2');
+verify.goToDefinition({
+    3: "1",
+    4: "2"
+});
diff --git a/tests/cases/fourslash/shims-pp/getDefinitionAtPosition.ts b/tests/cases/fourslash/shims-pp/getDefinitionAtPosition.ts
index 3aa31d1556c..1679563942c 100644
--- a/tests/cases/fourslash/shims-pp/getDefinitionAtPosition.ts
+++ b/tests/cases/fourslash/shims-pp/getDefinitionAtPosition.ts
@@ -14,16 +14,4 @@
 ////class fooCls implements /*remoteInterfaceReference*/remoteInterface { }
 ////var fooVar = /*remoteModuleReference*/remoteModule.foo;
 
-var markerList = [
-    "remoteVariable",
-    "remoteFunction",
-    "remoteClass",
-    "remoteInterface",
-    "remoteModule",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
+verify.goToDefinitionForMarkers("remoteVariable", "remoteFunction", "remoteClass", "remoteInterface", "remoteModule");
diff --git a/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts b/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts
index 78dfa94c5e4..ad02bb9d851 100644
--- a/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts
+++ b/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts
@@ -8,6 +8,4 @@
 //// /// <reference types="lib/*1*/"/>
 //// $.x;
 
-goTo.marker("1");
-goTo.definition();
-verify.caretAtMarker("0");
\ No newline at end of file
+verify.goToDefinition("1", "0");
diff --git a/tests/cases/fourslash/shims/getDefinitionAtPosition.ts b/tests/cases/fourslash/shims/getDefinitionAtPosition.ts
index 3aa31d1556c..1679563942c 100644
--- a/tests/cases/fourslash/shims/getDefinitionAtPosition.ts
+++ b/tests/cases/fourslash/shims/getDefinitionAtPosition.ts
@@ -14,16 +14,4 @@
 ////class fooCls implements /*remoteInterfaceReference*/remoteInterface { }
 ////var fooVar = /*remoteModuleReference*/remoteModule.foo;
 
-var markerList = [
-    "remoteVariable",
-    "remoteFunction",
-    "remoteClass",
-    "remoteInterface",
-    "remoteModule",
-];
-
-markerList.forEach((marker) => {
-    goTo.marker(marker + 'Reference');
-    goTo.definition();
-    verify.caretAtMarker(marker + 'Definition');
-});
+verify.goToDefinitionForMarkers("remoteVariable", "remoteFunction", "remoteClass", "remoteInterface", "remoteModule");
diff --git a/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts b/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts
index dc2fc356c57..4669b7f62e9 100644
--- a/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts
+++ b/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts
@@ -8,6 +8,4 @@
 //// /// <reference types="lib/*1*/"/>
 //// $.x;
 
-goTo.marker("1");
-goTo.definition();
-verify.caretAtMarker("0");
\ No newline at end of file
+verify.goToDefinition("1", "0");
diff --git a/tests/cases/fourslash/tsxGoToDefinitionClasses.ts b/tests/cases/fourslash/tsxGoToDefinitionClasses.ts
index 11ff3afeb8a..9c54834534d 100644
--- a/tests/cases/fourslash/tsxGoToDefinitionClasses.ts
+++ b/tests/cases/fourslash/tsxGoToDefinitionClasses.ts
@@ -14,10 +14,7 @@
 //// var x = <My/*c*/Class />;
 //// var y = <MyClass f/*p*/oo= 'hello' />;
 
-goTo.marker('c');
-goTo.definition();
-verify.caretAtMarker('ct');
-
-goTo.marker('p');
-goTo.definition();
-verify.caretAtMarker('pt');
+verify.goToDefinition({
+    c: "ct",
+    p: "pt"
+});
diff --git a/tests/cases/fourslash/tsxGoToDefinitionIntrinsics.ts b/tests/cases/fourslash/tsxGoToDefinitionIntrinsics.ts
index bbdf395e478..a82e813baa7 100644
--- a/tests/cases/fourslash/tsxGoToDefinitionIntrinsics.ts
+++ b/tests/cases/fourslash/tsxGoToDefinitionIntrinsics.ts
@@ -15,15 +15,8 @@
 //// var y = <s/*ss*/pan />;
 //// var z = <div na/*ps*/me='hello' />;
 
-goTo.marker('ds');
-goTo.definition();
-verify.caretAtMarker('dt');
-
-goTo.marker('ss');
-goTo.definition();
-verify.caretAtMarker('st');
-
-goTo.marker('ps');
-goTo.definition();
-verify.caretAtMarker('pt');
-
+verify.goToDefinition({
+    ds: "dt",
+    ss: "st",
+    ps: "pt"
+});
diff --git a/tests/cases/fourslash_old/thisRefGotoDef.ts b/tests/cases/fourslash_old/thisRefGotoDef.ts
index 125b4acc985..ba16a6aa31c 100644
--- a/tests/cases/fourslash_old/thisRefGotoDef.ts
+++ b/tests/cases/fourslash_old/thisRefGotoDef.ts
@@ -9,6 +9,4 @@
 ////     }
 //// }
 
-goTo.marker('ref');
-goTo.definition();
-verify.caretAtMarker('def');
\ No newline at end of file
+verify.goToDefinition("ref", "def");
diff --git a/tests/cases/unittests/matchFiles.ts b/tests/cases/unittests/matchFiles.ts
new file mode 100644
index 00000000000..91be2de8747
--- /dev/null
+++ b/tests/cases/unittests/matchFiles.ts
@@ -0,0 +1,1152 @@
+/// <reference path="..\..\..\src\harness\external\mocha.d.ts" />
+/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\..\..\src\harness\virtualFileSystem.ts" />
+
+namespace ts {
+    const caseInsensitiveBasePath = "c:/dev/";
+    const caseInsensitiveHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, [
+        "c:/dev/a.ts",
+        "c:/dev/a.d.ts",
+        "c:/dev/a.js",
+        "c:/dev/b.ts",
+        "c:/dev/b.js",
+        "c:/dev/c.d.ts",
+        "c:/dev/z/a.ts",
+        "c:/dev/z/abz.ts",
+        "c:/dev/z/aba.ts",
+        "c:/dev/z/b.ts",
+        "c:/dev/z/bbz.ts",
+        "c:/dev/z/bba.ts",
+        "c:/dev/x/a.ts",
+        "c:/dev/x/aa.ts",
+        "c:/dev/x/b.ts",
+        "c:/dev/x/y/a.ts",
+        "c:/dev/x/y/b.ts",
+        "c:/dev/js/a.js",
+        "c:/dev/js/b.js",
+        "c:/ext/ext.ts",
+        "c:/ext/b/a..b.ts"
+    ]);
+
+    const caseSensitiveBasePath = "/dev/";
+    const caseSensitiveHost = new Utils.MockParseConfigHost(caseSensitiveBasePath, /*useCaseSensitiveFileNames*/ true, [
+        "/dev/a.ts",
+        "/dev/a.d.ts",
+        "/dev/a.js",
+        "/dev/b.ts",
+        "/dev/b.js",
+        "/dev/A.ts",
+        "/dev/B.ts",
+        "/dev/c.d.ts",
+        "/dev/z/a.ts",
+        "/dev/z/abz.ts",
+        "/dev/z/aba.ts",
+        "/dev/z/b.ts",
+        "/dev/z/bbz.ts",
+        "/dev/z/bba.ts",
+        "/dev/x/a.ts",
+        "/dev/x/b.ts",
+        "/dev/x/y/a.ts",
+        "/dev/x/y/b.ts",
+        "/dev/js/a.js",
+        "/dev/js/b.js",
+    ]);
+
+    const caseInsensitiveMixedExtensionHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, [
+        "c:/dev/a.ts",
+        "c:/dev/a.d.ts",
+        "c:/dev/a.js",
+        "c:/dev/b.tsx",
+        "c:/dev/b.d.ts",
+        "c:/dev/b.jsx",
+        "c:/dev/c.tsx",
+        "c:/dev/c.js",
+        "c:/dev/d.js",
+        "c:/dev/e.jsx",
+        "c:/dev/f.other"
+    ]);
+
+    const caseInsensitiveCommonFoldersHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, [
+        "c:/dev/a.ts",
+        "c:/dev/a.d.ts",
+        "c:/dev/a.js",
+        "c:/dev/b.ts",
+        "c:/dev/node_modules/a.ts",
+        "c:/dev/bower_components/a.ts",
+        "c:/dev/jspm_packages/a.ts"
+    ]);
+
+    describe("matchFiles", () => {
+        describe("with literal file list", () => {
+            it("without exclusions", () => {
+                const json = {
+                    files: [
+                        "a.ts",
+                        "b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("missing files are still present", () => {
+                const json = {
+                    files: [
+                        "z.ts",
+                        "x.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/z.ts",
+                        "c:/dev/x.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("are not removed due to excludes", () => {
+                const json = {
+                    files: [
+                        "a.ts",
+                        "b.ts"
+                    ],
+                    exclude: [
+                        "b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+        });
+
+        describe("with literal include list", () => {
+            it("without exclusions", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with non .ts file extensions are excluded", () => {
+                const json = {
+                    include: [
+                        "a.js",
+                        "b.js"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with missing files are excluded", () => {
+                const json = {
+                    include: [
+                        "z.ts",
+                        "x.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with literal excludes", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts"
+                    ],
+                    exclude: [
+                        "b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with wildcard excludes", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts",
+                        "z/a.ts",
+                        "z/abz.ts",
+                        "z/aba.ts",
+                        "x/b.ts"
+                    ],
+                    exclude: [
+                        "*.ts",
+                        "z/??z.ts",
+                        "*/b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/z/a.ts",
+                        "c:/dev/z/aba.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with recursive excludes", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts",
+                        "x/a.ts",
+                        "x/b.ts",
+                        "x/y/a.ts",
+                        "x/y/b.ts"
+                    ],
+                    exclude: [
+                        "**/b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/x/a.ts",
+                        "c:/dev/x/y/a.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with case sensitive exclude", () => {
+                const json = {
+                    include: [
+                        "B.ts"
+                    ],
+                    exclude: [
+                        "**/b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "/dev/B.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseSensitiveHost, caseSensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with common package folders and no exclusions", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts",
+                        "node_modules/a.ts",
+                        "bower_components/a.ts",
+                        "jspm_packages/a.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with common package folders and exclusions", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts",
+                        "node_modules/a.ts",
+                        "bower_components/a.ts",
+                        "jspm_packages/a.ts"
+                    ],
+                    exclude: [
+                        "a.ts",
+                        "b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with common package folders and empty exclude", () => {
+                const json = {
+                    include: [
+                        "a.ts",
+                        "b.ts",
+                        "node_modules/a.ts",
+                        "bower_components/a.ts",
+                        "jspm_packages/a.ts"
+                    ],
+                    exclude: <string[]>[]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts",
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
+                    ],
+                    wildcardDirectories: {},
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+        });
+
+        describe("with wildcard include list", () => {
+            it("same named declarations are excluded", () => {
+                const json = {
+                    include: [
+                        "*.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts",
+                        "c:/dev/c.d.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.None
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("`*` matches only ts files", () => {
+                const json = {
+                    include: [
+                        "*"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts",
+                        "c:/dev/c.d.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.None
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("`?` matches only a single character", () => {
+                const json = {
+                    include: [
+                        "x/?.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/x/a.ts",
+                        "c:/dev/x/b.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/x": ts.WatchDirectoryFlags.None
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with recursive directory", () => {
+                const json = {
+                    include: [
+                        "**/a.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/x/a.ts",
+                        "c:/dev/x/y/a.ts",
+                        "c:/dev/z/a.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with multiple recursive directories", () => {
+                const json = {
+                    include: [
+                        "x/y/**/a.ts",
+                        "x/**/a.ts",
+                        "z/**/a.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/x/a.ts",
+                        "c:/dev/x/y/a.ts",
+                        "c:/dev/z/a.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/x": ts.WatchDirectoryFlags.Recursive,
+                        "c:/dev/z": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("case sensitive", () => {
+                const json = {
+                    include: [
+                        "**/A.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "/dev/A.ts"
+                    ],
+                    wildcardDirectories: {
+                        "/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseSensitiveHost, caseSensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with missing files are excluded", () => {
+                const json = {
+                    include: [
+                        "*/z.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("always include literal files", () => {
+                const json = {
+                    files: [
+                        "a.ts"
+                    ],
+                    include: [
+                        "*/z.ts"
+                    ],
+                    exclude: [
+                        "**/a.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("exclude folders", () => {
+                const json = {
+                    include: [
+                        "**/*"
+                    ],
+                    exclude: [
+                        "z",
+                        "x"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts",
+                        "c:/dev/c.d.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with common package folders and no exclusions", () => {
+                const json = {
+                    include: [
+                       "**/a.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with common package folders and exclusions", () => {
+                const json = {
+                    include: [
+                        "**/a.ts"
+                    ],
+                    exclude: [
+                        "a.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with common package folders and empty exclude", () => {
+                const json = {
+                    include: [
+                        "**/a.ts"
+                    ],
+                    exclude: <string[]>[]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("exclude .js files when allowJs=false", () => {
+                const json = {
+                    compilerOptions: {
+                        allowJs: false
+                    },
+                    include: [
+                        "js/*"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        allowJs: false
+                    },
+                    errors: [],
+                    fileNames: [],
+                    wildcardDirectories: {
+                        "c:/dev/js": ts.WatchDirectoryFlags.None
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("include .js files when allowJs=true", () => {
+                const json = {
+                    compilerOptions: {
+                        allowJs: true
+                    },
+                    include: [
+                        "js/*"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        allowJs: true
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/js/a.js",
+                        "c:/dev/js/b.js"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/js": ts.WatchDirectoryFlags.None
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("include paths outside of the project", () => {
+                const json = {
+                    include: [
+                        "*",
+                        "c:/ext/*"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.ts",
+                        "c:/dev/c.d.ts",
+                        "c:/ext/ext.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.None,
+                        "c:/ext": ts.WatchDirectoryFlags.None
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+
+            it("include paths outside of the project using relative paths", () => {
+                const json = {
+                    include: [
+                        "*",
+                        "../ext/*"
+                    ],
+                    exclude: [
+                        "**"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/ext/ext.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/ext": ts.WatchDirectoryFlags.None
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("exclude paths outside of the project using relative paths", () => {
+                const json = {
+                    include: [
+                        "c:/**/*"
+                    ],
+                    exclude: [
+                        "../**"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [],
+                    wildcardDirectories: {}
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("include files with .. in their name", () => {
+                const json = {
+                    include: [
+                        "c:/ext/b/a..b.ts"
+                    ],
+                    exclude: [
+                        "**"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/ext/b/a..b.ts"
+                    ],
+                    wildcardDirectories: {}
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("exclude files with .. in their name", () => {
+                const json = {
+                    include: [
+                        "c:/ext/**/*"
+                    ],
+                    exclude: [
+                        "c:/ext/b/a..b.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/ext/ext.ts",
+                    ],
+                    wildcardDirectories: {
+                        "c:/ext": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+
+            it("with jsx=none, allowJs=false", () => {
+                const json = {
+                    compilerOptions: {
+                        allowJs: false
+                    }
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        allowJs: false
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.tsx",
+                        "c:/dev/c.tsx",
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveMixedExtensionHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with jsx=preserve, allowJs=false", () => {
+                const json = {
+                    compilerOptions: {
+                        jsx: "preserve",
+                        allowJs: false
+                    }
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        jsx: ts.JsxEmit.Preserve,
+                        allowJs: false
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.tsx",
+                        "c:/dev/c.tsx",
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveMixedExtensionHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with jsx=none, allowJs=true", () => {
+                const json = {
+                    compilerOptions: {
+                        allowJs: true
+                    }
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        allowJs: true
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.tsx",
+                        "c:/dev/c.tsx",
+                        "c:/dev/d.js",
+                        "c:/dev/e.jsx",
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveMixedExtensionHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            it("with jsx=preserve, allowJs=true", () => {
+                const json = {
+                    compilerOptions: {
+                        jsx: "preserve",
+                        allowJs: true
+                    }
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {
+                        jsx: ts.JsxEmit.Preserve,
+                        allowJs: true
+                    },
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/a.ts",
+                        "c:/dev/b.tsx",
+                        "c:/dev/c.tsx",
+                        "c:/dev/d.js",
+                        "c:/dev/e.jsx",
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev": ts.WatchDirectoryFlags.Recursive
+                    }
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveMixedExtensionHost, caseInsensitiveBasePath);
+                assert.deepEqual(actual.fileNames, expected.fileNames);
+                assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                assert.deepEqual(actual.errors, expected.errors);
+            });
+            describe("with trailing recursive directory", () => {
+                it("in includes", () => {
+                    const json = {
+                        include: [
+                            "**"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**")
+                        ],
+                        fileNames: [],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+                it("in excludes", () => {
+                    const json = {
+                        include: [
+                            "**/*"
+                        ],
+                        exclude: [
+                            "**"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [],
+                        fileNames: [],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+            });
+            describe("with multiple recursive directory patterns", () => {
+                it("in includes", () => {
+                    const json = {
+                        include: [
+                            "**/x/**/*"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, "**/x/**/*")
+                        ],
+                        fileNames: [],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+                it("in excludes", () => {
+                    const json = {
+                        include: [
+                            "**/a.ts"
+                        ],
+                        exclude: [
+                            "**/x/**"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, "**/x/**")
+                        ],
+                        fileNames: [
+                            "c:/dev/a.ts",
+                            "c:/dev/x/a.ts",
+                            "c:/dev/x/y/a.ts",
+                            "c:/dev/z/a.ts"
+                        ],
+                        wildcardDirectories: {
+                            "c:/dev": ts.WatchDirectoryFlags.Recursive
+                        }
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+            });
+
+            describe("with parent directory symbols after a recursive directory pattern", () => {
+                it("in includes immediately after", () => {
+                    const json = {
+                        include: [
+                            "**/../*"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/../*")
+                        ],
+                        fileNames: [],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+
+                it("in includes after a subdirectory", () => {
+                    const json = {
+                        include: [
+                            "**/y/../*"
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/y/../*")
+                        ],
+                        fileNames: [],
+                        wildcardDirectories: {}
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+
+                it("in excludes immediately after", () => {
+                    const json = {
+                        include: [
+                            "**/a.ts"
+                        ],
+                        exclude: [
+                            "**/.."
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/..")
+                        ],
+                        fileNames: [
+                            "c:/dev/a.ts",
+                            "c:/dev/x/a.ts",
+                            "c:/dev/x/y/a.ts",
+                            "c:/dev/z/a.ts"
+                        ],
+                        wildcardDirectories: {
+                            "c:/dev": ts.WatchDirectoryFlags.Recursive
+                        }
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+
+                it("in excludes after a subdirectory", () => {
+                    const json = {
+                        include: [
+                            "**/a.ts"
+                        ],
+                        exclude: [
+                            "**/y/.."
+                        ]
+                    };
+                    const expected: ts.ParsedCommandLine = {
+                        options: {},
+                        errors: [
+                            ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0,  "**/y/..")
+                        ],
+                        fileNames: [
+                            "c:/dev/a.ts",
+                            "c:/dev/x/a.ts",
+                            "c:/dev/x/y/a.ts",
+                            "c:/dev/z/a.ts"
+                        ],
+                        wildcardDirectories: {
+                            "c:/dev": ts.WatchDirectoryFlags.Recursive
+                        }
+                    };
+                    const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                    assert.deepEqual(actual.fileNames, expected.fileNames);
+                    assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
+                    assert.deepEqual(actual.errors, expected.errors);
+                });
+            });
+        });
+    });
+}
\ No newline at end of file
diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts
index 4d2cb7d4672..97027dfdd49 100644
--- a/tests/webTestServer.ts
+++ b/tests/webTestServer.ts
@@ -47,6 +47,53 @@ function log(msg: string) {
     }
 }
 
+
+let directorySeparator = "/";
+
+function getRootLength(path: string): number {
+    if (path.charAt(0) === directorySeparator) {
+        if (path.charAt(1) !== directorySeparator) return 1;
+        const p1 = path.indexOf("/", 2);
+        if (p1 < 0) return 2;
+        const p2 = path.indexOf("/", p1 + 1);
+        if (p2 < 0) return p1 + 1;
+        return p2 + 1;
+    }
+    if (path.charAt(1) === ":") {
+        if (path.charAt(2) === directorySeparator) return 3;
+        return 2;
+    }
+    // Per RFC 1738 'file' URI schema has the shape file://<host>/<path>
+    // if <host> is omitted then it is assumed that host value is 'localhost',
+    // however slash after the omitted <host> is not removed.
+    // file:///folder1/file1 - this is a correct URI
+    // file://folder2/file2 - this is an incorrect URI
+    if (path.lastIndexOf("file:///", 0) === 0) {
+        return "file:///".length;
+    }
+    const idx = path.indexOf("://");
+    if (idx !== -1) {
+        return idx + "://".length;
+    }
+    return 0;
+}
+
+function getDirectoryPath(path: string): any {
+    path = switchToForwardSlashes(path);
+    return path.substr(0, Math.max(getRootLength(path), path.lastIndexOf(directorySeparator)));
+}
+
+function ensureDirectoriesExist(path: string) {
+    path = switchToForwardSlashes(path);
+    if (path.length > getRootLength(path) && !fs.existsSync(path)) {
+        const parentDirectory = getDirectoryPath(path);
+        ensureDirectoriesExist(parentDirectory);
+        if (!fs.existsSync(path)) {
+            fs.mkdirSync(path);
+        }
+    }
+}
+
 // Copied from the compiler sources
 function dir(dirPath: string, spec?: string, options?: any) {
     options = options || <{ recursive?: boolean; }>{};
@@ -95,20 +142,8 @@ function deleteFolderRecursive(dirPath: string) {
 };
 
 function writeFile(path: string, data: any, opts: { recursive: boolean }) {
-    try {
-        fs.writeFileSync(path, data);
-    }
-    catch (e) {
-        // assume file was written to a directory that exists, if not, start recursively creating them as necessary
-        const parts = switchToForwardSlashes(path).split("/");
-        for (let i = 0; i < parts.length; i++) {
-            const subDir = parts.slice(0, i).join("/");
-            if (!fs.existsSync(subDir)) {
-                fs.mkdir(subDir);
-            }
-        }
-        fs.writeFileSync(path, data);
-    }
+    ensureDirectoriesExist(getDirectoryPath(path));
+    fs.writeFileSync(path, data);
 }
 
 /// Request Handling ///
@@ -179,6 +214,7 @@ function getRequestOperation(req: http.ServerRequest, filename: string) {
         else return RequestType.GetDir;
     }
     else {
+
         const queryData: any = url.parse(req.url, /*parseQueryString*/ true).query;
         if (req.method === "GET" && queryData.resolve !== undefined) return RequestType.ResolveFile;
         // mocha uses ?grep=<regexp> query string as equivalent to the --grep command line option used to filter tests